projects / gc-dialer / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More touch selector fun (Callback number)
[gc-dialer] / src / gv_views.py
diff --git a/src/gv_views.py b/src/gv_views.py
index 2d2c3a6..d91bab2 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python2.5
 
 """
-DialCentral - Front end for Google's Grand Central service.
+DialCentral - Front end for Google's GoogleVoice service.
 Copyright (C) 2008  Mark Bergman bergman AT merctech DOT com
 
 This library is free software; you can redistribute it and/or
@@ -18,7 +18,6 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-@todo Touch selector for callback number
 @todo Alternate UI for dialogs (stackables)
 """
 
@@ -669,10 +668,10 @@ class AccountInfo(object):
                self._notifyOnVoicemail = False
                self._notifyOnSms = False
 
-               self._callbackList = gtk.ListStore(gobject.TYPE_STRING)
+               self._callbackList = []
                self._accountViewNumberDisplay = widgetTree.get_widget("gcnumber_display")
-               self._callbackCombo = widgetTree.get_widget("callbackcombo")
-               self._onCallbackentryChangedId = 0
+               self._callbackSelectButton = widgetTree.get_widget("callbackSelectButton")
+               self._onCallbackSelectChangedId = 0
 
                self._notifyCheckbox = widgetTree.get_widget("notifyCheckbox")
                self._minutesEntryButton = widgetTree.get_widget("minutesEntryButton")
@@ -695,8 +694,8 @@ class AccountInfo(object):
                self._accountViewNumberDisplay.set_use_markup(True)
                self.set_account_number("")
 
-               self._callbackList.clear()
-               self._onCallbackentryChangedId = self._callbackCombo.get_child().connect("changed", self._on_callbackentry_changed)
+               del self._callbackList[:]
+               self._onCallbackSelectChangedId = self._callbackSelectButton.connect("clicked", self._on_callbackentry_clicked)
 
                if self._alarmHandler is not None:
                        self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
@@ -720,8 +719,8 @@ class AccountInfo(object):
                self.update(force=True)
 
        def disable(self):
-               self._callbackCombo.get_child().disconnect(self._onCallbackentryChangedId)
-               self._onCallbackentryChangedId = 0
+               self._callbackSelectButton.disconnect(self._onCallbackSelectChangedId)
+               self._onCallbackSelectChangedId = 0
 
                if self._alarmHandler is not None:
                        self._notifyCheckbox.disconnect(self._onNotifyToggled)
@@ -742,10 +741,10 @@ class AccountInfo(object):
                        self._smsCheckbox.set_sensitive(True)
 
                self.clear()
-               self._callbackList.clear()
+               del self._callbackList[:]
 
        def get_selected_callback_number(self):
-               return make_ugly(self._callbackCombo.get_child().get_text())
+               return make_ugly(self._callbackSelectButton.get_label())
 
        def set_account_number(self, number):
                """
@@ -761,7 +760,7 @@ class AccountInfo(object):
                return True
 
        def clear(self):
-               self._callbackCombo.get_child().set_text("")
+               self._callbackSelectButton.set_label("")
                self.set_account_number("")
                self._isPopulated = False
 
@@ -790,7 +789,7 @@ class AccountInfo(object):
 
        def _populate_callback_combo(self):
                self._isPopulated = True
-               self._callbackList.clear()
+               del self._callbackList[:]
                try:
                        callbackNumbers = self._backend.get_callback_numbers()
                except Exception, e:
@@ -799,13 +798,10 @@ class AccountInfo(object):
                        return
 
                for number, description in callbackNumbers.iteritems():
-                       self._callbackList.append((make_pretty(number),))
+                       self._callbackList.append(make_pretty(number))
 
-               self._callbackCombo.set_model(self._callbackList)
-               self._callbackCombo.set_text_column(0)
-               #callbackNumber = self._backend.get_callback_number()
                callbackNumber = self._defaultCallback
-               self._callbackCombo.get_child().set_text(make_pretty(callbackNumber))
+               self._callbackSelectButton.set_label(make_pretty(callbackNumber))
 
        def _set_callback_number(self, number):
                try:
@@ -840,11 +836,20 @@ class AccountInfo(object):
                        self._notifyCheckbox.set_active(self._alarmHandler.isEnabled)
                        self._minutesEntryButton.set_label("%d Minutes" % self._alarmHandler.recurrence)
 
-       def _on_callbackentry_changed(self, *args):
+       def _on_callbackentry_clicked(self, *args):
                try:
-                       text = self.get_selected_callback_number()
-                       number = make_ugly(text)
+                       actualSelection = make_pretty(self.get_selected_callback_number())
+
+                       userSelection = hildonize.touch_selector_entry(
+                               self._window,
+                               "Callback Number",
+                               self._callbackList,
+                               actualSelection,
+                       )
+                       number = make_ugly(userSelection)
                        self._set_callback_number(number)
+               except RuntimeError, e:
+                       logging.exception("%s" % str(e))
                except Exception, e:
                        self._errorDisplay.push_exception()
 
@@ -860,13 +865,17 @@ class AccountInfo(object):
        def _on_minutes_clicked(self, *args):
                recurrenceChoices = [
                        (1, "1 minute"),
+                       (2, "2 minutes"),
                        (3, "3 minutes"),
                        (5, "5 minutes"),
+                       (8, "8 minutes"),
                        (10, "10 minutes"),
                        (15, "15 minutes"),
                        (30, "30 minutes"),
                        (45, "45 minutes"),
                        (60, "1 hour"),
+                       (3*60, "3 hours"),
+                       (6*60, "6 hours"),
                        (12*60, "12 hours"),
                ]
                try:
@@ -885,6 +894,8 @@ class AccountInfo(object):
                        recurrence = recurrenceChoices[recurrenceIndex][0]
 
                        self._update_alarm_settings(recurrence)
+               except RuntimeError, e:
+                       logging.exception("%s" % str(e))
                except Exception, e:
                        self._errorDisplay.push_exception()
 
@@ -955,18 +966,20 @@ class RecentCallsView(object):
 
                textrenderer = gtk.CellRendererText()
                textrenderer.set_property("yalign", 0)
+               textrenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+               textrenderer.set_property("width-chars", len("1 (555) 555-1234"))
+               self._numberColumn = gtk.TreeViewColumn("Number")
+               self._numberColumn.pack_start(textrenderer, expand=True)
+               self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
+
+               textrenderer = gtk.CellRendererText()
+               textrenderer.set_property("yalign", 0)
                hildonize.set_cell_thumb_selectable(textrenderer)
                self._nameColumn = gtk.TreeViewColumn("From")
                self._nameColumn.pack_start(textrenderer, expand=True)
                self._nameColumn.add_attribute(textrenderer, "text", self.FROM_IDX)
                self._nameColumn.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
 
-               textrenderer = gtk.CellRendererText()
-               textrenderer.set_property("yalign", 0)
-               self._numberColumn = gtk.TreeViewColumn("Number")
-               self._numberColumn.pack_start(textrenderer, expand=True)
-               self._numberColumn.add_attribute(textrenderer, "text", self.NUMBER_IDX)
-
                self._window = gtk_toolbox.find_parent_window(self._recentview)
                self._phoneTypeSelector = PhoneTypeSelector(widgetTree, self._backend)
 
@@ -1031,6 +1044,8 @@ class RecentCallsView(object):
                pass
 
        def _idly_populate_recentview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Recent History")
                try:
                        self._recentmodel.clear()
                        self._isPopulated = True
@@ -1053,6 +1068,9 @@ class RecentCallsView(object):
                                        self._recentmodel.append(item)
                except Exception, e:
                        self._errorDisplay.push_exception_with_lock()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
 
                return False
 
@@ -1172,6 +1190,8 @@ class MessagesView(object):
                pass
 
        def _idly_populate_messageview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Messages")
                try:
                        self._messagemodel.clear()
                        self._isPopulated = True
@@ -1198,6 +1218,9 @@ class MessagesView(object):
                                        self._messagemodel.append(row)
                except Exception, e:
                        self._errorDisplay.push_exception_with_lock()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
 
                return False
 
@@ -1370,6 +1393,8 @@ class ContactsView(object):
                config.set(sectionName, "selectedAddressbook", str(self._selectedComboIndex))
 
        def _idly_populate_contactsview(self):
+               with gtk_toolbox.gtk_lock():
+                       banner = hildonize.show_busy_banner_start(self._window, "Loading Contacts")
                try:
                        addressBook = None
                        while addressBook is not self._addressBook:
@@ -1394,6 +1419,9 @@ class ContactsView(object):
                        self._isPopulated = True
                except Exception, e:
                        self._errorDisplay.push_exception_with_lock()
+               finally:
+                       with gtk_toolbox.gtk_lock():
+                               hildonize.show_busy_banner_end(banner)
                return False
 
        def _on_addressbook_button_changed(self, *args, **kwds):
Unnamed repository; edit this file to name it for gitweb.