[gnue] r8829 - in trunk/gnue-forms/src: . uidrivers/_base uidrivers/curses uidrivers/curses/widgets uidrivers/gtk2 uidrivers/gtk2/widgets/form uidrivers/win32 uidrivers/win32/widgets/form uidrivers/wx uidrivers/wx/widgets/form

[reinhard]

Author: reinhard
Date: 2006-10-17 13:43:28 -0500 (Tue, 17 Oct 2006)
New Revision: 8829

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
   trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
Log:
More direct way of setting title of a form.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-10-17 18:32:36 UTC (rev 8828)
+++ trunk/gnue-forms/src/GFForm.py      2006-10-17 18:43:28 UTC (rev 8829)
@@ -384,7 +384,7 @@
         @param title: new title
         """
         self.title = title
-        self.dispatchEvent('setTitle', title=title, _form=self);
+        self.uiWidget._ui_set_title_(title)
 
     # -------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-10-17 18:32:36 UTC 
(rev 8828)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2006-10-17 18:43:28 UTC 
(rev 8829)
@@ -182,8 +182,6 @@
 
     # register incomming events
     self.registerEventListeners ({
-            'setTitle'         : self.setTitle,
-
             # Clipboard contents
             'setCLIPBOARD'     : self.setClipboardContents,
             'getCLIPBOARD'     : self.getClipboardContents,
@@ -427,14 +425,3 @@
   def _activateForm (self, form, modal):
 
     raise ImplementationError, (self.name, '_activateForm')
-
-
-  # ---------------------------------------------------------------------------
-  # Set the form's displayed title
-  # ---------------------------------------------------------------------------
-
-  def setTitle (self, event):
-    """
-    set the form's displayed title
-    """
-    pass

Modified: trunk/gnue-forms/src/uidrivers/curses/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2006-10-17 18:32:36 UTC 
(rev 8828)
+++ trunk/gnue-forms/src/uidrivers/curses/UIdriver.py   2006-10-17 18:43:28 UTC 
(rev 8829)
@@ -209,16 +209,6 @@
         sys.excepthook(*sys.exc_info())
 
   # ---------------------------------------------------------------------------
-  # Set title of a form
-  # ---------------------------------------------------------------------------
-
-  def setTitle (self, event):
-
-    # Exactly this should actually be done by the base ui driver
-    uiForm = self._gfObjToUIWidget [event._form]
-    uiForm.setTitle (event.title)
-
-  # ---------------------------------------------------------------------------
   # Show a message
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-10-17 
18:32:36 UTC (rev 8828)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2006-10-17 
18:43:28 UTC (rev 8829)
@@ -65,13 +65,13 @@
     self.__window = curses.newpad (y, x)
     self.__window.keypad (1)
 
-    self.setTitle (event.object.title)
+    self._ui_set_title_(event.object.title)
 
   # ---------------------------------------------------------------------------
   # Set form title
   # ---------------------------------------------------------------------------
 
-  def setTitle (self, title):
+  def _ui_set_title_(self, title):
 
     (y, x) = self.__window.getmaxyx ()
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2006-10-17 18:32:36 UTC 
(rev 8828)
+++ trunk/gnue-forms/src/uidrivers/gtk2/UIdriver.py     2006-10-17 18:43:28 UTC 
(rev 8829)
@@ -175,19 +175,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Set the forms title
-  # ---------------------------------------------------------------------------
-
-  def setTitle (self, event):
-    ui = self._gfObjToUIWidget [event._form]
-
-    try:
-      ui.mainWindow.set_title (event.title)
-    except AttributeError:
-      pass
-
-
-  # ---------------------------------------------------------------------------
   # Start an input dialog and return the data record or None if cancelled
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-17 
18:32:36 UTC (rev 8828)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2006-10-17 
18:43:28 UTC (rev 8829)
@@ -246,6 +246,14 @@
 
 
   # ---------------------------------------------------------------------------
+  # Set the forms title
+  # ---------------------------------------------------------------------------
+
+  def _ui_set_title_(self, title):
+      self.mainWindow.set_title(title)
+
+
+  # ---------------------------------------------------------------------------
   # Makes the requested page visible while hiding the others
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-10-17 18:32:36 UTC 
(rev 8828)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-10-17 18:43:28 UTC 
(rev 8829)
@@ -231,15 +231,7 @@
       win32clipboard.CloseClipboard()
     else:
       assert gDebug(6,'Unable to open clipboard for write')
-
 
-  def setTitle(self, event):
-    ui = self._gfObjToUIWidget[event._form]
-    try:
-      win32gui.SetWindowText(ui.mainWindow.GetHwnd(), event.title)
-    except AttributeError:
-      pass
-
 
   # ---------------------------------------------------------------------------
   # Start an input dialog and return the data record or None if cancelled

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-10-17 
18:32:36 UTC (rev 8828)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2006-10-17 
18:43:28 UTC (rev 8829)
@@ -179,6 +179,9 @@
       win32gui.PumpMessages()
 
 
+  def _ui_set_title_(self, title):
+    win32gui.SetWindowText(self.mainWindow.GetHwnd(), event.title)
+
   # ---------------------------------------------------------------------------
   # User feedback functions
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2006-10-17 18:32:36 UTC 
(rev 8828)
+++ trunk/gnue-forms/src/uidrivers/wx/UIdriver.py       2006-10-17 18:43:28 UTC 
(rev 8829)
@@ -172,13 +172,6 @@
       assert gDebug(6,'Unable to open clipboard for write')
 
 
-  def setTitle(self, event):
-    ui = self._gfObjToUIWidget[event._form]
-    try:
-      ui.mainWindow.SetTitle(event.title)
-    except AttributeError:
-      pass
-
   #############################################################################
   #
   # Internal Event Processors

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-10-17 
18:32:36 UTC (rev 8828)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2006-10-17 
18:43:28 UTC (rev 8829)
@@ -187,6 +187,15 @@
   # --------------------------------------------------------------------------
   # Makes the requested page visible while hiding the others
   # --------------------------------------------------------------------------
+
+  def _ui_set_title_(self, title):
+
+      self.mainWindow.SetTitle(title)
+
+
+  # --------------------------------------------------------------------------
+  # Makes the requested page visible while hiding the others
+  # --------------------------------------------------------------------------
   def _ui_goto_page_(self, page):
     """
     Make the requested page visible, hide others.