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

[reinhard]

Author: reinhard
Date: 2006-11-29 14:37:30 -0600 (Wed, 29 Nov 2006)
New Revision: 9091

Modified:
   trunk/gnue-forms/src/GFForm.py
Log:
Set initial focus on form activation instead of form initialization.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-11-29 20:29:20 UTC (rev 9090)
+++ trunk/gnue-forms/src/GFForm.py      2006-11-29 20:37:30 UTC (rev 9091)
@@ -116,8 +116,7 @@
         self.__visible = False
 
         # The "None" init gives datasources time to setup master/detail
-        self._inits = [self.phase_1_init, self.phase_2_init, self.phase_3_init,
-                self.phase_4_init]
+        self._inits = [self.phase_1_init, self.phase_2_init, self.phase_3_init]
 
         # Trigger support
         self._triggerns = {}
@@ -313,24 +312,6 @@
         for block in self._logic._blockList:
             block.populate()
 
-    # -------------------------------------------------------------------------
-    # Phase 4 initialization
-    # -------------------------------------------------------------------------
-
-    def phase_4_init(self):
-        """
-        This happens after after the prequery on datasource level has been run.
-        Once the prequery on datasource level is depreciated, this can be
-        merged with phase 3 init.
-        """
-
-        # Set initial focus
-        # This must happen after the prequery has been executed (phase 3 init
-        # of the datasource), otherwise a dropdown will be set to edit mode
-        # before it has been populated with the allowed values, in case the
-        # first entry on the form is a dropdown.
-        self.__find_and_change_focus([self], False)
-
         self.update_insert_status()
 
         self.processTrigger('On-Startup')
@@ -378,7 +359,8 @@
         assert gDebug(4, "Processing activation trigger")
         self.processTrigger('On-Activation')
 
-        self.beginEditing()
+        # Set initial focus
+        self.__find_and_change_focus([self._currentPage], False)
 
         self.__visible = True