gnue/gnuef client/gfclient src/GFEvent.py src/G...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/11/14 20:04:39

Modified files:
        gnuef/client   : gfclient 
        gnuef/src      : GFEvent.py GFForm.py GFOptions.py UIwxpython.py 

Log message:
        Moved an error text to GFOptions.py
        Fixed bug where mouse click on a label generated a block error
        Minor speed enhancements (the ones that didn't break everything :)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/client/gfclient.diff?r1=1.4&r2=1.5
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFEvent.py.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.41&r2=1.42
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFOptions.py.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.30&r2=1.31

Patches:
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.4 gnue/gnuef/client/gfclient:1.5
--- gnue/gnuef/client/gfclient:1.4      Thu Nov  9 19:23:49 2000
+++ gnue/gnuef/client/gfclient  Tue Nov 14 20:04:39 2000
@@ -79,12 +79,14 @@
     ui.mainLoop()
       
 if __name__ == '__main__':
-  import profile
-  profile.run("GFClient().run()","runstats")
-  p = pstats.Stats('runstats')
-  p.sort_stats('cumulative').print_stats(50)
+##  import profile
+##  profile.run("GFClient().run()","runstats")
+##  p = pstats.Stats('runstats')
+
+##  p.sort_stats('time').print_stats(50)
+##  p.sort_stats('cumulative').print_stats(50)
     
-##  GFClient().run()
+  GFClient().run()
 
 
 
Index: gnue/gnuef/src/GFEvent.py
diff -u gnue/gnuef/src/GFEvent.py:1.6 gnue/gnuef/src/GFEvent.py:1.7
--- gnue/gnuef/src/GFEvent.py:1.6       Sat Oct  7 22:37:52 2000
+++ gnue/gnuef/src/GFEvent.py   Tue Nov 14 20:04:39 2000
@@ -56,14 +56,23 @@
   #
   def processEvent(self, event):
     try:
-      if GFOptions.DEBUG > 99:
-        print "received %s event" % (event.getEvent())
-      self.incommingEvent[event.getEvent()] (event)
+       self.incommingEvent[event.event] (event)
     except KeyError:
       if GFOptions.DEBUG > 99:
         print "Unknown Event: %s " % (event.getEvent())
       
-                            
+#  def processEvent(self, event):
+#    try:
+#      if GFOptions.DEBUG > 99:
+#        print "received %s event" % (event.getEvent())
+#      self.incommingEvent[event.getEvent()] (event)
+#    except KeyError:
+#      if GFOptions.DEBUG > 99:
+#        print "Unknown Event: %s " % (event.getEvent())
+
+
+
+                                                                    
 
 
 
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.41 gnue/gnuef/src/GFForm.py:1.42
--- gnue/gnuef/src/GFForm.py:1.41       Fri Nov 10 11:48:27 2000
+++ gnue/gnuef/src/GFForm.py    Tue Nov 14 20:04:39 2000
@@ -15,7 +15,7 @@
 import os   # This only exists for the complete crap hack for passwd info
             # in initDatabases
 import string
-            
+import GFOptions            
 from GFObjects import *
 from GFEvent import *
 from GFParser import *
@@ -261,7 +261,7 @@
   def executeExit(self, event):
     for block in self.blockList:
       if not block.isSaved():
-        self.dispatchEvent(GFEvent('formALERT','Current data not saved'))
+        self.dispatchEvent(GFEvent('formALERT',GFOptions._msgNOTSAVED))
         return
     else:
       self.dispatchEvent(GFEvent('exitApplication','Current data is saved'))
@@ -269,7 +269,7 @@
   def requestQuery(self, event):
     for block in self.blockList:
       if not block.isSaved():
-        self.dispatchEvent(GFEvent('formALERT','Current data not saved'))
+        self.dispatchEvent(GFEvent('formALERT',GFOptions._msgNOTSAVED))
         return
                       
     self.dispatchEvent(GFEvent('initQUERY',self.currentBlock))
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.1 gnue/gnuef/src/GFOptions.py:1.2
--- gnue/gnuef/src/GFOptions.py:1.1     Tue Oct  3 22:04:58 2000
+++ gnue/gnuef/src/GFOptions.py Tue Nov 14 20:04:39 2000
@@ -1 +1,3 @@
 DEBUG = 0
+
+_msgNOTSAVED = "Data not saved. Commit or rollback changes."
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.30 gnue/gnuef/src/UIwxpython.py:1.31
--- gnue/gnuef/src/UIwxpython.py:1.30   Thu Nov  9 15:50:23 2000
+++ gnue/gnuef/src/UIwxpython.py        Tue Nov 14 20:04:39 2000
@@ -185,12 +185,6 @@
       if style == 'dropdown':
         value = event.data.allowedValues()[value]
 
-# begin working on 7-nov-2000
-#      if style == 'dropdown':
-#        value = 
event.data.allowedValues()[block.dataSourceLink.getField(currentRecord-(index-count),event.data.field)]
-#      else:
-#        value = 
block.dataSourceLink.getField(currentRecord-(index-count),event.data.field)
-# end working on 7-nov-2000
       self.formToUI[event.data][0][count].SetEvtHandlerEnabled(FALSE)
       self.formToUI[event.data][0][count].SetValue(value)
       self.formToUI[event.data][0][count].SetEvtHandlerEnabled(TRUE)
@@ -198,9 +192,11 @@
     # fill currently indexed spot
     if style == 'dropdown':
       value = event.data.allowedValues()[event.data.getValue()]
+      print "Drop Value: ", value
     else:
       value = event.data.getValue()
-      
+      print "Value: ", value
+    
     self.formToUI[event.data][0][index].SetEvtHandlerEnabled(FALSE)
     self.formToUI[event.data][0][index].SetValue(value)
     self.formToUI[event.data][0][index].SetEvtHandlerEnabled(TRUE)
@@ -288,7 +284,8 @@
                        # record count
 
             # Move to proper object
-            action = GFEvent('requestFOCUS',key)
+            if key.getObjectType() == 'GFEntry':
+              action = GFEvent('requestFOCUS',key)
             
     #
     # Combo box events
@@ -445,7 +442,6 @@
     EVT_MENU(self, 208, lambda event, l=self: 
l.dispatchEvent(GFEvent('executeQUERY')))
     
     helpMenu = wxMenu()
-    print "About: ", helpMenu.Append( 300, "&About...", "Display info about 
gnuef" )
     EVT_MENU(self, 300, self.OnAbout)
 #    EVT_MENU(self, 300, self.getLogin)
 
@@ -474,7 +470,6 @@
     eo = event.GetEventObject()
     object = wxPyTypeCast(eo, 'wxFrame')
     if event.CanVeto():
-      print "It can be stoped", object
       self.dispatchEvent(GFEvent('requestEXIT'))
     else:
       object.Destroy()