Adding super duper hold stuff to tabs

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index fec8b22..9a978b0 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -105,7 +105,6 @@ class Dialcentral(object):
                self._messagesViews = None
                self._recentViews = None
                self._contactsViews = None
-               self._tabHoldTimeoutId = None
 
                for path in self._glade_files:
                        if os.path.isfile(path):
@@ -313,8 +312,16 @@ class Dialcentral(object):
                                "on_about_activate": self._on_about_activate,
                        }
                        self._widgetTree.signal_autoconnect(callbackMapping)
-                       self._notebook.connect("button-press-event", self._on_tab_press)
-                       self._notebook.connect("button-release-event", self._on_tab_release)
+
+                       self._originalCurrentLabel = ""
+                       with gtk_toolbox.gtk_lock():
+                               self._backup_tab_name()
+                               self._notebookTapHandler = gtk_toolbox.TapOrHold(self._notebook)
+                               self._notebookTapHandler.enable()
+                       self._notebookTapHandler.on_tap = self._reset_tab_refresh
+                       self._notebookTapHandler.on_hold = self._on_tab_refresh
+                       self._notebookTapHandler.on_holding = self._set_tab_refresh
+                       self._notebookTapHandler.on_cancel = self._reset_tab_refresh
 
                        self._initDone = True
 
@@ -553,12 +560,12 @@ class Dialcentral(object):
                        config.write(configFile)
 
        def _refresh_active_tab(self):
-               page_num = self._notebook.get_current_page()
-               if page_num == self.CONTACTS_TAB:
+               pageIndex = self._notebook.get_current_page()
+               if pageIndex == self.CONTACTS_TAB:
                        self._contactsViews[self._selectedBackendId].update(force=True)
-               elif page_num == self.RECENT_TAB:
+               elif pageIndex == self.RECENT_TAB:
                        self._recentViews[self._selectedBackendId].update(force=True)
-               elif page_num == self.MESSAGES_TAB:
+               elif pageIndex == self.MESSAGES_TAB:
                        self._messagesViews[self._selectedBackendId].update(force=True)
 
        def _on_close(self, *args, **kwds):
@@ -635,32 +642,44 @@ class Dialcentral(object):
 
                self._spawn_attempt_login(2, True)
 
-       def _on_notebook_switch_page(self, notebook, page, page_num):
-               if page_num == self.RECENT_TAB:
+       def _on_notebook_switch_page(self, notebook, page, pageIndex):
+               self._reset_tab_refresh()
+               self._backup_tab_name(pageIndex)
+               if pageIndex == self.RECENT_TAB:
                        self._recentViews[self._selectedBackendId].update()
-               elif page_num == self.MESSAGES_TAB:
+               elif pageIndex == self.MESSAGES_TAB:
                        self._messagesViews[self._selectedBackendId].update()
-               elif page_num == self.CONTACTS_TAB:
+               elif pageIndex == self.CONTACTS_TAB:
                        self._contactsViews[self._selectedBackendId].update()
-               elif page_num == self.ACCOUNT_TAB:
+               elif pageIndex == self.ACCOUNT_TAB:
                        self._accountViews[self._selectedBackendId].update()
 
-       def _on_tab_press(self, *args):
-               self._tabHoldTimeoutId = gobject.timeout_add(1000, self._on_tab_refresh)
+       def _backup_tab_name(self, pageIndex = -1):
+               if pageIndex == -1:
+                       pageIndex = self._notebook.get_current_page()
+               child = self._notebook.get_nth_page(pageIndex)
+               self._originalCurrentLabel = self._notebook.get_tab_label(child).get_text()
 
-       def _on_tab_release(self, *args):
-               if self._tabHoldTimeoutId is not None:
-                       gobject.source_remove(self._tabHoldTimeoutId)
-               self._tabHoldTimeoutId = None
+       def _set_tab_refresh(self, *args):
+               pageIndex = self._notebook.get_current_page()
+               child = self._notebook.get_nth_page(pageIndex)
+               self._notebook.get_tab_label(child).set_text("Refresh?")
+               return False
+
+       def _reset_tab_refresh(self, *args):
+               pageIndex = self._notebook.get_current_page()
+               child = self._notebook.get_nth_page(pageIndex)
+               self._notebook.get_tab_label(child).set_text(self._originalCurrentLabel)
+               return False
 
        def _on_tab_refresh(self, *args):
-               self._tabHoldTimeoutId = None
                self._refresh_active_tab()
+               self._reset_tab_refresh()
                return False
 
        def _on_sms_clicked(self, number, message):
-               assert number
-               assert message
+               assert number, "No number specified"
+               assert message, "Empty message"
                try:
                        loggedIn = self._phoneBackends[self._selectedBackendId].is_authed()
                except StandardError, e:

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index 6ac61b5..ac3cca9 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -599,10 +599,14 @@ class TapOrHold(object):
                print "CANCEL"
 
        def _on_button_press(self, *args):
+               # Hack to handle weird notebook behavior
+               self._isPointerInside = True
+
                if self._tapTimeoutId is not None:
                        gobject.source_remove(self._tapTimeoutId)
                        self._tapTimeoutId = None
 
+               # Handle double taps
                if self._holdTimeoutId is None:
                        self._tapTimeoutId = None
 
@@ -613,6 +617,7 @@ class TapOrHold(object):
 
        def _on_button_release(self, *args):
                assert self._tapTimeoutId is None
+               # Handle release after timeout if user hasn't double-clicked
                self._tapTimeoutId = gobject.timeout_add(100, self._on_tap_timeout)
 
        def _on_actual_press(self, *args):

diff --git a/support/builddeb.py b/support/builddeb.py
index f34a149..9fadb93 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -19,6 +19,7 @@ __version__ = constants.__version__
 __build__ = 0
 __changelog__ = '''
 1.0.4
+* "Back" button and tabs now visually indicate when they've entered a "hold" state
 * Fixed the duplicate title on Maemo
 * Removing some device connection observer code due to high bug to low benefit ratio