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

[reinhard]

Author: reinhard
Date: 2006-09-11 09:55:54 -0500 (Mon, 11 Sep 2006)
New Revision: 8664

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Cleanup of insert/overwrite mode toggle (still doesn't do anything though).


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-09-11 14:19:35 UTC (rev 8663)
+++ trunk/gnue-forms/src/GFForm.py      2006-09-11 14:55:54 UTC (rev 8664)
@@ -83,7 +83,7 @@
         self._actions = {}
 
         # Insert/Overwrite mode
-        self._insertMode = True
+        self.__insert_mode = True
 
         # Focus information
         self._currentPage = None
@@ -173,6 +173,9 @@
             'commit': {'function': self.commit, 'global': True},
             'rollback': {'function': self.rollback, 'global': True},
 
+            # Other stuff
+            'toggle_insert_mode': {'function': self.toggle_insert_mode},
+
             'printout': {
                 'function': self.__trigger_printout},
             'activateDialog': {
@@ -674,7 +677,7 @@
 
     def update_insert_status(self):
 
-        if self._insertMode:
+        if self.__insert_mode:
             self.__update_status(insert_status='INS')
         else:
             self.__update_status(insert_status='OVR')
@@ -1371,6 +1374,19 @@
 
 
     # -------------------------------------------------------------------------
+    # Toggles insert mode
+    # -------------------------------------------------------------------------
+
+    def toggle_insert_mode(self):
+        """
+        Toggles insert mode.
+        """
+        self.__insert_mode = not self.__insert_mode
+        self.update_insert_status()
+        # FIXME: This does not have any effect
+
+
+    # -------------------------------------------------------------------------
     # Print form
     # -------------------------------------------------------------------------
 
@@ -1726,18 +1742,6 @@
 
 
     # -------------------------------------------------------------------------
-    # Toggles insert mode
-    # -------------------------------------------------------------------------
-
-    def toggleInsertMode(self):
-        """
-        Toggles insert mode.
-        @return: None
-        """
-        self._insertMode = not self._insertMode
-
-
-    # -------------------------------------------------------------------------
     # Is this form visible?
     # -------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-11 14:19:35 UTC (rev 8663)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-11 14:55:54 UTC (rev 8664)
@@ -123,7 +123,7 @@
                 'requestROLLBACK'     : self.__execute_rollback,
 
                 # Miscellaneous stuff
-                'requestMODETOGGLE'   : self.toggleInsertMode,
+                'requestMODETOGGLE'   : self.__execute_modeToggle,
                 'requestABOUT'        : self.executeAbout,
                 'requestPRINTOUT'     : self.__execute_printout,
                 'requestUSERCOMMAND'  : self.__execute_user_command,
@@ -742,13 +742,9 @@
   # Toggle insert mode
   # ---------------------------------------------------------------------------
 
-  def toggleInsertMode(self, event):
-        """
-        Tells the form to toggle insert mode.
-        """
+  def __execute_modeToggle(self, event):
 
-        event._form.toggleInsertMode ()
-        event._form.update_insert_status()
+    event._form.toggle_insert_mode()
 
 
   # ---------------------------------------------------------------------------