commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r8518 - in trunk/gnue-forms/src: . GFObjects uidrivers/_base uidr


From: reinhard
Subject: [gnue] r8518 - in trunk/gnue-forms/src: . GFObjects uidrivers/_base uidrivers/curses/widgets uidrivers/gtk2 uidrivers/gtk2/widgets/form uidrivers/html/widgets/form uidrivers/qt/widgets/form uidrivers/win32/widgets/form uidrivers/wx/widgets/form uidrivers/wx26/widgets
Date: Wed, 28 Jun 2006 18:18:27 -0500 (CDT)

Author: reinhard
Date: 2006-06-28 18:18:25 -0500 (Wed, 28 Jun 2006)
New Revision: 8518

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
   trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Cleanup of status bar related functions.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-06-28 20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/GFForm.py      2006-06-28 23:18:25 UTC (rev 8518)
@@ -554,10 +554,95 @@
         @param message: message to be displayed
         """
 
-        self._instance.updateStatusBar(tip=message, form=self)
+        self.__update_status(tip=message)
 
 
     # -------------------------------------------------------------------------
+    # Helper functions to update the status bar of this form
+    # -------------------------------------------------------------------------
+
+    # FIXME: at some point these will become private.
+
+    def update_status(self):
+
+        self.update_tip()
+        self.update_record_status()
+        self.update_insert_status()
+        self.update_record_counter()
+        self.update_page_counter()
+
+    # -------------------------------------------------------------------------
+
+    def update_tip(self):
+
+        tip = ''
+        if self._currentEntry:
+            if self._currentEntry.get_option('tip'):
+                tip = self._currentEntry.get_option('tip')
+        self.__update_status(tip=tip)
+
+    # -------------------------------------------------------------------------
+
+    def update_record_status(self):
+
+        if self._currentBlock:
+            if self._currentBlock._resultSet.current.isDeleted():
+                status = 'DEL'
+            elif self._currentBlock._resultSet.current.isPending():
+                status = 'MOD'
+            elif self._currentBlock.mode == 'query':
+                status = 'QRY'
+            else:
+                status = 'OK'
+
+            self.__update_status(record_status=status)
+
+    # -------------------------------------------------------------------------
+
+    def update_insert_status(self):
+
+        if self._insertMode:
+            self.__update_status(insert_status='INS')
+        else:
+            self.__update_status(insert_status='OVR')
+
+    # -------------------------------------------------------------------------
+
+    def update_record_counter(self):
+
+        if self._currentBlock:
+            self.__update_status(
+                    record_number=self._currentBlock._currentRecord+1,
+                    record_count=self._currentBlock._recordCount)
+
+    # -------------------------------------------------------------------------
+
+    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:
+            self.uiWidget._ui_update_status_(tip, record_status, insert_status,
+                    record_number, record_count, page_number, page_count)
+
+
+    # -------------------------------------------------------------------------
     # Beep
     # -------------------------------------------------------------------------
 
@@ -731,7 +816,7 @@
                         blockChange)
 
                 if blockChange or pageChange:
-                    self._instance.updateStatus (self)
+                    self.update_status()
 
             assert gDebug(5, "calling refreshUIEvents ()")
             self.refreshUIEvents()

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-06-28 20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/GFInstance.py  2006-06-28 23:18:25 UTC (rev 8518)
@@ -390,7 +390,7 @@
     # displaying the real UI form. 
     assert gDebug (4, "Initial display setup")    
     form.refreshDisplay (form)
-    self.updateStatus (form)
+    form.update_status()
 
     assert gDebug (4, "Setting initial focus")    
     self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
@@ -412,117 +412,6 @@
 
 
   # ===========================================================================
-  # UI FUNCTIONS
-  # ===========================================================================
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: Insert Mode flag
-  # ---------------------------------------------------------------------------
-
-  def updateInsertMode (self, form):
-
-    self.updateStatusBar (insertMode = form._insertMode, form = form)
-
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: Record counter
-  # ---------------------------------------------------------------------------
-
-  def updateRecordCounter (self, form):
-
-    if form._currentBlock:
-      self.updateStatusBar (currentRecord = 
form._currentBlock._currentRecord+1,
-                      maxRecord = form._currentBlock._recordCount, form = form)
-
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: Page counter
-  # ---------------------------------------------------------------------------
-
-  def updatePageCounter (self, form):
-
-    maxPages = len (form._layout._pageList)
-    count = form._layout._pageList.index (form._currentPage)
-    self.updateStatusBar (currentPage = count + 1, maxPage = maxPages,
-                          form = form)
-
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: Tip
-  # ---------------------------------------------------------------------------
-
-  def updateTip (self, form):
-
-    tip = ''
-    if form._currentEntry:
-      if form._currentEntry.get_option ('tip'):
-        tip = form._currentEntry.get_option ('tip')
-    self.updateStatusBar (tip = tip, form = form)
-
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: Record status
-  # ---------------------------------------------------------------------------
-
-  def updateRecordStatus(self, form):
-
-    if not form._currentBlock:
-      return
-
-    if form._currentBlock._resultSet.current.isDeleted ():
-      status = 'deleted'
-    elif form._currentBlock._resultSet.current.isPending ():
-      status = 'modified'
-    elif form._currentBlock.mode == 'query':
-      status = 'query'
-    else:
-      status = 'saved'
-
-    self.updateStatusBar (recordStatus = status, form = form)
-
-
-  # ---------------------------------------------------------------------------
-  # Update Statusbar: all fields of the status bar
-  # ---------------------------------------------------------------------------
-
-  def updateStatus (self, form):
-    self.updateTip (form = form)
-    self.updateInsertMode (form = form)
-    self.updateRecordCounter (form = form)
-    self.updateRecordStatus (form = form)
-    self.updatePageCounter (form = form)
-
-
-  #
-  # updateStatusBar
-  #
-  # generates the event to the UI that
-  # tells it to update it's status bar
-
-  # ---------------------------------------------------------------------------
-  # Update the status bar
-  # ---------------------------------------------------------------------------
-
-  def updateStatusBar (self, tip = None, recordStatus = None,
-           insertMode = None, currentRecord = None, maxRecord = None,
-           currentPage = None, maxPage = None, form = None):
-
-    if tip is None and hasattr (self, '__lasttip'):
-      tip = self.__lasttip
-
-    self.__lasttip = tip
-    self.dispatchEvent ('uiUPDATESTATUS',
-                        tip           = tip,
-                        recordStatus  = recordStatus,
-                        insertMode    = insertMode,
-                        currentRecord = currentRecord,
-                        maxRecord     = maxRecord,
-                        currentPage   = currentPage,
-                        maxPage       = maxPage,
-                        _form         = form)
-
-
-  # ===========================================================================
   # EVENT FUNCTIONS
   # ===========================================================================
   
@@ -541,8 +430,8 @@
     """
     self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
     form.beginEditing()
-    self.updateRecordCounter (form)
-    self.updateRecordStatus (form)
+    form.update_record_counter()
+    form.update_record_status()
 
 
   # ---------------------------------------------------------------------------
@@ -611,8 +500,8 @@
                           _form = event._form)
       event._form.beginEditing()
 
-    self.updateRecordStatus (event._form)
-    self.updateTip (event._form)
+    event._form.update_record_status()
+    event._form.update_tip()
 
 
   # ---------------------------------------------------------------------------
@@ -641,8 +530,8 @@
                           _form = event._form)
       event._form.beginEditing()
 
-    self.updateRecordStatus (event._form)
-    self.updateTip (event._form)
+    event._form.update_record_status()
+    event._form.update_tip()
 
 
   # ---------------------------------------------------------------------------
@@ -659,7 +548,7 @@
       return
 
     event._form.nextBlock ()
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -676,7 +565,7 @@
       return
 
     event._form.previousBlock ()
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -698,7 +587,7 @@
       nextIndex = currentIndex + 1
 
     event._form.findAndChangeFocus (event._form._layout._pageList [nextIndex])
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -716,7 +605,7 @@
     pageList = event._form._layout._pageList
     currentIndex = pageList.index (event._form._currentPage)
     event._form.findAndChangeFocus (pageList [currentIndex - 1])
-    self.updateStatus (event._form)
+    event._form.update_status()
 
   # ---------------------------------------------------------------------------
   # Jump to a specific page
@@ -732,7 +621,7 @@
 
     newpage = event._form._layout._pageList [event.data]
     event._form.findAndChangeFocus (newpage)
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -972,7 +861,7 @@
                           _form = event._form)
     else:
       event._form.deleteRecord ()
-      self.updateRecordStatus (event._form)
+      event._form.update_record_status()
 
 
   # ---------------------------------------------------------------------------
@@ -985,7 +874,7 @@
     """
 
     event._form.undeleteRecord ()
-    self.updateRecordStatus (event._form)
+    event._form.update_record_status()
 
 
   # ---------------------------------------------------------------------------
@@ -1082,7 +971,7 @@
     """
 
     event._form.toggleInsertMode ()
-    self.updateInsertMode (event._form)
+    event._form.update_insert_status()
 
 
   # ---------------------------------------------------------------------------
@@ -1144,8 +1033,8 @@
                          _form = event._form)
       event._form.beginEditing()
 
-      self.updateRecordStatus (event._form)
-      self.updateTip (event._form)
+      event._form.update_record_status()
+      event._form.update_tip()
 
     return True
 
@@ -1168,7 +1057,7 @@
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
     event._form.beginEditing()
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -1189,7 +1078,7 @@
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
     event._form.beginEditing()
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------
@@ -1209,7 +1098,7 @@
     self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                        _form = event._form)
     event._form.beginEditing()
-    self.updateStatus (event._form)
+    event._form.update_status()
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-06-28 20:46:34 UTC (rev 
8517)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-06-28 23:18:25 UTC (rev 
8518)
@@ -351,8 +351,8 @@
     else:
       self.switchRecord (recno - self._currentRecord)
 
-    self._form._instance.updateRecordCounter (self._form)
-    self._form._instance.updateRecordStatus (self._form)
+    self._form.update_record_counter()
+    self._form.update_record_status()
 
 
   # ---------------------------------------------------------------------------
@@ -779,7 +779,7 @@
 
         # Move to correct record in grid
         self._form.findAndChangeFocus (self._form._currentEntry)
-        self._form._instance.updateRecordCounter (self._form)
+        self._form.update_record_counter(self._form)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-06-28 20:46:34 UTC 
(rev 8517)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-06-28 23:18:25 UTC 
(rev 8518)
@@ -111,13 +111,6 @@
 
     events.EventAware.__init__(self, eventHandler)
 
-    # Mapping - internal record status : displayed on status bar
-    self.statusValues = {'saved'     :'OK',
-                         'modified'  :'MOD',
-                         'deleted'   :'DEL',
-                         'query'     :'QRY',
-                         }
-
     # So other modules can get to the ui
     __builtins__ ['forms_ui']  = self
 
@@ -205,7 +198,6 @@
             'endWAIT'          : self.endWait,
             'formALERT'        : self.formAlert,
             'formBEEP'         : self.formBeep,
-            'uiUPDATESTATUS'   : self.updateStatusBar,
 
             # Clipboard contents
             'setCLIPBOARD'     : self.setClipboardContents,
@@ -664,30 +656,6 @@
     uiForm.gotoPage (uiPage)
 
 
-  # ---------------------------------------------------------------------------
-  # Calls the UIForm's _setStatusBar function to update status
-  # ---------------------------------------------------------------------------
-
-  def updateStatusBar (self, event):
-
-    status = None
-    if event.recordStatus != None:
-      status = self.statusValues [event.recordStatus]
-
-    insertValue = None
-    if event.insertMode:
-      insertValue = event.insertMode and 'INS' or 'OVR'
-
-    self._gfObjToUIWidget [event._form]._uiForm._setStatusBar (event.tip,
-                                                           status,
-                                                           insertValue,
-                                                           event.currentRecord,
-                                                           event.maxRecord,
-                                                           event.currentPage,
-                                                           event.maxPage)
-
-
-
   #############################################################################
   #
   # Required Functions

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-06-28 
23:18:25 UTC (rev 8518)
@@ -86,7 +86,7 @@
   # Set status bar
   # ---------------------------------------------------------------------------
 
-  def _setStatusBar (self, tip, status, insert, curRec, maxRec, curPage,
+  def _ui_update_status_(self, tip, status, insert, curRec, maxRec, curPage,
                      maxPage):
 
     # Gets called with incomplete parameters, so we always have to remember the

Modified: trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2006-06-28 20:46:34 UTC 
(rev 8517)
+++ trunk/gnue-forms/src/uidrivers/gtk2/MenuBar.py      2006-06-28 23:18:25 UTC 
(rev 8518)
@@ -122,8 +122,7 @@
 
   def _selectHandler (self, menuItem, userAction):
 
-    self.container._setStatusBar (userAction.description, None, None, None,
-                                  None, None, None, procMsg = False)
+    self.container._show_tip (userAction.description)
 
 
   # ---------------------------------------------------------------------------
@@ -132,8 +131,7 @@
 
   def _deselectHandler (self, menuItem, userAction):
 
-    self.container._setStatusBar ('', None, None, None, None, None, None,
-        procMsg = False)
+    self.container._show_tiip ('')
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-06-28 
23:18:25 UTC (rev 8518)
@@ -185,11 +185,25 @@
           
                      
   # ---------------------------------------------------------------------------
+  # Show a tip in the status bar. Used by the menu.
+  # ---------------------------------------------------------------------------
+
+  def _show_tip (self, tip):
+    
+    if not hasattr (self, 'statusBar1'):
+      return
+    
+    text = self._makeSafe ("%s" % tip)
+    context = self.statusBar1.get_context_id ('tip')
+    self.statusBar1.push (context, text)
+
+
+  # ---------------------------------------------------------------------------
   # set values in the corresponding status bars
   # ---------------------------------------------------------------------------
 
-  def _setStatusBar (self, tip, statusValue, insertValue, currentRecord,
-                    maxRecord, currentPage, maxPage, procMsg = True):
+  def _ui_update_status_ (self, tip, record_status, insert_status,
+          record_number, record_count, page_number, page_count):
     
     if not hasattr (self, 'statusBar1'):
       return
@@ -199,26 +213,25 @@
       context = self.statusBar1.get_context_id ('tip')
       self.statusBar1.push (context, text)
 
-    if statusValue:
+    if record_status:
       context = self.statusBar2.get_context_id ('statusValue')
-      self.statusBar2.push (context, self._makeSafe (statusValue))
+      self.statusBar2.push (context, self._makeSafe (record_status))
       
-    if insertValue:
+    if insert_status:
       context = self.statusBar3.get_context_id ('insertValue')
-      self.statusBar3.push (context, self._makeSafe (insertValue))
+      self.statusBar3.push (context, self._makeSafe (insert_status))
 
-    if currentRecord and maxRecord:
+    if record_number and record_count:
       context = self.statusBar4.get_context_id ('currentRecord_and_maxRecord')
-      text    = string.strip ("%s/%s" % (currentRecord, maxRecord))
+      text    = string.strip ("%s/%s" % (record_number, record_count))
       self.statusBar4.push (context, self._makeSafe (text))
 
-    if currentPage and maxPage:
+    if page_number and page_count:
       context = self.statusBar5.get_context_id ('currentPage_and_maxPage')
-      text    = string.strip ("%s/%s" % (currentPage, maxPage))
+      text    = string.strip ("%s/%s" % (page_number, page_count))
       self.statusBar5.push (context, self._makeSafe (text))
 
-    if procMsg:
-      self._uiDriver.processMessages ()
+    self._uiDriver.processMessages ()
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py  2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/form/widget.py  2006-06-28 
23:18:25 UTC (rev 8518)
@@ -79,7 +79,7 @@
   def gotoPage(self,event):
     pass
 
-  def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+  def _ui_update_status_(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
     pass
 
   def show(self):

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2006-06-28 
23:18:25 UTC (rev 8518)
@@ -154,9 +154,9 @@
 
 
   #
-  # _setStatusBar
+  # _ui_update_status_
   #
-  def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+  def _ui_update_status_(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
 
     # Popup forms don't seem to have a statusbar
     try:

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-06-28 
23:18:25 UTC (rev 8518)
@@ -145,30 +145,37 @@
     
       
   #
-  # _setStatusBar
+  # Update status bar
   #
-  def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+  def _ui_update_status_(self, tip, record_status, insert_status,
+          record_number, record_count, page_number, page_count):
+
     if not hasattr (self, 'statusBar'):
       return
       
-    if tip != None:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0, 
textEncode(tip))
+    if tip is not None:
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 0,
+              textEncode(tip))
 
-    if statusValue:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 1, 
textEncode(statusValue))
+    if record_status:
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 1,
+              textEncode(record_status))
 
-    if insertValue:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 2, 
textEncode(insertValue))
+    if insert_status:
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 2,
+              textEncode(insert_status))
 
-    if currentRecord and  maxRecord:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 3, 
("%s/%s" % (currentRecord,maxRecord)).strip())
+    if record_number and record_count:
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 3,
+              ("%s/%s" % (record_number, record_count)).strip())
 
-    if currentPage and  maxPage:
-      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 4, 
("%s/%s" % (currentPage,maxPage)).strip())
+    if page_number and page_count:
+      win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 4,
+              ("%s/%s" % (page_number, page_count)).strip())
 
     return
-
 
+
   def show(self):
     self.mainWindow.Show()
     if self._form.style == 'dialog':

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-06-28 
20:46:34 UTC (rev 8517)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-06-28 
23:18:25 UTC (rev 8518)
@@ -156,7 +156,7 @@
   # --------------------------------------------------------------------------
   # Set statusbar values
   # --------------------------------------------------------------------------
-  def _setStatusBar(self, tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+  def _ui_update_status_(self, tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
     """
     Sets statusbar values.
     

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-06-28 20:46:34 UTC 
(rev 8517)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-06-28 23:18:25 UTC 
(rev 8518)
@@ -187,28 +187,28 @@
 
     # -------------------------------------------------------------------------
 
-    def _setStatusBar (self, tip, statusValue, insertValue, currentRecord,
-        maxRecord, currentPage, maxPage, procMsg=True):
+    def _ui_update_status_(self, tip, record_status, insert_status,
+            record_number, record_count, page_number, page_count):
 
         if not self.statusBar:
             return
 
         if tip is not None:
-            self.statusBar.SetStatusText (tip, 0)
+            self.statusBar.SetStatusText(tip, 0)
 
-        if statusValue is not None:
-            self.statusBar.SetStatusText (statusValue, 1)
+        if record_status is not None:
+            self.statusBar.SetStatusText(record_status, 1)
 
-        if insertValue is not None:
-            self.statusBar.SetStatusText (insertValue, 2)
+        if insert_status is not None:
+            self.statusBar.SetStatusText(insert_status, 2)
 
-        if currentRecord and maxRecord:
-            self.statusBar.SetStatusText ( \
-                ("%s/%s" % (currentRecord, maxRecord)).strip (), 3)
+        if record_number and record_count:
+            self.statusBar.SetStatusText(
+                    "%s/%s" % (record_number, record_count), 3)
 
-        if currentPage and maxPage:
-            self.statusBar.SetStatusText ( \
-                ("%s/%s" % (currentPage, maxPage)).strip (), 4)
+        if page_number and page_count:
+            self.statusBar.SetStatusText(
+                    "%s/%s" % (page_number, page_count), 4)
 
 
     # -------------------------------------------------------------------------





reply via email to

[Prev in Thread] Current Thread [Next in Thread]