[gnue] r8663 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2006-09-11 09:19:35 -0500 (Mon, 11 Sep 2006)
New Revision: 8663

Modified:
   trunk/gnue-forms/src/GFInstance.py
Log:
Further cleanup.


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-11 13:57:31 UTC (rev 8662)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-11 14:19:35 UTC (rev 8663)
@@ -125,9 +125,9 @@
                 # Miscellaneous stuff
                 'requestMODETOGGLE'   : self.toggleInsertMode,
                 'requestABOUT'        : self.executeAbout,
-                'requestPRINTOUT'     : self.executePrintout,
-                'requestUSERCOMMAND'  : self.executeUserCommand,
-                'requestEXIT'         : self.executeExit})
+                'requestPRINTOUT'     : self.__execute_printout,
+                'requestUSERCOMMAND'  : self.__execute_user_command,
+                'requestEXIT'         : self.__execute_exit})
 
     self.connections = connections       # Link to the GBaseApp's GConnections
     self.manager = manager               # Link to the GBaseApp Instance that
@@ -375,23 +375,7 @@
   # From here down should be nothing but eventListeners listed in the __init__
   # above.
 
-
   # ---------------------------------------------------------------------------
-  # Update status bar due to changes in an entry
-  # ---------------------------------------------------------------------------
-
-  def _entryUpdated (self, form):
-    """
-    Common code snipped called when something has changed with an entry and it
-    has to update the status bar. Used to cut down on repeated code.
-    """
-    self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
-    form.beginEditing()
-    form.update_record_counter()
-    form.update_record_status()
-
-
-  # ---------------------------------------------------------------------------
   # Handle an event before it's sent to usual event processing
   # ---------------------------------------------------------------------------
 
@@ -428,6 +412,45 @@
 
 
   # ---------------------------------------------------------------------------
+  # Change the focus to an entry object
+  # ---------------------------------------------------------------------------
+
+  def changeFocus(self, event):
+    """
+    Change the focus to the entry object requested by the event source
+    """
+
+    if event.data == event._form._currentEntry:
+        return True
+
+    if not event._form.endEditing ():
+      # Old focus entry has invalid value: beat the UI focus back, so we are
+      # captured until the value is corrected.
+      self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
+                         _form = event._form)
+      return False
+
+    if event.data._type in ['GFEntry', 'GFImage', 'GFButton']:
+      if not event.data.is_navigable (event._form.getCurrentMode ()):
+        return False
+
+      newEntry = event.data
+      message = event._form.changeFocus (newEntry)
+      if message:
+        self.displayMessageBox (message)
+        return False
+
+      self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
+                         _form = event._form)
+      event._form.beginEditing()
+
+      event._form.update_record_status()
+      event._form.update_tip()
+
+    return True
+
+
+  # ---------------------------------------------------------------------------
   # Move focus to the next entry
   # ---------------------------------------------------------------------------
 
@@ -716,16 +739,18 @@
 
 
   # ---------------------------------------------------------------------------
-  # Verify state of data and exit form
+  # Toggle insert mode
   # ---------------------------------------------------------------------------
 
-  def executeExit(self, event):
-    """
-    When exit is requested verify that the data has been saved
-    """
-    event._form.execute_close()
+  def toggleInsertMode(self, event):
+        """
+        Tells the form to toggle insert mode.
+        """
 
+        event._form.toggleInsertMode ()
+        event._form.update_insert_status()
 
+
   # ---------------------------------------------------------------------------
   # Display the about dialog
   # ---------------------------------------------------------------------------
@@ -750,80 +775,31 @@
     return self._uiinstance.showMessage (message, kind, title, cancel)
 
 
-
   # ---------------------------------------------------------------------------
-  # Toggle insert mode
-  # ---------------------------------------------------------------------------
-
-  def toggleInsertMode (self, event):
-    """
-    Tells the form to toggle mode
-    """
-
-    event._form.toggleInsertMode ()
-    event._form.update_insert_status()
-
-
-  # ---------------------------------------------------------------------------
   # Fire a trigger named 'process-printout' (if it exists)
   # ---------------------------------------------------------------------------
 
-  def executePrintout (self, event):
-    """
-    If the form has a trigger named process-printout then fire it
-    """
+  def __execute_printout(self, event):
 
     event._form.printout()
 
 
   # ---------------------------------------------------------------------------
-  # Change the focus to an entry object
+  # Execute user command
   # ---------------------------------------------------------------------------
 
-  def changeFocus(self, event):
-    """
-    Change the focus to the entry object requested by the event source
-    """
+  def __execute_user_command(self, event):
 
-    if event.data == event._form._currentEntry:
-        return True
+    try:
+      event._form.fireTrigger("KEY-%s" % event.triggerName.upper())
+    except KeyError:
+      pass
 
-    if not event._form.endEditing ():
-      # Old focus entry has invalid value: beat the UI focus back, so we are
-      # captured until the value is corrected.
-      self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
-                         _form = event._form)
-      return False
 
-    if event.data._type in ['GFEntry', 'GFImage', 'GFButton']:
-      if not event.data.is_navigable (event._form.getCurrentMode ()):
-        return False
-
-      newEntry = event.data
-      message = event._form.changeFocus (newEntry)
-      if message:
-        self.displayMessageBox (message)
-        return False
-
-      self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
-                         _form = event._form)
-      event._form.beginEditing()
-
-      event._form.update_record_status()
-      event._form.update_tip()
-
-    return True
-
-
   # ---------------------------------------------------------------------------
-  # Execute user command
+  # Verify state of data and exit form
   # ---------------------------------------------------------------------------
 
-  def executeUserCommand(self, event):
-    """
-    Fires a trigger
-    """
-    try:
-      event._form.fireTrigger ("KEY-%s" % event.triggerName.upper())
-    except KeyError:
-      pass
+  def __execute_exit(self, event):
+
+    event._form.execute_close()