Various bug fixes and tweaks found through 0, 1, and 2

git-svn-id: file:///svnroot/gc-dialer/trunk@430 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/constants.py b/src/constants.py
index 3d4e5af..d7b0112 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "DialCentral"
 __app_name__ = "dialcentral"
 __version__ = "1.0.5"
-__build__ = 0
+__build__ = 3
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral")
 _user_settings_ = "%s/settings.ini" % _data_path_

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 583ccae..abec548 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -386,7 +386,7 @@ class Dialcentral(object):
                @note This must be run outside of the UI lock
                """
                loggedIn, (username, password) = False, self._credentials
-               tmpServiceId = self.NULL_BACKEND
+               tmpServiceId = self.GV_BACKEND
                for attemptCount in xrange(numOfAttempts):
                        if loggedIn:
                                break
@@ -394,7 +394,7 @@ class Dialcentral(object):
                                credentials = self._credentialsDialog.request_credentials(
                                        defaultCredentials = self._credentials
                                )
-                       tmpServiceId, username, password = credentials
+                       username, password = credentials
                        loggedIn = self._phoneBackends[tmpServiceId].login(username, password)
 
                if loggedIn:

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index 7b8850f..16c49c6 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -280,7 +280,10 @@ class LoginWindow(object):
                }
                widgetTree.signal_autoconnect(callbackMapping)
 
-       def request_credentials(self, parentWindow = None):
+       def request_credentials(self,
+               parentWindow = None,
+               defaultCredentials = ("", "")
+       ):
                """
                @note UI Thread
                """
@@ -290,6 +293,9 @@ class LoginWindow(object):
                self._serviceCombo.hide()
                self._serviceList.clear()
 
+               self._usernameEntry.set_text(defaultCredentials[0])
+               self._passwordEntry.set_text(defaultCredentials[1])
+
                try:
                        self._dialog.set_transient_for(parentWindow)
                        self._dialog.set_default_response(gtk.RESPONSE_OK)

diff --git a/src/gv_views.py b/src/gv_views.py
index ed2606f..91f75d2 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -96,6 +96,19 @@ def make_pretty(phonenumber):
        return prettynumber
 
 
+def abbrev_relative_date(date):
+       """
+       >>> abbrev_relative_date("42 hours ago")
+       '42 h'
+       >>> abbrev_relative_date("2 days ago")
+       '2 d'
+       >>> abbrev_relative_date("4 weeks ago")
+       '4 w'
+       """
+       parts = date.split(" ")
+       return "%s %s" % (parts[0], parts[1][0])
+
+
 class MergedAddressBook(object):
        """
        Merger of all addressbooks
@@ -811,14 +824,12 @@ class RecentCallsView(object):
 
                textrenderer = gtk.CellRendererText()
                textrenderer.set_property("yalign", 0)
-               hildonize.set_cell_thumb_selectable(textrenderer)
                self._dateColumn = gtk.TreeViewColumn("Date")
                self._dateColumn.pack_start(textrenderer, expand=True)
                self._dateColumn.add_attribute(textrenderer, "text", self.DATE_IDX)
 
                textrenderer = gtk.CellRendererText()
                textrenderer.set_property("yalign", 0)
-               hildonize.set_cell_thumb_selectable(textrenderer)
                self._actionColumn = gtk.TreeViewColumn("Action")
                self._actionColumn.pack_start(textrenderer, expand=True)
                self._actionColumn.add_attribute(textrenderer, "text", self.ACTION_IDX)
@@ -915,6 +926,7 @@ class RecentCallsView(object):
                for personName, phoneNumber, date, action in recentItems:
                        if not personName:
                                personName = "Unknown"
+                       date = abbrev_relative_date(date)
                        prettyNumber = phoneNumber[2:] if phoneNumber.startswith("+1") else phoneNumber
                        prettyNumber = make_pretty(prettyNumber)
                        item = (prettyNumber, date, action.capitalize(), personName)
@@ -969,7 +981,6 @@ class MessagesView(object):
                self._onMessageviewRowActivatedId = 0
 
                self._messageRenderer = gtk.CellRendererText()
-               hildonize.set_cell_thumb_selectable(self._messageRenderer)
                self._messageRenderer.set_property("wrap-mode", pango.WRAP_WORD)
                self._messageRenderer.set_property("wrap-width", 500)
                self._messageColumn = gtk.TreeViewColumn("Messages")