gnue/gnuef/src GFForm.py GFObjects.py

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/11/09 12:31:32

Modified files:
        gnuef/src      : GFForm.py GFObjects.py 

Log message:
        Modifed system to base UI updates on entry value changes instead of
        via GFForm control.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.36&r2=1.37
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.33&r2=1.34

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.36 gnue/gnuef/src/GFForm.py:1.37
--- gnue/gnuef/src/GFForm.py:1.36       Thu Nov  9 11:56:11 2000
+++ gnue/gnuef/src/GFForm.py    Thu Nov  9 12:31:32 2000
@@ -55,6 +55,7 @@
 
                            'recordSWITCHED'    : self.recordSwitched,
                            'notifyMASTERSWITCH': self.notifyDetailBlocks,
+                           'updateUIENTRY'     : self.updateUIEntry,
                            'uiINITIALIZED'     : self.uiInitialized
                            }
 
@@ -171,6 +172,7 @@
     self.updateRecordStatus()
     
 
+
   def updateInsertMode(self):
     
self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,None,self.insertMode,None,None]))
     
@@ -189,6 +191,9 @@
     status = 
self.currentBlock.dataSourceLink.resultSetStatus[self.currentBlock.currentRecord]
     self.dispatchEvent(GFEvent('uiUPDATESTATUS',[None,status,None,None,None]))
     
+  def updateUIEntry(self,event):
+    self.dispatchEvent(GFEvent('updateENTRY',event.data));
+    
   def findValue(self, blockname, fieldname):
     for block in self.blockList:
       if block.name == blockname:
@@ -467,7 +472,7 @@
       
     print "Replacing with ", replacement
     event.data[0].setValue(replacement)
-    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
+#    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
     
   #
   # keyPress
@@ -499,10 +504,10 @@
         currentvalue = currentvalue[:self.currentEntry.cursorPosition] + 
event.data + \
                  currentvalue[self.currentEntry.cursorPosition+1:]
     
-#      self.currentEntry.setValue(currentvalue)
-      self.currentEntry.value = currentvalue
       self.currentEntry.cursorPosition = self.currentEntry.cursorPosition + 1
-      self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
+      self.currentEntry.setValue(currentvalue)
+
+#      self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
     else:
       self.dispatchEvent(GFEvent('formALERT','Field is readonly'))
 
@@ -520,14 +525,12 @@
       else:
         return
       
-#    currentvalue = self.currentEntry.getValue()
-    currentvalue = self.currentEntry.value
+    currentvalue = self.currentEntry.getValue()
     currentvalue = currentvalue[:self.currentEntry.cursorPosition]  + \
              currentvalue[self.currentEntry.cursorPosition+1:]
-#    self.currentEntry.setValue(currentvalue)
-    self.currentEntry.value = currentvalue
+    self.currentEntry.setValue(currentvalue)
 
-    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
+#    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
                                           
     
   #
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.33 gnue/gnuef/src/GFObjects.py:1.34
--- gnue/gnuef/src/GFObjects.py:1.33    Thu Nov  9 11:56:11 2000
+++ gnue/gnuef/src/GFObjects.py Thu Nov  9 12:31:32 2000
@@ -157,7 +157,8 @@
                            'initQUERY'     : self.processQuery,
                            'processQUERY'  : self.processQuery,
                            'processCOMMIT' : self.processCommit,
-                           'updateDETAILBLOCK'  : self.updateDetail
+                           'updateDETAILBLOCK'  : self.updateDetail,
+                           'valueUPDATE'  : self.updateEntry
                            }
     
     # register to recieve events from it's parent GFForm
@@ -226,6 +227,10 @@
       self.dispatchEvent(GFEvent('notifyMASTERSWITCH',self))
     self.dispatchEvent(GFEvent('recordSWITCHED',event.data))
 
+  def updateEntry(self, event):
+    self.dispatchEvent(GFEvent('updateUIENTRY',event.data))
+
+
   #
   # processCommit
   #
@@ -324,7 +329,7 @@
     # Event processing
     self.incommingEvent = {'switchRECORD': self.switchRecord
                           }
-
+    
     # register to recieve events from it's parent GFBlock
     self.block = self.findParentOfType('GFBlock')
     self.block.registerEventListener(self.processEvent)
@@ -335,7 +340,11 @@
   def initialize(self):
     self.block.dataSourceLink.addField(self.field)
 #    GFObj.initialize()
-    
+
+  def setValue(self, value):
+    self.value = value
+    self.dispatchEvent(GFEvent('valueUPDATE',self))
+
   #
   # switchRecord
   #
@@ -659,11 +668,10 @@
     try:
       for item in self.__dict__['block'].__dict__['entryList']:
         if item.name == name:
-         item.__dict__['value'] = value
+#         item.__dict__['value'] = value
+         item.setValue(value)
          return
-      print "HI"
     except KeyError:
-      print "Ho"
       self.__dict__[name] = value
     return