merging branch

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

diff --git a/src/dc_glade.py b/src/dc_glade.py
index e68429e..0d49fd1 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -276,6 +276,7 @@ class Dialcentral(object):
 
                callbackMapping = {
                        "on_paste": self._on_paste,
+                       "on_refresh": self._on_refresh,
                        "on_clearcookies_clicked": self._on_clearcookies_clicked,
                        "on_notebook_switch_page": self._on_notebook_switch_page,
                        "on_about_activate": self._on_about_activate,
@@ -457,7 +458,7 @@ class Dialcentral(object):
        def _on_number_selected(self, action, number, message):
                if action == "select":
                        self._dialpads[self._selectedBackendId].set_number(number)
-                       self._notebook.set_current_page(0)
+                       self._notebook.set_current_page(self.KEYPAD_TAB)
                elif action == "dial":
                        self._on_dial_clicked(number)
                elif action == "sms":
@@ -523,7 +524,15 @@ class Dialcentral(object):
 
                if dialed:
                        self._dialpads[self._selectedBackendId].clear()
-                       self._recentViews[self._selectedBackendId].clear()
+
+       def _on_refresh(self, *args):
+               page_num = self._notebook.get_current_page()
+               if page_num == self.CONTACTS_TAB:
+                       self._contactsViews[self._selectedBackendId].update(force=True)
+               elif page_num == self.RECENT_TAB:
+                       self._recentViews[self._selectedBackendId].update(force=True)
+               elif page_num == self.MESSAGES_TAB:
+                       self._messagesViews[self._selectedBackendId].update(force=True)
 
        def _on_paste(self, *args):
                contents = self._clipboard.wait_for_text()

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 0532516..ba649d7 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -90,6 +90,27 @@
               </widget>
             </child>
             <child>
+              <widget class="GtkMenuItem" id="viewMenuItem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="refreshMenuItem">
+                        <property name="label">gtk-refresh</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_refresh"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkMenuItem" id="about">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_About</property>

diff --git a/src/gc_views.py b/src/gc_views.py
index c37e48d..96be9bd 100644 (file)
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -589,7 +589,7 @@ class AccountInfo(object):
                """
                self._accountViewNumberDisplay.set_label("<span size='23000' weight='bold'>%s</span>" % (number))
 
-       def update(self):
+       def update(self, force = False):
                self.populate_callback_combo()
                self.set_account_number(self._backend.get_account_number())
 
@@ -675,8 +675,8 @@ class RecentCallsView(object):
                """
                raise NotImplementedError
 
-       def update(self):
-               if (time.time() - self._recenttime) < 300:
+       def update(self, force = False):
+               if not force and (time.time() - self._recenttime) < 300:
                        return
                backgroundPopulate = threading.Thread(target=self._idly_populate_recentview)
                backgroundPopulate.setDaemon(True)
@@ -766,8 +766,8 @@ class MessagesView(object):
                """
                raise NotImplementedError
 
-       def update(self):
-               if (time.time() - self._messagetime) < 300:
+       def update(self, force = False):
+               if not force and (time.time() - self._messagetime) < 300:
                        return
                backgroundPopulate = threading.Thread(target=self._idly_populate_messageview)
                backgroundPopulate.setDaemon(True)
@@ -910,8 +910,8 @@ class ContactsView(object):
                backgroundPopulate.setDaemon(True)
                backgroundPopulate.start()
 
-       def update(self):
-               if (time.time() - self._contactstime) < 300:
+       def update(self, force = False):
+               if not force and (time.time() - self._contactstime) < 300:
                        return
                backgroundPopulate = threading.Thread(target=self._idly_populate_contactsview)
                backgroundPopulate.setDaemon(True)

diff --git a/support/builddeb.py b/support/builddeb.py
index 3036a80..3188ffb 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -7,9 +7,12 @@ __appname__ = "dialcentral"
 __description__ = "Simple interface to Google's GrandCentral(tm) service"
 __author__ = "Ed Page"
 __email__ = "eopage@byu.net"
-__version__ = "0.9.6"
-__build__ = 1
+__version__ = "0.9.7"
+__build__ = 0
 __changelog__ = '''
+0.9.7
+ * Force Refresh for when wanting to check for more messages
+
 0.9.6
  * Experimenting with the tabs being on the side
  * Now the phone selector is used always, even if there is just one phone number