gnue/gnuef/src GFForm.py UIbase.py UIwxpython.p...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/10/19 16:17:48

Modified files:
        gnuef/src      : GFForm.py UIbase.py UIwxpython.py 
        gnuef/src/drivers/postgresql: DBdriver.py 

Log message:
        Postgresql driver fix
        New formToUI cross ref structure (for upcomming updates)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.19&r2=1.20
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.12&r2=1.13
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/postgresql/DBdriver.py.diff?r1=1.2&r2=1.3

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.19 gnue/gnuef/src/GFForm.py:1.20
--- gnue/gnuef/src/GFForm.py:1.19       Wed Oct 18 16:06:18 2000
+++ gnue/gnuef/src/GFForm.py    Thu Oct 19 16:17:48 2000
@@ -185,6 +185,7 @@
   #
   def nextRecord(self, event):
     self.dispatchEvent(GFEvent('nextRECORD',self.currentBlock))
+    # make ui respond to these fool
 
   def prevRecord(self, event):
     self.dispatchEvent(GFEvent('prevRECORD',self.currentBlock))
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.6 gnue/gnuef/src/UIbase.py:1.7
--- gnue/gnuef/src/UIbase.py:1.6        Wed Oct 11 18:57:06 2000
+++ gnue/gnuef/src/UIbase.py    Thu Oct 19 16:17:48 2000
@@ -26,10 +26,12 @@
 
     self.form = form;
     self.formToUI = {}                   # the GFObj to UI widget cross ref
-    
+
+    # FYI: Used in building the UI only
     self.currentObject = [form]          # the current GFForm object
     self.currentWidget = [self]          # the current UI widget
-
+    # End: Used in building the UI only
+    
     self.containerWidgets= ['GFPage']    # GFForm objects that contain others
 
     self.pageList = []                   # A list of pages
@@ -82,21 +84,25 @@
   #
   def buildUI(self):
     try:
-      widget = 
self.widgetConstructorFunction[self.currentObject[0].getObjectType()] ()
+      newWidget = 
self.widgetConstructorFunction[self.currentObject[0].getObjectType()] ()
 
-      if type(widget) == type ([]):
-        for singleWidget in widget:
-          # This is extremely broken!!!!!!!!!!!
-          # as it dumps all but the very last visible widget
-          # in the set :(
-          
-          self.formToUI[self.currentObject[0]] = singleWidget
-          if self.currentObject[0].getObjectType() in self.containerWidgets:
-            self.currentWidget.insert(0,widget)      
+      if type(newWidget) != type ([]):
+        widget = [newWidget]
       else:
-        self.formToUI[self.currentObject[0]] = widget
-        if self.currentObject[0].getObjectType() in self.containerWidgets:
-          self.currentWidget.insert(0,widget)
+        widget = newWidget
+
+      # Create a cross reference to the GFObject that created
+      # one or more UI widgets
+      #print "WWWidget: ", newWidget
+      #for singleWidget in widget:
+      #  self.formToUI[self.currentObject[0]] = singleWidget
+      self.formToUI[self.currentObject[0]] = [widget,len(widget)]
+
+      # If the current object is a container then add the
+      # just created first created widget to it's widget list
+      if self.currentObject[0].getObjectType() in self.containerWidgets:
+        self.currentWidget.insert(0,widget[0])      
+
     except KeyError:
       pass
                                                           
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.12 gnue/gnuef/src/UIwxpython.py:1.13
--- gnue/gnuef/src/UIwxpython.py:1.12   Wed Oct 18 16:06:18 2000
+++ gnue/gnuef/src/UIwxpython.py        Thu Oct 19 16:17:48 2000
@@ -68,6 +68,9 @@
                            'gotoPAGE'   : self.gotoPage
                           }
 
+    self.activeIndex = 0
+    
+
     # Create the UI from the GFForm passed in
     self.buildUI()
 
@@ -88,10 +91,10 @@
     # don't put code in here, put it in onInit()
     return true
 
-  def nextPage(self):
-    self.pageList[0].Show(FALSE)
-    self.pageList.append(self.pageList.pop(0)) # Rotates the pages
-    self.pageList[0].Show(TRUE)
+#  def nextPage(self):
+#    self.pageList[0].Show(FALSE)
+#    self.pageList.append(self.pageList.pop(0)) # Rotates the pages
+#    self.pageList[0].Show(TRUE)
     
   #
   # Event handlers
@@ -99,16 +102,17 @@
   # Methods called to deal with incomming events
   #
   def switchFocus(self, event):
-    self.formToUI[event.data].SetFocus()
+    print self.formToUI[event.data]
+    self.formToUI[event.data][self.activeIndex][0].SetFocus()
 
   def updateEntry(self,event):
-    self.formToUI[event.data].SetValue(event.data.getValue())
-    self.formToUI[event.data].SetInsertionPoint(event.data.cursorPosition)
+    
self.formToUI[event.data][self.activeIndex][0].SetValue(event.data.getValue())
+    
self.formToUI[event.data][self.activeIndex][0].SetInsertionPoint(event.data.cursorPosition)
 
   def gotoPage(self, event):
     self.visiblePage.Show(FALSE)
-    self.formToUI[event.data].Show(TRUE)
-    self.visiblePage = self.formToUI[event.data]
+    self.formToUI[event.data][self.activeIndex][0].Show(TRUE)
+    self.visiblePage = self.formToUI[event.data][self.activeIndex][0]
     self.visiblePage.Show(TRUE)
     
   #
@@ -182,12 +186,12 @@
 
     for spacer in range(count):
       spacer = int(spacer)
-      widget.append(eval(self.widgetConstructor[object.getObjectType()]))
+      newWidget = eval(self.widgetConstructor[object.getObjectType()])
+      
+      widget.append(newWidget)
+      EVT_CHAR(newWidget, self.uiEventTrap)
+      EVT_MOUSE_EVENTS(newWidget, self.uiEventTrap)
 
-    for singleWidget in widget:
-      EVT_CHAR(singleWidget, self.uiEventTrap)
-      EVT_MOUSE_EVENTS(singleWidget, self.uiEventTrap)
-    
     return widget
 
   def pageHandler(self):
Index: gnue/gnuef/src/drivers/postgresql/DBdriver.py
diff -u gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.2 
gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.3
--- gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.2   Thu Oct 19 16:10:24 2000
+++ gnue/gnuef/src/drivers/postgresql/DBdriver.py       Thu Oct 19 16:17:48 2000
@@ -19,7 +19,7 @@
 class DBdriver:
   def __init__(self):
     if GFOptions.DEBUG:
-    print "Postgresql database driver initializing"
+      print "Postgresql database driver initializing"
     self.connection = None
     self.uniqueKey = None