gnue/gnuef samples/track/forms/contact_manager....

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/05/04 16:27:03

Modified files:
        gnuef/samples/track/forms: contact_manager.gfd 
        gnuef/src      : GFForm.py GFObjects.py GFOptions.py GFParser.py 
                         UIbase.py UIwxpython.py 

Log message:
        Added queryDefault tags to entries
        Checkbox changes (incomplete)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/samples/track/forms/contact_manager.gfd.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects.py.diff?cvsroot=OldCVS&tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFOptions.py.diff?cvsroot=OldCVS&tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFParser.py.diff?cvsroot=OldCVS&tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIbase.py.diff?cvsroot=OldCVS&tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.84&tr2=1.85&r1=text&r2=text

Patches:
Index: gnue/gnuef/samples/track/forms/contact_manager.gfd
diff -u gnue/gnuef/samples/track/forms/contact_manager.gfd:1.1 
gnue/gnuef/samples/track/forms/contact_manager.gfd:1.2
--- gnue/gnuef/samples/track/forms/contact_manager.gfd:1.1      Thu Mar 29 
15:25:05 2001
+++ gnue/gnuef/samples/track/forms/contact_manager.gfd  Fri May  4 16:27:03 2001
@@ -84,7 +84,7 @@
 </trigger>
 -->
 
-  <database name="dtbsGNUe" provider="postgresql" dbname="gnue" host="gnue"/>
+  <database name="dtbsGNUe" provider="postgresql" dbname="devel" host="rdbms"/>
   <datasource name="dtsrcPerson" database="dtbsGNUe" table="person" 
order_by="last_name" prequery=""/>
   <datasource name="dtsrcAddress" database="dtbsGNUe" table="address" 
prequery=""/>
   <datasource name="dtsrcPhone" database="dtbsGNUe" table="phone" prequery=""/>
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.90 gnue/gnuef/src/GFForm.py:1.91
--- gnue/gnuef/src/GFForm.py:1.90       Fri Apr 20 18:22:51 2001
+++ gnue/gnuef/src/GFForm.py    Fri May  4 16:27:03 2001
@@ -198,7 +198,6 @@
         saved = 0
         break
     return saved
-  
 
   def prepQuery(self):
     message = None
@@ -207,7 +206,10 @@
         message = GFOptions._msgNOTSAVED
     for block in self._blockList:
       block.processRollback()
-      
+      for entry in block._entryList:
+       if hasattr(entry,'queryDefault'):
+         GFDebug.printMesg(1, "%s will be set to %s" % (entry.name, 
entry.queryDefault))
+         entry.setValue(entry.queryDefault)      
     self._currentBlock.initQuery()
     return message
 
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.85 gnue/gnuef/src/GFObjects.py:1.86
--- gnue/gnuef/src/GFObjects.py:1.85    Fri Apr 20 18:22:51 2001
+++ gnue/gnuef/src/GFObjects.py Fri May  4 16:27:03 2001
@@ -343,7 +343,8 @@
     else:
       self.mode = 'normal'
       
-    self.processRollback() 
+    # Removed to allow the GFForm object to deside when to clear the block
+    # self.processRollback() 
     
   def processQuery(self):
     # Implement sloppyQuery system 
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.27 gnue/gnuef/src/GFOptions.py:1.28
--- gnue/gnuef/src/GFOptions.py:1.27    Mon Apr 16 16:53:15 2001
+++ gnue/gnuef/src/GFOptions.py Fri May  4 16:27:03 2001
@@ -76,7 +76,7 @@
 # The next 2 options are only used by the wxPython clients
 # Normally, default font style and size is used, according to the active theme
 # Set this to 1 if you want fixed width fonts
-fixedWidthFont = 0
+fixedWidthFont = 1
 
 # Font size if fixedWidthFont = 1 (ignored otherwise)
 pointSize = 14
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.22 gnue/gnuef/src/GFParser.py:1.23
--- gnue/gnuef/src/GFParser.py:1.22     Fri Apr 20 18:22:51 2001
+++ gnue/gnuef/src/GFParser.py  Fri May  4 16:27:03 2001
@@ -113,6 +113,8 @@
                                      'style':       (0, 0, char, None), 
                                      'value':       (0, 0, char, None), 
                                      'foreign_key': (0, 0, char, None), 
+                                     'default':     (0, 0, char, None), 
+                                     'queryDefault':(0, 0, char, None), 
                                      'foreign_key_description': 
                                                     (0, 0, char, None), 
                                      'sloppyQuery': (0, 0, char, None), 
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.34 gnue/gnuef/src/UIbase.py:1.35
--- gnue/gnuef/src/UIbase.py:1.34       Fri Apr 20 18:22:52 2001
+++ gnue/gnuef/src/UIbase.py    Fri May  4 16:27:03 2001
@@ -284,10 +284,14 @@
     # Fill the prior spots
     for count in range(index):
       value = 
block._dataSourceLink.getField(currentRecord-(index-count),event.data.field)
+      value = str(value) # Done to remove unicode types which wxpython doesn't 
like
       if style == 'dropdown':
         value = event.data.allowedValues()[value]
       elif style == 'checkbox':
-        value = int(value)   
+        if value in (1,'1','T','t','TRUE','true'):
+          value = 1
+        else:
+          value = 0          
 
       self._formToUIWidget[event.data].setValue(value,count)
 
@@ -296,9 +300,14 @@
       value = event.data.allowedValues()[event.data.getValue()]
     else:
       value = event.data.getValue()
+    value = str(value) # Done to remove unicode types which wxpython doesn't 
like
 
     if style == 'checkbox':
-      value = int(event.data.getValue())
+      value = event.data.getValue()
+      if value in (1,'1','T','t','TRUE','true'):
+        value = 1
+      else:
+        value = 0          
       self._formToUIWidget[event.data].setValue(value, index)
     else:
       self._formToUIWidget[event.data].setValue(value, index)
@@ -319,10 +328,14 @@
             value = ""
         else:
           value = 
block._dataSourceLink.getField(currentRecord+(count-index),event.data.field)
+          value = str(value) # Done to remove unicode types which wxpython 
doesn't like
           if style == 'dropdown':
             value = event.data.allowedValues()[value]
           elif style == 'checkbox':
-            value = int(value)
+           if value in (1,'1','T','t','TRUE','true'):
+             value = 1
+            else:
+              value = 0          
         self._formToUIWidget[event.data].setValue(value, count)
       count = count +1
                                                                                
                                                                   
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.84 gnue/gnuef/src/UIwxpython.py:1.85
--- gnue/gnuef/src/UIwxpython.py:1.84   Fri Apr 20 18:22:52 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri May  4 16:27:03 2001
@@ -621,6 +621,8 @@
 
   def setValue(self, value, index=0):
     self.widgets[index].SetEvtHandlerEnabled(FALSE)
+    # str is used to prevent unicode data types for bothering wxpython
+    # moved to UIbase -     self.widgets[index].SetValue(str(value))
     self.widgets[index].SetValue(value)
     self.widgets[index].SetEvtHandlerEnabled(TRUE)