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

[reinhard]

Author: reinhard
Date: 2006-09-12 09:26:36 -0500 (Tue, 12 Sep 2006)
New Revision: 8677

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Removed some unneeded code pieces.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-09-12 09:09:15 UTC (rev 8676)
+++ trunk/gnue-forms/src/GFForm.py      2006-09-12 14:26:36 UTC (rev 8677)
@@ -414,7 +414,7 @@
         if not focus._type in ['GFEntry', 'GFButton']:
           raise "setFocus failed: Can just switch to GFEntry objects. " +\
                 "You passed a '%s' object." % focus._type
-        self.changeFocus(focus, 1)
+        self.changeFocus(focus)
         self.dispatchEvent('gotoENTRY', object=self._currentEntry, _form=self)
         self._in_trigger_lock = False
 
@@ -786,11 +786,10 @@
     # Changes to the requested entry object requested by an event source
     # -------------------------------------------------------------------------
 
-    def changeFocus(self, widget, fireFocusTriggers=True):
+    def changeFocus(self, widget):
         """
         Changes focus to the requested entry object.
         @param widget: entry to put focus on
-        @param fireFocusTriggers: whether to fire focus-change trigger?
         """
 
         # cannot change focus to same entry
@@ -800,7 +799,6 @@
 
         assert gDebug(5, "Change focus: %s->%s" % (self._currentEntry, widget))
 
-        message = None
         try:
             fieldChange = widget != self._currentEntry
 
@@ -815,9 +813,8 @@
 
             pageChange = widget._page != self._currentPage
 
-            if fireFocusTriggers:
-                self.__focus_triggers('FocusOut', fieldChange, pageChange,
-                        blockChange)
+            self.__focus_triggers('FocusOut', fieldChange, pageChange,
+                    blockChange)
 
             oldEntry = self._currentEntry
 
@@ -839,12 +836,11 @@
             self.dispatchEvent('updateENTRY', oldEntry, _form=self)
             self.dispatchEvent('updateENTRY', self._currentEntry, _form=self)
 
-            if fireFocusTriggers:
-                self.__focus_triggers('FocusIn', fieldChange, pageChange,
-                        blockChange)
+            self.__focus_triggers('FocusIn', fieldChange, pageChange,
+                    blockChange)
 
-                if blockChange or pageChange:
-                    self.update_status()
+            if blockChange or pageChange:
+                self.update_status()
 
             assert gDebug(5, "calling refreshUIEvents ()")
             self.refreshUIEvents()
@@ -855,9 +851,7 @@
             self.beginEditing ()
             raise
 
-        return message
 
-
     # -------------------------------------------------------------------------
     # Fire focus triggers
     # -------------------------------------------------------------------------
@@ -1467,7 +1461,6 @@
         @param reverse: boolean, step focus in reverse direction?
         @param first: boolean, change focus to the first entry in the block?
         @param onlyInBlock: boolean, can jump out of block to next block?
-        @return: None
         """
         currentBlock = self._currentBlock
         mode = self.getCurrentMode()
@@ -1582,9 +1575,8 @@
         """
         Called whenever an event source has requested that the focus change
         to the previous data entry object.
-        @return: None
         """
-        return self.nextEntry(reverse=True)
+        self.nextEntry(reverse=True)
 
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-09-12 09:09:15 UTC (rev 8676)
+++ trunk/gnue-forms/src/GFInstance.py  2006-09-12 14:26:36 UTC (rev 8677)
@@ -452,11 +452,7 @@
       if not event.data.is_navigable (event._form.getCurrentMode ()):
         return False
 
-      newEntry = event.data
-      message = event._form.changeFocus (newEntry)
-      if message:
-        event._form.show_message(message)
-        return False
+      event._form.changeFocus(event.data)
 
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                          _form = event._form)
@@ -489,10 +485,7 @@
 
     # If the trigger changed focus, no need in us doing it too...
     if origEntry == event._form._currentEntry:
-      message = event._form.nextEntry ()
-      if message:
-        event._form.show_message(message)
-        return
+      event._form.nextEntry ()
 
       self.dispatchEvent ('gotoENTRY', object = event._form._currentEntry,
                           _form = event._form)