gnue/gnuef INSTALL README.wxwindows samples/zip...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/12/05 20:42:58

Modified files:
        gnuef          : INSTALL README.wxwindows 
        gnuef/samples/zipcode: states.gfd 
        gnuef/src      : GFForm.py GFObjects.py UIwxpython.py 

Log message:
        fixed numeric attribute bug
        fixed marked record for deletion via the menu bug
        fixed master/detail example (the code worked the example was borked :)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/INSTALL.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/README.wxwindows.diff?r1=1.2&r2=1.3
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/zipcode/states.gfd.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.42&r2=1.43
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.35&r2=1.36

Patches:
Index: gnue/gnuef/INSTALL
diff -u gnue/gnuef/INSTALL:1.3 gnue/gnuef/INSTALL:1.4
--- gnue/gnuef/INSTALL:1.3      Wed Nov 15 08:57:53 2000
+++ gnue/gnuef/INSTALL  Tue Dec  5 20:42:58 2000
@@ -19,8 +19,7 @@
 wxWindows which is available for X-Windows.
 
 The (wx-)GNUe-forms client which interpret the forms definition is
-written in Python. It works with python 1.5 and is not compatible with
-python 2.0.
+written in Python. It is being tested with python 1.5 and 2.0.
 
 The rest of the document describes the steps to install GNUe-forms on
 a Debian 2.2, i386 platform.
Index: gnue/gnuef/README.wxwindows
diff -u gnue/gnuef/README.wxwindows:1.2 gnue/gnuef/README.wxwindows:1.3
--- gnue/gnuef/README.wxwindows:1.2     Thu Oct 26 10:03:19 2000
+++ gnue/gnuef/README.wxwindows Tue Dec  5 20:42:58 2000
@@ -3,7 +3,7 @@
 files.  I pulled this from the wxPython users list.  
 
 I know you need to do this for wxPython 2.1.11
-It seems that you don't have to do it for wxPython 2.2.1
+It seems that you don't have to do it for wxPython 2.2.1 or newer
 
 ------------------------------------------------------------------------
 
Index: gnue/gnuef/samples/zipcode/states.gfd
diff -u gnue/gnuef/samples/zipcode/states.gfd:1.4 
gnue/gnuef/samples/zipcode/states.gfd:1.5
--- gnue/gnuef/samples/zipcode/states.gfd:1.4   Thu Nov  9 15:50:23 2000
+++ gnue/gnuef/samples/zipcode/states.gfd       Tue Dec  5 20:42:58 2000
@@ -22,7 +22,7 @@
 
 
     <!-- Block of cities -->
-    <block name="cities"  master="state.state" detail="state_code">
+    <block name="cities"  datasource="cities" master="state.state" 
detail="state_code">
       <label text="City" x="5" y="100"/>
       <entry name="city" field="city" x="5" y="110" width="150" height="20" 
visibleCount="5" />
 
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.43 gnue/gnuef/src/GFForm.py:1.44
--- gnue/gnuef/src/GFForm.py:1.43       Mon Dec  4 10:33:04 2000
+++ gnue/gnuef/src/GFForm.py    Tue Dec  5 20:42:58 2000
@@ -255,6 +255,7 @@
 
   def deleteRecord(self, event):
     if not hasattr(self,'readonly'):
+      print "I'ma gonna deleta something"
       self.dispatchEvent(GFEvent('deleteRECORD',self.currentBlock))
       self.updateRecordStatus()
     else:
@@ -513,7 +514,7 @@
         if len(currentvalue) >= int(self.currentEntry.max_length):
           return
         
-      if hasattr(self.currentEntry,'numeric') and self.currentBlock.mode == 
'Normal':
+      if hasattr(self.currentEntry,'numeric') and self.currentBlock.mode == 
'normal':
         if not (event.data in string.digits or event.data in '.'):
           return
 
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.42 gnue/gnuef/src/GFObjects.py:1.43
--- gnue/gnuef/src/GFObjects.py:1.42    Mon Dec  4 10:33:04 2000
+++ gnue/gnuef/src/GFObjects.py Tue Dec  5 20:42:58 2000
@@ -308,7 +308,6 @@
           ## clear the link
           self.dataSourceLink.setField(0,self.detail,fieldValue)
           self.dataSourceLink.query()
-        
         self.recordCount = self.dataSourceLink.getLastRecordNumber()
         self.dispatchEvent(GFEvent('switchRECORD',[-1,0]));
         self.currentRecord = 0      
@@ -424,8 +423,8 @@
     self.form = self.findParentOfType('GFForm')
     
   def initialize(self):
-    if GFOptions.DEBUG:
-      print "Initializing datasource %s" % (self.name)
+#    if GFOptions.DEBUG:
+#      print "Initializing datasource %s" % (self.name)
     self.emptyRecord = {}
     
     if hasattr(self,'database'):
@@ -483,6 +482,7 @@
         for key in self.fieldList:
           if key in self.dataConnection.getFieldList(self.table).keys():
             mask[key]=self.resultSet[0][key]
+
 
       self.clear()
       if not hasattr(self,'order_by'):
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.35 gnue/gnuef/src/UIwxpython.py:1.36
--- gnue/gnuef/src/UIwxpython.py:1.35   Mon Dec  4 14:34:50 2000
+++ gnue/gnuef/src/UIwxpython.py        Tue Dec  5 20:42:58 2000
@@ -428,7 +428,7 @@
     dataMenu.Append( 203, "New record", "Create a new record for data input")
     EVT_MENU(self, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
     dataMenu.Append( 204, "Mark for delete", "Mark record for removal at next 
commit")
-    EVT_MENU(self, 204, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestDELETE')))
+    EVT_MENU(self, 204, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
     dataMenu.AppendSeparator()
     dataMenu.Append( 205, "Next Block", "Move to next data block")
     EVT_MENU(self, 205, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEXTBLOCK')))