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

[reinhard]

Author: reinhard
Date: 2006-09-06 06:06:04 -0500 (Wed, 06 Sep 2006)
New Revision: 8659

Modified:
   trunk/gnue-forms/src/GFInstance.py
Log:
Made cleaned-up event functions private.


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-06 10:50:15 UTC (rev 8658)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-06 11:06:04 UTC (rev 8659)
@@ -83,52 +83,51 @@
     self.eventController = events.EventController ()
     events.EventAware.__init__ (self, self.eventController)
     self.registerEventListeners ({
-                           # First, all events are passed to the focus widget
-                           '__before__'          : self.__beforeEvent,
+                # First, all events are passed to the focus widget
+                '__before__'          : self.__beforeEvent,
 
-                           # Focus-related events
-                           'requestFOCUS'        : self.changeFocus,
-                           'requestENTER'        : self.nextEntry,
-                           'requestNEXTENTRY'    : self.nextEntry,
-                           'requestPREVENTRY'    : self.previousEntry,
-                           'requestNEXTBLOCK'    : self.nextBlock,
-                           'requestPREVBLOCK'    : self.previousBlock,
-                           'requestNEXTPAGE'     : self.nextPage,
-                           'requestPREVPAGE'     : self.previousPage,
-                           'requestPAGE'         : self.gotoPage,
+                # Focus-related events
+                'requestFOCUS'        : self.changeFocus,
+                'requestENTER'        : self.nextEntry,
+                'requestNEXTENTRY'    : self.nextEntry,
+                'requestPREVENTRY'    : self.previousEntry,
+                'requestNEXTBLOCK'    : self.nextBlock,
+                'requestPREVBLOCK'    : self.previousBlock,
+                'requestNEXTPAGE'     : self.nextPage,
+                'requestPREVPAGE'     : self.previousPage,
+                'requestPAGE'         : self.gotoPage,
 
-                           # Record navigation
-                           'requestFIRSTRECORD'  : self.firstRecord,
-                           'requestPREVRECORD'   : self.prevRecord,
-                           'requestNEXTRECORD'   : self.nextRecord,
-                           'requestLASTRECORD'   : self.lastRecord,
-                           'requestJUMPPROMPT'   : self.requestJumpTo,
-                           'requestJUMPRECORD'   : self.jumpRecords,
-                           'requestJUMPROWSUP'   : self.jumpRowsUp,
-                           'requestJUMPROWSDOWN' : self.jumpRowsDown,
+                # Record navigation
+                'requestFIRSTRECORD'  : self.__execute_firstRecord,
+                'requestPREVRECORD'   : self.__execute_prevRecord,
+                'requestNEXTRECORD'   : self.__execute_nextRecord,
+                'requestLASTRECORD'   : self.__execute_lastRecord,
+                'requestJUMPPROMPT'   : self.__execute_jumpPrompt,
+                'requestJUMPRECORD'   : self.__execute_jumpRecord,
+                'requestJUMPROWSUP'   : self.__execute_jumpRowsUp,
+                'requestJUMPROWSDOWN' : self.__execute_jumpRowsDown,
 
-                           # Record insertion/deletion
-                           'requestNEWRECORD'    : self.newRecord,
-                           'requestMARKFORDELETE': self.deleteRecord,
-                           'requestUNDELETE'     : self.undeleteRecord,
+                # Record insertion/deletion
+                'requestNEWRECORD'    : self.__execute_newRecord,
+                'requestMARKFORDELETE': self.__execute_markForDelete,
+                'requestUNDELETE'     : self.__execute_undeleteRecord,
 
-                           # Queries
-                           'requestENTERQUERY'   : self.requestQuery,
-                           'requestCOPYQUERY'    : self.copyQuery,
-                           'requestCANCELQUERY'  : self.cancelQuery,
-                           'requestEXECQUERY'    : self.executeQuery,
+                # Queries
+                'requestENTERQUERY'   : self.requestQuery,
+                'requestCOPYQUERY'    : self.copyQuery,
+                'requestCANCELQUERY'  : self.cancelQuery,
+                'requestEXECQUERY'    : self.executeQuery,
 
-                           # Transactions
-                           'requestCOMMIT'       : self.executeCommit,
-                           'requestPRINTOUT'     : self.executePrintout,
-                           'requestROLLBACK'     : self.executeRollback,
+                # Transactions
+                'requestCOMMIT'       : self.executeCommit,
+                'requestPRINTOUT'     : self.executePrintout,
+                'requestROLLBACK'     : self.executeRollback,
 
-                           # Miscellaneous stuff
-                           'requestMODETOGGLE'   : self.toggleInsertMode,
-                           'requestABOUT'        : self.executeAbout,
-                           'requestUSERCOMMAND'  : self.executeUserCommand,
-                           'requestEXIT'         : self.executeExit,
-                     })
+                # Miscellaneous stuff
+                'requestMODETOGGLE'   : self.toggleInsertMode,
+                'requestABOUT'        : self.executeAbout,
+                'requestUSERCOMMAND'  : self.executeUserCommand,
+                'requestEXIT'         : self.executeExit})
 
     self.connections = connections       # Link to the GBaseApp's GConnections
     self.manager = manager               # Link to the GBaseApp Instance that
@@ -168,46 +167,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Add the basic dialogs
-  # ---------------------------------------------------------------------------
-
-#   def addDialogs (self):
-#     """
-#     Loads the base dialogs into memory.
-# 
-#     Base dialogs include items such as the jump to record
-#     dialog and error dialogs.
-#     """
-# 
-#     # Import and register dialogs
-#     basedir = os.path.dirname (sys.modules [self.__module__].__file__)
-#     basedir = os.path.join (basedir, 'dialogs')
-# 
-#     for dialogName in dircache.listdir (basedir):
-# 
-#       if dialogName [0] == '_' or dialogName == '.svn':
-#         continue
-# 
-#       filename    = os.path.join (basedir, dialogName)
-#       (name, ext) = os.path.splitext (dialogName)
-# 
-#       if os.path.isfile (filename) and ext == '.py':
-#         dialog = dyn_import ('gnue.forms.dialogs.%s' % name)
-# 
-#       elif os.path.isdir (filename):
-#         dialog = dyn_import ('gnue.forms.dialogs.%s' % dialogName)
-# 
-#       else:
-#         continue
-# 
-#       try:
-#         self.addFormFromBuffer (dialog.buildForm ())
-# 
-#       except StandardError, mesg:
-#         print "WARNING: Cannot build %s form \n%s" % (dialogName, mesg)
-
-
-  # ---------------------------------------------------------------------------
   # Load a form from a buffer
   # ---------------------------------------------------------------------------
 
@@ -626,61 +585,43 @@
   # Record navigation
   # ---------------------------------------------------------------------------
 
-  def firstRecord(self, event):
-    """
-    Called whenever an event source has requested that the form advance to the
-    first record in memory
-    """
+  def __execute_firstRecord(self, event):
+
     event._form.first_record()
 
   # ---------------------------------------------------------------------------
 
-  def prevRecord(self, event):
-    """
-    Called whenever an event source has requested that the form moves to the
-    previous record in memory
-    """
+  def __execute_prevRecord(self, event):
+
     event._form.prev_record()
 
   # ---------------------------------------------------------------------------
 
-  def nextRecord(self, event):
-    """
-    Called whenever an event source has requested that the form advance to the
-    next record in memory
-    """
+  def __execute_nextRecord(self, event):
 
     event._form.next_record()
 
   # ---------------------------------------------------------------------------
 
-  def lastRecord(self, event):
-    """
-    Called enever an event source has requested that the form advance to the
-    last record in memory
-    """
+  def __execute_lastRecord(self, event):
+
     event._form.last_record()
 
   # ---------------------------------------------------------------------------
 
-  def requestJumpTo(self,event):
-    """
-    Displays a dialog box prompting for record to jump to then jumps to the
-    requested record
-    """
+  def __execute_jumpPrompt(self,event):
+
     event._form.ask_record()
 
   # ---------------------------------------------------------------------------
 
-  def jumpRecords(self, event):
-    """
-    Jump a specified number of records forward or backward.
-    """
+  def __execute_jumpRecord(self, event):
+
     event._form.jump_records(event.data)
 
   # ---------------------------------------------------------------------------
 
-  def jumpRowsUp(self, event):
+  def __execute_jumpRowsUp(self, event):
 
     if event._form._currentEntry._rows > 1:
       count = -event._form._currentEntry._rows + 1
@@ -696,7 +637,7 @@
 
   # ---------------------------------------------------------------------------
 
-  def jumpRowsDown (self, event):
+  def __execute_jumpRowsDown (self, event):
 
     if event._form._currentEntry._rows > 1:
       count = event._form._currentEntry._rows - 1
@@ -715,26 +656,20 @@
   # Record insertion/deletion
   # ---------------------------------------------------------------------------
 
-  def newRecord(self, event):
-    """
-    Tells the form to create a new record
-    """
+  def __execute_newRecord(self, event):
+
     event._form.new_record()
 
   # ---------------------------------------------------------------------------
 
-  def deleteRecord (self, event):
-    """
-    Tells the form to mark a record for delete
-    """
+  def __execute_markForDelete(self, event):
+
     event._form.delete_record()
 
   # ---------------------------------------------------------------------------
 
-  def undeleteRecord (self, event):
-    """
-    Tells the form to mark a record for delete
-    """
+  def __execute_undeleteRecord(self, event):
+
     event._form.undelete_record()