Changing recent to history

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 7fdf203..7d2a1a2 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -92,7 +92,7 @@ class Dialcentral(object):
                self._dialpads = None
                self._accountViews = None
                self._messagesViews = None
-               self._recentViews = None
+               self._historyViews = None
                self._contactsViews = None
                self._alarmHandler = None
                self._ledHandler = None
@@ -119,7 +119,7 @@ class Dialcentral(object):
                hildonize.hildonize_password_entry(self._widgetTree.get_widget("passwordentry"))
 
                for scrollingWidgetName in (
-                       'recent_scrolledwindow',
+                       'history_scrolledwindow',
                        'message_scrolledwindow',
                        'contacts_scrolledwindow',
                        "smsMessages_scrolledwindow",
@@ -202,13 +202,13 @@ class Dialcentral(object):
                        with gtk_toolbox.gtk_lock():
                                self._dialpads = {self.NULL_BACKEND: null_views.Dialpad(self._widgetTree)}
                                self._accountViews = {self.NULL_BACKEND: null_views.AccountInfo(self._widgetTree)}
-                               self._recentViews = {self.NULL_BACKEND: null_views.RecentCallsView(self._widgetTree)}
+                               self._historyViews = {self.NULL_BACKEND: null_views.CallHistoryView(self._widgetTree)}
                                self._messagesViews = {self.NULL_BACKEND: null_views.MessagesView(self._widgetTree)}
                                self._contactsViews = {self.NULL_BACKEND: null_views.ContactsView(self._widgetTree)}
 
                                self._dialpads[self._selectedBackendId].enable()
                                self._accountViews[self._selectedBackendId].enable()
-                               self._recentViews[self._selectedBackendId].enable()
+                               self._historyViews[self._selectedBackendId].enable()
                                self._messagesViews[self._selectedBackendId].enable()
                                self._contactsViews[self._selectedBackendId].enable()
                except Exception, e:
@@ -297,8 +297,8 @@ class Dialcentral(object):
                                        ),
                                })
                                self._accountViews[self.GV_BACKEND].save_everything = self._save_settings
-                               self._recentViews.update({
-                                       self.GV_BACKEND: gv_views.RecentCallsView(
+                               self._historyViews.update({
+                                       self.GV_BACKEND: gv_views.CallHistoryView(
                                                self._widgetTree, self._phoneBackends[self.GV_BACKEND], self._errorDisplay
                                        ),
                                })
@@ -317,7 +317,7 @@ class Dialcentral(object):
                        fileBackend = file_backend.FilesystemAddressBookFactory(fsContactsPath)
 
                        self._dialpads[self.GV_BACKEND].number_selected = self._select_action
-                       self._recentViews[self.GV_BACKEND].number_selected = self._select_action
+                       self._historyViews[self.GV_BACKEND].number_selected = self._select_action
                        self._messagesViews[self.GV_BACKEND].number_selected = self._select_action
                        self._contactsViews[self.GV_BACKEND].number_selected = self._select_action
 
@@ -501,13 +501,13 @@ class Dialcentral(object):
 
                self._dialpads[oldStatus].disable()
                self._accountViews[oldStatus].disable()
-               self._recentViews[oldStatus].disable()
+               self._historyViews[oldStatus].disable()
                self._messagesViews[oldStatus].disable()
                self._contactsViews[oldStatus].disable()
 
                self._dialpads[newStatus].enable()
                self._accountViews[newStatus].enable()
-               self._recentViews[newStatus].enable()
+               self._historyViews[newStatus].enable()
                self._messagesViews[newStatus].enable()
                self._contactsViews[newStatus].enable()
 
@@ -556,7 +556,7 @@ class Dialcentral(object):
                        self._dialpads.iteritems(),
                        self._accountViews.iteritems(),
                        self._messagesViews.iteritems(),
-                       self._recentViews.iteritems(),
+                       self._historyViews.iteritems(),
                        self._contactsViews.iteritems(),
                ):
                        sectionName = "%s - %s" % (backendId, view.name())
@@ -623,7 +623,7 @@ class Dialcentral(object):
                        self._dialpads.iteritems(),
                        self._accountViews.iteritems(),
                        self._messagesViews.iteritems(),
-                       self._recentViews.iteritems(),
+                       self._historyViews.iteritems(),
                        self._contactsViews.iteritems(),
                ):
                        sectionName = "%s - %s" % (backendId, view.name())
@@ -644,7 +644,7 @@ class Dialcentral(object):
                if pageIndex == self.CONTACTS_TAB:
                        self._contactsViews[self._selectedBackendId].update(force=True)
                elif pageIndex == self.RECENT_TAB:
-                       self._recentViews[self._selectedBackendId].update(force=True)
+                       self._historyViews[self._selectedBackendId].update(force=True)
                elif pageIndex == self.MESSAGES_TAB:
                        self._messagesViews[self._selectedBackendId].update(force=True)
 
@@ -750,7 +750,7 @@ class Dialcentral(object):
                try:
                        self._phoneBackends[self._selectedBackendId].logout()
                        self._accountViews[self._selectedBackendId].clear()
-                       self._recentViews[self._selectedBackendId].clear()
+                       self._historyViews[self._selectedBackendId].clear()
                        self._messagesViews[self._selectedBackendId].clear()
                        self._contactsViews[self._selectedBackendId].clear()
                        self._change_loggedin_status(self.NULL_BACKEND)
@@ -767,7 +767,7 @@ class Dialcentral(object):
                        didMessagesUpdate = False
 
                        if pageIndex == self.RECENT_TAB:
-                               didRecentUpdate = self._recentViews[self._selectedBackendId].update()
+                               didRecentUpdate = self._historyViews[self._selectedBackendId].update()
                        elif pageIndex == self.MESSAGES_TAB:
                                didMessagesUpdate = self._messagesViews[self._selectedBackendId].update()
                        elif pageIndex == self.CONTACTS_TAB:

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index b282817..3819e53 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -518,12 +518,12 @@
                 <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
-                  <widget class="GtkScrolledWindow" id="recent_scrolledwindow">
+                  <widget class="GtkScrolledWindow" id="history_scrolledwindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">never</property>
                     <child>
-                      <widget class="GtkTreeView" id="recentview">
+                      <widget class="GtkTreeView" id="historyview">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="rules_hint">True</property>
@@ -544,10 +544,10 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="recent">
+              <widget class="GtkLabel" id="history">
                 <property name="height_request">30</property>
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Recent</property>
+                <property name="label" translatable="yes">History</property>
               </widget>
               <packing>
                 <property name="position">1</property>

diff --git a/src/gv_views.py b/src/gv_views.py
index 51fd55b..2fa7f05 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -799,7 +799,7 @@ class AccountInfo(object):
                        self._errorDisplay.push_exception()
 
 
-class RecentCallsView(object):
+class CallHistoryView(object):
 
        NUMBER_IDX = 0
        DATE_IDX = 1
@@ -812,15 +812,15 @@ class RecentCallsView(object):
                self._backend = backend
 
                self._isPopulated = False
-               self._recentmodel = gtk.ListStore(
+               self._historymodel = gtk.ListStore(
                        gobject.TYPE_STRING, # number
                        gobject.TYPE_STRING, # date
                        gobject.TYPE_STRING, # action
                        gobject.TYPE_STRING, # from
                        gobject.TYPE_STRING, # from id
                )
-               self._recentview = widgetTree.get_widget("recentview")
-               self._recentviewselection = None
+               self._historyview = widgetTree.get_widget("historyview")
+               self._historyviewselection = None
                self._onRecentviewRowActivatedId = 0
 
                textrenderer = gtk.CellRendererText()
@@ -851,40 +851,40 @@ class RecentCallsView(object):
                self._nameColumn.add_attribute(textrenderer, "text", self.FROM_IDX)
                self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
-               self._window = gtk_toolbox.find_parent_window(self._recentview)
+               self._window = gtk_toolbox.find_parent_window(self._historyview)
                self._phoneTypeSelector = SmsEntryDialog(widgetTree)
 
                self._updateSink = gtk_toolbox.threaded_stage(
                        gtk_toolbox.comap(
-                               self._idly_populate_recentview,
+                               self._idly_populate_historyview,
                                gtk_toolbox.null_sink(),
                        )
                )
 
        def enable(self):
                assert self._backend.is_authed(), "Attempting to enable backend while not logged in"
-               self._recentview.set_model(self._recentmodel)
-               self._recentview.set_fixed_height_mode(False)
+               self._historyview.set_model(self._historymodel)
+               self._historyview.set_fixed_height_mode(False)
 
-               self._recentview.append_column(self._dateColumn)
-               self._recentview.append_column(self._actionColumn)
-               self._recentview.append_column(self._numberColumn)
-               self._recentview.append_column(self._nameColumn)
-               self._recentviewselection = self._recentview.get_selection()
-               self._recentviewselection.set_mode(gtk.SELECTION_SINGLE)
+               self._historyview.append_column(self._dateColumn)
+               self._historyview.append_column(self._actionColumn)
+               self._historyview.append_column(self._numberColumn)
+               self._historyview.append_column(self._nameColumn)
+               self._historyviewselection = self._historyview.get_selection()
+               self._historyviewselection.set_mode(gtk.SELECTION_SINGLE)
 
-               self._onRecentviewRowActivatedId = self._recentview.connect("row-activated", self._on_recentview_row_activated)
+               self._onRecentviewRowActivatedId = self._historyview.connect("row-activated", self._on_historyview_row_activated)
 
        def disable(self):
-               self._recentview.disconnect(self._onRecentviewRowActivatedId)
+               self._historyview.disconnect(self._onRecentviewRowActivatedId)
 
                self.clear()
 
-               self._recentview.remove_column(self._dateColumn)
-               self._recentview.remove_column(self._actionColumn)
-               self._recentview.remove_column(self._nameColumn)
-               self._recentview.remove_column(self._numberColumn)
-               self._recentview.set_model(None)
+               self._historyview.remove_column(self._dateColumn)
+               self._historyview.remove_column(self._actionColumn)
+               self._historyview.remove_column(self._nameColumn)
+               self._historyview.remove_column(self._numberColumn)
+               self._historyview.set_model(None)
 
        def number_selected(self, action, number, message):
                """
@@ -900,7 +900,7 @@ class RecentCallsView(object):
 
        def clear(self):
                self._isPopulated = False
-               self._recentmodel.clear()
+               self._historymodel.clear()
 
        @staticmethod
        def name():
@@ -915,26 +915,26 @@ class RecentCallsView(object):
                """
                pass
 
-       def _idly_populate_recentview(self):
+       def _idly_populate_historyview(self):
                with gtk_toolbox.gtk_lock():
-                       banner = hildonize.show_busy_banner_start(self._window, "Loading Recent History")
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Call History")
                try:
-                       self._recentmodel.clear()
+                       self._historymodel.clear()
                        self._isPopulated = True
 
                        try:
-                               recentItems = self._backend.get_recent()
+                               historyItems = self._backend.get_recent()
                        except Exception, e:
                                self._errorDisplay.push_exception_with_lock()
                                self._isPopulated = False
-                               recentItems = []
+                               historyItems = []
 
-                       recentItems = (
+                       historyItems = (
                                gv_backend.decorate_recent(data)
-                               for data in gv_backend.sort_messages(recentItems)
+                               for data in gv_backend.sort_messages(historyItems)
                        )
 
-                       for contactId, personName, phoneNumber, date, action in recentItems:
+                       for contactId, personName, phoneNumber, date, action in historyItems:
                                if not personName:
                                        personName = "Unknown"
                                date = abbrev_relative_date(date)
@@ -942,7 +942,7 @@ class RecentCallsView(object):
                                prettyNumber = make_pretty(prettyNumber)
                                item = (prettyNumber, date, action.capitalize(), personName, contactId)
                                with gtk_toolbox.gtk_lock():
-                                       self._recentmodel.append(item)
+                                       self._historymodel.append(item)
                except Exception, e:
                        self._errorDisplay.push_exception_with_lock()
                finally:
@@ -951,16 +951,16 @@ class RecentCallsView(object):
 
                return False
 
-       def _on_recentview_row_activated(self, treeview, path, view_column):
+       def _on_historyview_row_activated(self, treeview, path, view_column):
                try:
-                       itr = self._recentmodel.get_iter(path)
+                       itr = self._historymodel.get_iter(path)
                        if not itr:
                                return
 
-                       number = self._recentmodel.get_value(itr, self.NUMBER_IDX)
+                       number = self._historymodel.get_value(itr, self.NUMBER_IDX)
                        number = make_ugly(number)
-                       description = self._recentmodel.get_value(itr, self.FROM_IDX)
-                       contactId = self._recentmodel.get_value(itr, self.FROM_ID_IDX)
+                       description = self._historymodel.get_value(itr, self.FROM_IDX)
+                       contactId = self._historymodel.get_value(itr, self.FROM_ID_IDX)
                        if contactId:
                                contactPhoneNumbers = list(self._backend.get_contact_details(contactId))
                                defaultMatches = [
@@ -992,7 +992,7 @@ class RecentCallsView(object):
                        assert phoneNumber, "A lack of phone number exists"
 
                        self.number_selected(action, phoneNumber, message)
-                       self._recentviewselection.unselect_all()
+                       self._historyviewselection.unselect_all()
                except Exception, e:
                        self._errorDisplay.push_exception()
 

diff --git a/src/null_views.py b/src/null_views.py
index 202d04c..c385c8f 100644 (file)
--- a/src/null_views.py
+++ b/src/null_views.py
@@ -110,7 +110,7 @@ class AccountInfo(object):
                pass
 
 
-class RecentCallsView(object):
+class CallHistoryView(object):
 
        def __init__(self, widgetTree):
                pass

diff --git a/support/builddeb.py b/support/builddeb.py
index 0b3d38e..cef3a9d 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -30,6 +30,9 @@ __email__ = "eopage@byu.net"
 __version__ = constants.__version__
 __build__ = constants.__build__
 __changelog__ = """
+1.0.10
+* Renamed Recent to History
+
 1.0.9
 * Added .deb packages for generic linux
 * UI Tweak: Added an app menu