[gnue] r8508 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2006-06-22 12:10:52 -0500 (Thu, 22 Jun 2006)
New Revision: 8508

Modified:
   trunk/gnue-forms/src/GFObjects/commanders.py
Log:
Put methods into a slightly more logical (?) order.


Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 14:21:45 UTC 
(rev 8507)
+++ trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 17:10:52 UTC 
(rev 8508)
@@ -141,34 +141,31 @@
 
 
     # -------------------------------------------------------------------------
-    # Update enabled/disabled status
+    # Trigger functions
     # -------------------------------------------------------------------------
 
-    def update_status(self):
-        """
-        Update the enabled/disabled status of the commander.
+    def __trigger_get_state(self):
+        return self.state
 
-        The attached action calls this function whenever its enabled/disabled
-        status changes, so the commander can adjust the status of the user
-        interface element.
-        """
+    # -------------------------------------------------------------------------
 
-        if self.state and self.__action_off is not None:
-            new_ui_enabled = self.enabled and self.__action_off.enabled
-        elif self.__action is not None:
-            new_ui_enabled = self.enabled and self.__action.enabled
-        else:
-            new_ui_enabled = False
+    def __trigger_set_state(self, value):
+        if value != self.state:
+            self.__fire()
 
-        if new_ui_enabled != self._ui_enabled:
-            if new_ui_enabled:
-                self.uiWidget.do_enable()
-            else:
-                self.uiWidget.do_disable()
-            self._ui_enabled = new_ui_enabled
+    # -------------------------------------------------------------------------
 
+    def __trigger_get_enabled(self):
+        return self.enabled
 
     # -------------------------------------------------------------------------
+
+    def __trigger_set_enabled(self, value):
+        self.enabled = value
+        self.update_status()
+
+
+    # -------------------------------------------------------------------------
     # User Events
     # -------------------------------------------------------------------------
 
@@ -194,31 +191,34 @@
 
 
     # -------------------------------------------------------------------------
-    # Trigger functions
+    # Update enabled/disabled status
     # -------------------------------------------------------------------------
 
-    def __trigger_get_state(self):
-        return self.state
+    def update_status(self):
+        """
+        Update the enabled/disabled status of the commander.
 
-    # -------------------------------------------------------------------------
+        The attached action calls this function whenever its enabled/disabled
+        status changes, so the commander can adjust the status of the user
+        interface element.
+        """
 
-    def __trigger_set_state(self, value):
-        if value != self.state:
-            self.__fire()
+        if self.state and self.__action_off is not None:
+            new_ui_enabled = self.enabled and self.__action_off.enabled
+        elif self.__action is not None:
+            new_ui_enabled = self.enabled and self.__action.enabled
+        else:
+            new_ui_enabled = False
 
-    # -------------------------------------------------------------------------
+        if new_ui_enabled != self._ui_enabled:
+            if new_ui_enabled:
+                self.uiWidget.do_enable()
+            else:
+                self.uiWidget.do_disable()
+            self._ui_enabled = new_ui_enabled
 
-    def __trigger_get_enabled(self):
-        return self.enabled
 
     # -------------------------------------------------------------------------
-
-    def __trigger_set_enabled(self, value):
-        self.enabled = value
-        self.update_status()
-
-
-    # -------------------------------------------------------------------------
     # Fire the commander
     # -------------------------------------------------------------------------