gnue/gnuef samples/location/forms/zipcode_maint...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Branch:         gnuef-new-datasources
Changes by:     Jason Cater <address@hidden>    01/07/21 16:21:44

Modified files:
        gnuef/samples/location/forms: zipcode_maint.gfd 
        gnuef/src      : UIbase.py 
        gnuef/src/GFObjects: GFBlock.py GFEntry.py 

Log message:
        fixed combo box problem; rewrote findClosestValue; fixed data-aware 
multi-record blocks; fixed execute query (enter query doesn't work yet)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/location/forms/zipcode_maint.gfd.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.2&tr2=1.2.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.40.2.3&tr2=1.40.2.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.4.2.14&tr2=1.4.2.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.2.2.10&tr2=1.2.2.11&r1=text&r2=text

Patches:
Index: gnue/gnuef/samples/location/forms/zipcode_maint.gfd
diff -u gnue/gnuef/samples/location/forms/zipcode_maint.gfd:1.1 
gnue/gnuef/samples/location/forms/zipcode_maint.gfd:1.2
--- gnue/gnuef/samples/location/forms/zipcode_maint.gfd:1.1     Thu Jan 11 
16:29:15 2001
+++ gnue/gnuef/samples/location/forms/zipcode_maint.gfd Fri May 25 01:17:10 2001
@@ -8,7 +8,7 @@
     <width>50</width>
   </options>
 
-  <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/>
+  <!--database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/-->
   <datasource name="zips" database="gnue" table="zipcode"/>
  
   <datasource name="validator" database="gnue" table="state" prequery="" />
Index: gnue/gnuef/src/GFObjects/GFBlock.py
diff -u gnue/gnuef/src/GFObjects/GFBlock.py:1.5 
gnue/gnuef/src/GFObjects/GFBlock.py:1.6
--- gnue/gnuef/src/GFObjects/GFBlock.py:1.5     Mon Jul 16 20:09:41 2001
+++ gnue/gnuef/src/GFObjects/GFBlock.py Wed Jul 18 15:45:01 2001
@@ -31,8 +31,7 @@
 # Copyright (c) 2000 Free Software Foundation
 #
 
-from gnue.common.GObjects import * 
-from gnue.common.dbdrivers.factory import factory
+#from gnue.common.GObjects import * 
 from gnue.forms.GFEvent import *
 from gnue.forms.GFObjects.GFDataSource import GFDataSource
 
@@ -41,7 +40,6 @@
 from GFObj import GFObj
 
 import string
-import types
 
 # These should really go somewhere else
 TRUE = 1
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.5 
gnue/gnuef/src/GFObjects/GFEntry.py:1.6
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.5     Mon Jul 16 20:09:41 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Wed Jul 18 15:45:01 2001
@@ -31,18 +31,10 @@
 # Copyright (c) 2000 Free Software Foundation
 #
 
-from gnue.common.GObjects import * 
-from gnue.common.dbdrivers.factory import factory
-
 from gnue.common import GDebug
 from gnue.common import GConfig
 from GFValue import GFValue
 import string
-import types
-
-# These should really go somewhere else
-TRUE = 1
-FALSE = 0
 
 ############################################################
 # GFEntry
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.39 gnue/gnuef/src/UIbase.py:1.40
--- gnue/gnuef/src/UIbase.py:1.39       Wed Jun 20 14:43:16 2001
+++ gnue/gnuef/src/UIbase.py    Wed Jun 20 16:34:50 2001
@@ -68,13 +68,7 @@
     global UI
     UI = __import__(self.getModule(), globals(), locals(), ['UIAbout'])
     
-    self.widgets = {'GFLabel'     : UI.UILabel,
-                    'GFBox'       : UI.UIBox,
-                    'GFPage'      : UI.UIPage,
-                    'GFForm'      : UI.UIForm,
-                    'GFEntry'     : UI.UIEntry,
-                    'GFButton'    : UI.UIButton,
-                    'GFScrollBar' : UI.UIScrollBar}
+    self.widgets = UI.WIDGETS
 
     self._loginHandler = None
 
@@ -356,7 +350,7 @@
 #
 
 class UIWidget:
-  def __init__(self, object, container, textWidth, textHeight, widgetWidth, 
widgetHeight, interface):
+  def __init__(self, object, container, textWidth, textHeight, widgetWidth, 
widgetHeight, interface, initialize=1):
     self.widgets = []
 
     if not hasattr(object,'visibleCount'):
@@ -378,10 +372,10 @@
       
     if not object.hidden:
       for spacer in range(int(object.visibleCount)):
-        newWidget = self.createWidget(object, container, textWidth, 
textHeight, widgetWidth, widgetHeight, interface, spacer)
+        newWidget = self.createWidget(object, container, textWidth, 
textHeight, widgetWidth, widgetHeight, interface, spacer, initialize)
         self.widgets.append(newWidget)
         
-  def createWidget(self, object, container, textWidth, textHeight, 
widgetWidth, widgetHeight, interface, spacer):
+  def createWidget(self, object, container, textWidth, textHeight, 
widgetWidth, widgetHeight, interface, spacer,initialize=1):
     GDebug.printMesg(1,"UI doesn't support %s" % self.__class__)