r6003 - in trunk/gnue-forms/src/uidrivers: _base curses/widgets gtk2/widgets/form qt/widgets/form win32/widgets/form wx/widgets/form

[reinhard]

Author: reinhard
Date: 2004-07-20 15:33:22 -0500 (Tue, 20 Jul 2004)
New Revision: 6003

Modified:
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
   trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
   trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
Log:
Changed parameters for uiForm.gotoPage to be more logical.


Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2004-07-20 20:07:05 UTC 
(rev 6002)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2004-07-20 20:33:22 UTC 
(rev 6003)
@@ -498,7 +498,9 @@
   # gotoPage
   #
   def gotoPage(self,event):
-    self._gfObjToUIWidget[event.data]._uiForm.gotoPage(event)
+    uiForm = self._gfObjToUIWidget [event._form]._uiForm
+    uiPage = self._gfObjToUIWidget [event.data]
+    uiForm.gotoPage (uiPage)
 
 
   #

Modified: trunk/gnue-forms/src/uidrivers/curses/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2004-07-20 
20:07:05 UTC (rev 6002)
+++ trunk/gnue-forms/src/uidrivers/curses/widgets/form.py       2004-07-20 
20:33:22 UTC (rev 6003)
@@ -70,6 +70,15 @@
     pass
 
   # ---------------------------------------------------------------------------
+  # Go to a specific page
+  # ---------------------------------------------------------------------------
+
+  def gotoPage (self, page):
+
+    self.__currentPage = page
+    self.__updatePageList ()
+
+  # ---------------------------------------------------------------------------
   # Add a page to the form
   # ---------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-07-20 
20:07:05 UTC (rev 6002)
+++ trunk/gnue-forms/src/uidrivers/gtk2/widgets/form/widget.py  2004-07-20 
20:33:22 UTC (rev 6003)
@@ -167,10 +167,8 @@
   # Makes the requested page visible while hiding the others
   # ---------------------------------------------------------------------------
 
-  def gotoPage (self, event):
-    pageObj = self._uiDriver._gfObjToUIWidget [event.data].widgets [0]
-    GDebug.printMesg (1, "gotoPAGE: %s %s" % (event.data, pageObj))
-    self._wrapper.setPage (pageObj)
+  def gotoPage (self, page):
+    self._wrapper.setPage (page.widgets [0])
           
                      
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2004-07-20 
20:07:05 UTC (rev 6002)
+++ trunk/gnue-forms/src/uidrivers/qt/widgets/form/widget.py    2004-07-20 
20:33:22 UTC (rev 6003)
@@ -134,8 +134,8 @@
   #
   # Makes the requested page visible while hiding the others
   #
-  def gotoPage(self,event):
-    
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
+  def gotoPage(self,page):
+    self._wrapper.setPage(page.widgets[0])
 
 ##    if not self._notebook:
 ##      for page in self._uiPageList:

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-07-20 
20:07:05 UTC (rev 6002)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-07-20 
20:33:22 UTC (rev 6003)
@@ -139,8 +139,8 @@
   #
   # Makes the requested page visible while hiding the others
   #
-  def gotoPage(self,event):
-    
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
+  def gotoPage(self,page):
+    self._wrapper.setPage(page.widgets[0])
     
       
   #

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-07-20 
20:07:05 UTC (rev 6002)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/form/widget.py    2004-07-20 
20:33:22 UTC (rev 6003)
@@ -141,8 +141,8 @@
   #
   # Makes the requested page visible while hiding the others
   #
-  def gotoPage(self,event):
-    
self._wrapper.setPage(self._uiDriver._gfObjToUIWidget[event.data].widgets[0])
+  def gotoPage(self,page):
+    self._wrapper.setPage(page.widgets[0])
 
 
   #