gnue/gnuef/src GFForm.py GFInstance.py GFObject...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/07/11 16:06:46

Modified files:
        gnuef/src      : GFForm.py GFInstance.py 
        gnuef/src/GFObjects: GFBlock.py GFDataSource.py 

Log message:
        Fixed popup warnings on next/prev record
        Removed debugging print lines

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFBlock.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFDataSource.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.109 gnue/gnuef/src/GFForm.py:1.110
--- gnue/gnuef/src/GFForm.py:1.109      Tue Jul  3 18:42:45 2001
+++ gnue/gnuef/src/GFForm.py    Wed Jul 11 16:06:46 2001
@@ -44,8 +44,6 @@
 import GFParser
 import GFTrigger
 
-# VERSION = "0.0.8"
-
 class GFForm(GFObj, GFEventAware):
   def __init__(self, parent=None, app=None):
     GFObj.__init__(self, parent)
@@ -757,9 +755,11 @@
         masterBlock,masterField = string.split(block.master,'.')
         if masterBlock == self._currentBlock.name:
           if not block.isSaved():
-            message = GFMsgBox(self, GConfig.get('_msgNOTSAVED'))
-            message.show()
-            return    
+            message = GConfig.get('_msgNOTSAVED')
+            return message
+            #message = GFMsgBox(self, GConfig.get('_msgNOTSAVED'))
+            #message.show()
+            #return    
     self._currentBlock.prevRecord()
 
   def nextRecord(self):
@@ -768,9 +768,8 @@
         masterBlock,masterField = string.split(block.master,'.')
         if masterBlock == self._currentBlock.name:
           if not block.isSaved():
-            message = GFMsgBox(self, GConfig.get('_msgDETAILNOTSAVED'))
-            message.show()
-            return    
+            message = GConfig.get('_msgNOTSAVED')
+            return message
     self._currentBlock.nextRecord()
 
 
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.15 gnue/gnuef/src/GFInstance.py:1.16
--- gnue/gnuef/src/GFInstance.py:1.15   Tue Jul  3 18:42:45 2001
+++ gnue/gnuef/src/GFInstance.py        Wed Jul 11 16:06:46 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.15 2001/07/04 01:42:45 jcater Exp $
+# $Id: GFInstance.py,v 1.16 2001/07/11 23:06:46 jamest Exp $
 #
 
 import pstats
@@ -193,7 +193,11 @@
   # form advance to the next record in memory
   #
   def prevRecord(self, event):
-    self._form.prevRecord()
+    message = self._form.prevRecord()
+    if message:
+      messageBox = GFMsgBox(self,message)
+      messageBox.show()
+      return
     
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
     self.updateRecordCounter()
     self.updateRecordStatus()
@@ -205,7 +209,11 @@
   # form advance to the next record in memory
   #
   def nextRecord(self, event):
-    self._form.nextRecord()
+    message = self._form.nextRecord()
+    if message:
+      messageBox = GFMsgBox(self,message)
+      messageBox.show()
+      return
     
self.dispatchEvent(GFEvent('gotoENTRY',{'object':self._form._currentEntry}))
     self.updateRecordCounter()
     self.updateRecordStatus()
Index: gnue/gnuef/src/GFObjects/GFBlock.py
diff -u gnue/gnuef/src/GFObjects/GFBlock.py:1.3 
gnue/gnuef/src/GFObjects/GFBlock.py:1.4
--- gnue/gnuef/src/GFObjects/GFBlock.py:1.3     Tue Jul 10 14:29:31 2001
+++ gnue/gnuef/src/GFObjects/GFBlock.py Wed Jul 11 16:06:46 2001
@@ -216,8 +216,6 @@
           
       self.mode = 'normal'
 
-      print self._dataSourceLink
-
       self._dataSourceLink.query()
       self.processTrigger('Post-Query')
       self._recordCount = self._dataSourceLink.getLastRecordNumber()
Index: gnue/gnuef/src/GFObjects/GFDataSource.py
diff -u gnue/gnuef/src/GFObjects/GFDataSource.py:1.2 
gnue/gnuef/src/GFObjects/GFDataSource.py:1.3
--- gnue/gnuef/src/GFObjects/GFDataSource.py:1.2        Tue Jul 10 14:29:31 2001
+++ gnue/gnuef/src/GFObjects/GFDataSource.py    Wed Jul 11 16:06:46 2001
@@ -144,7 +144,6 @@
   #
   def query(self):
     GDebug.printMesg(2, "Query with this in resultSet\n%s"%self.resultSet[0])
-    print self.__dict__
     if hasattr(self,'database'):
       if self.sql == None:
         mask = {}