[gnue] r8819 - in trunk/gnue-forms/src: . GFObjects

[reinhard]

Author: reinhard
Date: 2006-10-17 10:20:51 -0500 (Tue, 17 Oct 2006)
New Revision: 8819

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Further cleanup on status line functions.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-10-17 14:54:55 UTC (rev 8818)
+++ trunk/gnue-forms/src/GFForm.py      2006-10-17 15:20:51 UTC (rev 8819)
@@ -649,72 +649,7 @@
         if self.uiWidget is not None:
             return self.uiWidget._ui_show_message_(message, kind, title, 
cancel)
 
-    # -------------------------------------------------------------------------
-    # Helper functions to update the status bar of this form
-    # -------------------------------------------------------------------------
 
-    # FIXME: at some point these will become private.
-
-    def update_status(self):
-
-        self.update_insert_status()
-        self.update_page_counter()
-
-    # -------------------------------------------------------------------------
-
-    def update_tip(self, tip):
-
-        self.__update_status(tip=tip)
-
-    # -------------------------------------------------------------------------
-
-    def update_record_status(self, record_status):
-
-        self.__update_status(record_status=record_status)
-
-    # -------------------------------------------------------------------------
-
-    def update_insert_status(self):
-
-        if self.__insert_mode:
-            self.__update_status(insert_status='INS')
-        else:
-            self.__update_status(insert_status='OVR')
-
-    # -------------------------------------------------------------------------
-
-    def update_record_counter(self, record_number, record_count):
-
-        self.__update_status(record_number=record_number,
-                record_count=record_count)
-
-    # -------------------------------------------------------------------------
-
-    def update_page_counter(self):
-
-        page_list = self._layout._pageList
-
-        self.__update_status(
-                page_number=page_list.index(self._currentPage)+1,
-                page_count=len(page_list))
-
-    # -------------------------------------------------------------------------
-
-    def __update_status(self, tip=None, record_status=None, insert_status=None,
-            record_number=None, record_count=None, page_number=None,
-            page_count=None):
-        """
-        Updates the complete status bar of the form.
-
-        Parameters that are not given are not changed in the status bar.
-        """
-
-        # This can be called before the UI is built.
-        if self.uiWidget is not None:
-            self.uiWidget._ui_update_status_(tip, record_status, insert_status,
-                    record_number, record_count, page_number, page_count)
-
-
     # =========================================================================
     # Focus functions
     # =========================================================================
@@ -1048,11 +983,9 @@
             field.focus_in()
         if pageChange:
             self._currentPage.focus_in()
+            self.update_page_counter()
         self._currentEntry.focus_in()
 
-        if blockChange or pageChange:
-            self.update_status()
-
         self.refreshUIEvents()
 
 
@@ -1220,8 +1153,6 @@
             for block in self._logic._blockList:
                 block.init_query()
 
-            self.update_status()
-
             self.status_message(u_('Enter your query criteria.'))
         finally:
             self.beginEditing()
@@ -1251,8 +1182,6 @@
             for block in self._logic._blockList:
                 block.copy_query()
 
-            self.update_status()
-
             self.status_message(u_('Enter your query criteria.'))
         finally:
             self.beginEditing()
@@ -1272,8 +1201,6 @@
             for block in self._logic._blockList:
                 block.cancel_query()
 
-            self.update_status()
-
             self.status_message(u_('Query canceled.'))
         finally:
             self.beginEditing()
@@ -1598,6 +1525,63 @@
 
 
     # -------------------------------------------------------------------------
+    # Update the status bar in the form
+    # -------------------------------------------------------------------------
+
+    def update_tip(self, tip):
+
+        self.__update_status(tip=tip)
+
+    # -------------------------------------------------------------------------
+
+    def update_record_status(self, record_status):
+
+        self.__update_status(record_status=record_status)
+
+    # -------------------------------------------------------------------------
+
+    def update_insert_status(self):
+
+        if self.__insert_mode:
+            self.__update_status(insert_status='INS')
+        else:
+            self.__update_status(insert_status='OVR')
+
+    # -------------------------------------------------------------------------
+
+    def update_record_counter(self, record_number, record_count):
+
+        self.__update_status(record_number=record_number,
+                record_count=record_count)
+
+    # -------------------------------------------------------------------------
+
+    def update_page_counter(self):
+
+        page_list = self._layout._pageList
+
+        self.__update_status(
+                page_number=page_list.index(self._currentPage)+1,
+                page_count=len(page_list))
+
+    # -------------------------------------------------------------------------
+
+    def __update_status(self, tip=None, record_status=None, insert_status=None,
+            record_number=None, record_count=None, page_number=None,
+            page_count=None):
+        """
+        Updates the complete status bar of the form.
+
+        Parameters that are not given are not changed in the status bar.
+        """
+
+        # This can be called before the UI is built.
+        if self.uiWidget is not None:
+            self.uiWidget._ui_update_status_(tip, record_status, insert_status,
+                    record_number, record_count, page_number, page_count)
+
+
+    # -------------------------------------------------------------------------
     # Signal to the current Entry to stop editing
     # mode and save it's value to the virtual form
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-10-17 14:54:55 UTC (rev 8818)
+++ trunk/gnue-forms/src/GFInstance.py  2006-10-17 15:20:51 UTC (rev 8819)
@@ -509,7 +509,6 @@
     """
 
     event._form.nextBlock()
-    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -523,7 +522,6 @@
     """
 
     event._form.previousBlock()
-    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -541,7 +539,6 @@
     else:
       nextIndex = currentIndex + 1
     event._form.findAndChangeFocus (event._form._layout._pageList [nextIndex])
-    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -556,7 +553,6 @@
     pageList = event._form._layout._pageList
     currentIndex = pageList.index (event._form._currentPage)
     event._form.findAndChangeFocus (pageList [currentIndex - 1])
-    event._form.update_status()
 
   # ---------------------------------------------------------------------------
   # Jump to a specific page
@@ -569,7 +565,6 @@
 
     newpage = event._form._layout._pageList [event.data]
     event._form.findAndChangeFocus (newpage)
-    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 14:54:55 UTC (rev 
8818)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 15:20:51 UTC (rev 
8819)
@@ -854,6 +854,8 @@
         self.__query_values = {}
         self.__query_values.update(self._queryDefaults)
         self.__current_record_changed(True)
+        if self._form.get_focus_block() is self:
+            self.__update_record_status()
 
   # ---------------------------------------------------------------------------
 
@@ -862,6 +864,8 @@
         self.__query_values = {}
         self.__query_values.update(self.__last_query_values)
         self.__current_record_changed(True)
+        if self._form.get_focus_block() is self:
+            self.__update_record_status()
 
   # ---------------------------------------------------------------------------
 
@@ -869,6 +873,8 @@
 
         self.mode = 'normal'
         self.__current_record_changed(True)
+        if self._form.get_focus_block() is self:
+            self.__update_record_status()
 
   # ---------------------------------------------------------------------------
 
@@ -1105,6 +1111,8 @@
         self.processTrigger('PRE-FOCUSIN')
         self.processTrigger('POST-FOCUSIN')
 
+        self.__update_record_status()
+
   # ---------------------------------------------------------------------------
 
   def validate(self):
@@ -1200,19 +1208,17 @@
 
         self._form.refreshUIEvents()
 
-        self._form.update_record_counter(
-                record_number=self._currentRecord+1,
-                record_count=self._recordCount)
 
-        self.__update_record_status()
-
-
   # ---------------------------------------------------------------------------
   # Update the record status
   # ---------------------------------------------------------------------------
 
   def __update_record_status(self):
 
+        self._form.update_record_counter(
+                record_number=self._currentRecord+1,
+                record_count=self._recordCount)
+
         if self.mode == 'query':
             record_status = 'QRY'
         else: