gnue/gnuef client/gfclient src/GFForm.py src/GF...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/03/20 18:58:32

Modified files:
        gnuef/client   : gfclient 
        gnuef/src      : GFForm.py GFObjects.py UIbase.py UIwxpython.py 

Log message:
        Fixed issue with blocks contains data aware and unaware fields where 
unaware fields not functoinal
        due to datasource emptyRecord structure getting messed up

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/client/gfclient.diff?r1=1.26&r2=1.27
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.80&r2=1.81
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.72&r2=1.73
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.26&r2=1.27
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.76&r2=1.77

Patches:
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.26 gnue/gnuef/client/gfclient:1.27
--- gnue/gnuef/client/gfclient:1.26     Tue Mar 20 15:25:50 2001
+++ gnue/gnuef/client/gfclient  Tue Mar 20 18:58:31 2001
@@ -16,7 +16,8 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Revision: 1.26 $ $Date: 2001/03/20 23:25:50 $ $Author: jamest $
+$ $Id: gfclient,v 1.27 2001/03/21 02:58:31 jamest Exp $
+# $Revision: 1.27 $ $Date: 2001/03/21 02:58:31 $ $Author: jamest $
 #
 
 import pstats
@@ -277,7 +278,7 @@
   # Routines to update parts of the UI's status bar
   #
   def updateInsertMode(self):
-    
self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,None,self.form.insertMode,None,None,None,None]))
+    
self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,None,self.form._insertMode,None,None,None,None]))
     
   def updateRecordCounter(self):
     
self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,None,None,self.form.currentBlock.currentRecord+1,self.form.currentBlock.recordCount+1,None,None]))
@@ -520,6 +521,8 @@
         else:
           break
     self.form.initializeDatasources()
+
+#    print self.form.dumpXML(1)
 
     # pass control to UI
     ui.buildForm(self.form)
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.80 gnue/gnuef/src/GFForm.py:1.81
--- gnue/gnuef/src/GFForm.py:1.80       Tue Mar 20 15:25:50 2001
+++ gnue/gnuef/src/GFForm.py    Tue Mar 20 18:58:31 2001
@@ -37,7 +37,7 @@
     self.triggerDictionary = {}
 
     # Insert/Overwrite mode
-    self.insertMode = 1
+    self._insertMode = 1
     
     # Focus information
     self.currentPage = None
@@ -47,8 +47,8 @@
     self.blockList = []
     self.pageList = []
 
-    self.borderPercentage = 10
-    self.textPercentage   = 7.5
+    #self.borderPercentage = 10
+    #self._textPercentage   = 7.5
     self.app = app
 
   def buildFormTree(self, URL):
@@ -372,7 +372,7 @@
           if not (value in string.digits or value in '.'):
             return modified
   
-        if self.insertMode == 1:
+        if self._insertMode == 1:
           currentvalue = currentvalue[:self.currentEntry.cursorPosition] + 
value + \
                    currentvalue[self.currentEntry.cursorPosition:]
         else:
@@ -590,7 +590,7 @@
 
 
   def toggleInsertMode(self):
-    self.insertMode = not self.insertMode
+    self._insertMode = not self._insertMode
 
 
 
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.72 gnue/gnuef/src/GFObjects.py:1.73
--- gnue/gnuef/src/GFObjects.py:1.72    Tue Mar 20 15:25:50 2001
+++ gnue/gnuef/src/GFObjects.py Tue Mar 20 18:58:31 2001
@@ -37,7 +37,7 @@
     if parent :
       parent.addChild(self)
 
-    self.visibleIndex = 0
+    self._visibleIndex = 0
 
   #
   # initialize
@@ -84,32 +84,29 @@
   #
   # Dumps an XML representation of the object
   #
-#  def dumpXML(self, treeDump=None, gap="  ", xmlString=""):
-#    xmlEntity = string.lower(self.type[2:])
+  def dumpXML(self, treeDump=None, gap="  "):
+    xmlEntity = string.lower(self.type[2:])
+    xmlString = "%s<%s>\n%s<options>\n" % (gap[:-2],xmlEntity, gap)
 
-#    xmlString = xmlString + "<%s>\n%s<options>\n" % (xmlEntity, gap)
-
-#    for attribute in self.__dict__.keys():
-#      # skip keys beginning with _
-#      if attribute[0] == "_":
-#        continue
-#      val = self.__dict__[attribute]
-#      if isinstance(val, types.StringType):
-#        str = val
-#      elif isinstance(val, types.IntType) or isinstance(val, types.FloatType):
-#        str = repr(val)
-#      else:
-#        continue
-#      xmlString = xmlString + "%s<%s>%s</%s>\n" % 
(gap,attribute,str,attribute)
-#    xmlString = xmlString + "%s</options>\n" % gap
-#    if treeDump:
-#      print "dumping"
-#      for child in self.children:
-#        print "child"
-#        child.dumpXML(1,gap+"  ")
+    for attribute in self.__dict__.keys():
+      # skip keys beginning with _
+      if attribute[0] == "_":
+        continue
+      val = self.__dict__[attribute]
+      if isinstance(val, types.StringType):
+        str = val
+      elif isinstance(val, types.IntType) or isinstance(val, types.FloatType):
+        str = repr(val)
+      else:
+        continue
+      xmlString = xmlString + "%s<%s>%s</%s>\n" % (gap+"  
",attribute,str,attribute)
+    xmlString = xmlString + "%s</options>\n" % gap
+    if treeDump:
+      for child in self.children:
+        xmlString = xmlString + child.dumpXML(1,gap+"  ")
       
-#    xmlString = xmlString + "</%s>\n" % (xmlEntity)
-#    return xmlString
+    xmlString = xmlString + "%s</%s>\n" % (gap[:-2],xmlEntity)
+    return xmlString
 
   def walk(self, function):
     function(self)
@@ -135,7 +132,7 @@
   #
   def recalculateVisible(self, adjustment, currentRecord, recordCount):
     if not hasattr(self, 'hidden'):
-      index = self.visibleIndex + adjustment
+      index = self._visibleIndex + adjustment
 
       if index < 0 : index = 0
 
@@ -165,7 +162,7 @@
         else:
           index = recordCount
         
-      self.visibleIndex = index
+      self._visibleIndex = index
       self.lowestVisible = lowestVisible
 
 #
@@ -320,9 +317,6 @@
     self.recordCount = self.dataSourceLink.getLastRecordNumber()
     for entry in self.entryList:
       entry.switchRecord(self.currentRecord)
-      GFDebug.printMesg(2, "switching record adj: %s current: %s count: %s" % 
-                               (adjustment, self.currentRecord, 
self.recordCount)
-                      )
       entry.recalculateVisible( adjustment, self.currentRecord, 
self.recordCount)
       self.form.updateUIEntry(entry)
       
@@ -448,7 +442,7 @@
       GFDebug.printMesg(1,"%s" % self.getObjectType())
       GFDebug.printMesg(1,"%s" % self.__dict__)
       self.field = self.name
-      
+
     self.block.dataSourceLink.addField(self.field)
     if hasattr(self,'foreign_key'):
       datasourceName,self.fieldName = string.split(self.foreign_key,'.')
@@ -547,7 +541,7 @@
     self.form = self.findParentOfType('GFForm')
     
   def initialize(self):
-    self.emptyRecord = {}
+    #self.emptyRecord = {}
     
     if hasattr(self,'database'):
       GFDebug.printMesg(1, "  linking to database %s" % (self.database))
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.26 gnue/gnuef/src/UIbase.py:1.27
--- gnue/gnuef/src/UIbase.py:1.26       Tue Mar 20 15:25:50 2001
+++ gnue/gnuef/src/UIbase.py    Tue Mar 20 18:58:31 2001
@@ -200,7 +200,7 @@
     formObject = event.data['object']
     #index = self.formToUI[formObject][1]
     if formObject: # Some pages might not have any widgets that can be active
-      index = formObject.visibleIndex
+      index = formObject._visibleIndex
       self.formToUIWidget[formObject].indexedFocus(index)
     
 
@@ -248,7 +248,7 @@
   # updateEntry
   #
   def updateEntry(self,event):
-    index = event.data.visibleIndex
+    index = event.data._visibleIndex
 
     block = event.data.block
     currentRecord = block.currentRecord
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.76 gnue/gnuef/src/UIwxpython.py:1.77
--- gnue/gnuef/src/UIwxpython.py:1.76   Tue Mar 20 15:25:50 2001
+++ gnue/gnuef/src/UIwxpython.py        Tue Mar 20 18:58:31 2001
@@ -391,13 +391,13 @@
         for count in range(len(self.formToUI[key][0])):
           if self.formToUI[key][0][count].GetId() == object.GetId():
             self.dispatchEvent(GFEvent('requestFOCUS',key))
-            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key.visibleIndex))
+            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key._visibleIndex))
             break
             
       for key in self.formToUI.keys():
         for count in range(len(self.formToUI[key][0])):
           if self.formToUI[key][0][count].GetId() == object.GetId():
-            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key.visibleIndex))
+            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key._visibleIndex))
             break
 
     #
@@ -420,13 +420,13 @@
         for count in range(len(self.formToUI[key][0])):
           if self.formToUI[key][0][count].GetId() == object.GetId():
             self.dispatchEvent(GFEvent('requestFOCUS',key))
-            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key.visibleIndex))
+            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key._visibleIndex))
             break
             
       for key in self.formToUI.keys():
         for count in range(len(self.formToUI[key][0])):
           if self.formToUI[key][0][count].GetId() == object.GetId():
-            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key.visibleIndex))
+            self.dispatchEvent(GFEvent('requestJUMPRECORD',count - 
key._visibleIndex))
             break
 
       #