gnue/gnuef/src UIwxpython.py GFObjects/GFDataSo...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Branch:         gnuef-new-datasources
Changes by:     Jason Cater <address@hidden>    01/07/31 18:09:17

Modified files:
        gnuef/src      : UIwxpython.py 
        gnuef/src/GFObjects: GFDataSource.py GFEntry.py 

Log message:
        changes required for master/detail

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.104.2.12&tr2=1.104.2.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFDataSource.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.3.2.8&tr2=1.3.2.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&only_with_tag=gnuef-new-datasources&tr1=1.2.2.14&tr2=1.2.2.15&r1=text&r2=text

Patches:
Index: gnue/gnuef/src/GFObjects/GFDataSource.py
diff -u gnue/gnuef/src/GFObjects/GFDataSource.py:1.3 
gnue/gnuef/src/GFObjects/GFDataSource.py:1.4
--- gnue/gnuef/src/GFObjects/GFDataSource.py:1.3        Wed Jul 11 16:06:46 2001
+++ gnue/gnuef/src/GFObjects/GFDataSource.py    Tue Jul 17 06:43:09 2001
@@ -188,31 +188,23 @@
   def commit(self):
     if hasattr(self,'database'):
       for count in range(len(self.resultSet)):
-        GDebug.printMesg(2, "record %s is %s \n %s" % (count, 
self.resultSetStatus[count],self.resultSet[count]))
-        mask = {}
-        for key in self.resultSet[count].keys():
-          if key in self.dataConnection.getFieldList(self.table).keys() or \
-             key == self.uniqueKey:
-            mask[key]=self.resultSet[count][key]
+        if self.resultSetStatus[count] in ('modified', 'deleted'):
+          GDebug.printMesg(2, "record %s is %s \n %s" % (count, 
self.resultSetStatus[count],self.resultSet[count]))
+          mask = {}
+          for key in self.resultSet[count].keys():
+            if key in self.dataConnection.getFieldList(self.table).keys() or \
+               key == self.uniqueKey:
+              mask[key]=self.resultSet[count][key]
 
-        GDebug.printMesg(10, "will be passing\n%s"% mask)
+          GDebug.printMesg(10, "will be passing\n%s"% mask)
                                                   
-        if self.resultSetStatus[count] in ('modified', 'deleted'):
           if self.resultSet[count].has_key(self.uniqueKey):
             if self.resultSetStatus[count]  == 'modified':
-              # record never in database so just mark for cleanup
-              # self.resultSet[count][self.uniqueKey] = -1
-              
-              # elif self.resultSet[count][self.uniqueKey] > 0:
               GDebug.printMesg(1, "updating the record")
               self.dataConnection.update(self.table,mask)
             else:
               GDebug.printMesg(1,"deleting the record")
-              #mask[self.uniqueKey] = \
-              #  mask[self.uniqueKey] * -1
               self.dataConnection.delete(self.table,mask)
-              # flip negative again so upcomming list purge see's the negatives
-              #mask[self.uniqueKey] = -1
               
           else:
             GDebug.printMesg(1, "Inserting the record")
Index: gnue/gnuef/src/GFObjects/GFEntry.py
diff -u gnue/gnuef/src/GFObjects/GFEntry.py:1.6 
gnue/gnuef/src/GFObjects/GFEntry.py:1.7
--- gnue/gnuef/src/GFObjects/GFEntry.py:1.6     Wed Jul 18 15:45:01 2001
+++ gnue/gnuef/src/GFObjects/GFEntry.py Tue Jul 31 16:22:30 2001
@@ -53,15 +53,18 @@
     self._uppercase = 0
     self._lowercase = 0
     self._numeric = 0
+    self._rows = 1
     self.typecast="text"
     self.case="mixed"
 
 
   def buildObject(self): 
+
     # Convert deprecated attributes
     if hasattr(self,'numeric') and self.numeric: 
       del self.numeric
       self.typecast = 'number'
+
     if hasattr(self,'uppercase') and self.uppercase: 
       del self.uppercase
       self.case = 'upper' 
@@ -69,6 +72,11 @@
       del self.lowercase
       self.case = 'lower' 
 
+    if not hasattr(self, 'rows') and hasattr(self,'visibleCount'): 
+      self.rows = self.visibleCount
+      del self.visibleCount
+
+
 
   def initialize(self):
 
@@ -91,12 +99,11 @@
       datasourceName,self.fieldName = string.split(self.foreign_key,'.')
       self.datasource = self._block._form._datasourceDictionary[datasourceName]
 
-    #if not hasattr(self,'visibleCount'):
     if not hasattr(self,'rows'):
       if hasattr(self._block,'rows'):
-        self.visibleCount = self._block.rows
+        self._rows = self._block.rows
     else:
-      self.visibleCount = self.rows
+      self._rows = self.rows
       
     if not hasattr(self,'rowSpacer'):
       if hasattr(self._block,'rowSpacer'):
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.104 gnue/gnuef/src/UIwxpython.py:1.105
--- gnue/gnuef/src/UIwxpython.py:1.104  Tue Jul  3 18:42:45 2001
+++ gnue/gnuef/src/UIwxpython.py        Mon Jul 16 20:09:41 2001
@@ -42,8 +42,6 @@
 _NOTEBOOK = None
 _LOOPTRAP = 0
 
-
-
 #
 # Little global helper routine to set font according to options
 #
@@ -226,6 +224,8 @@
     EVT_MENU(self, 201, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEXTRECORD')))
     dataMenu.Append( 202, "Previous Record   
(Down)",GConfig.get('msg_previous'))
     EVT_MENU(self, 202, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestPREVRECORD')))
+    dataMenu.Append( 209, "Jump to Record...     (F2)",GConfig.get('msg_jump'))
+    EVT_MENU(self, 209, self.promptForRecordNumber)
     dataMenu.Append( 203, "New Record           
(F12)",GConfig.get('msg_insert'))
     EVT_MENU(self, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
     dataMenu.Append( 204, "Delete Record          
(F5)",GConfig.get('msg_delete'))
@@ -438,6 +438,19 @@
     self.mainWindow.Close()
 
   #
+  # promptForRecordNumber
+  #
+  # Presents a dialog to user asking for the record number to jump to
+  #
+  def promptForRecordNumber(self, event= None):
+    dlg = wxTextEntryDialog(self.mainWindow, 'Enter record number to jump to',
+                                                        'Which record?')
+    if dlg.ShowModal() == wxID_OK:
+      self.dispatchEvent(GFEvent('requestRECORDNUMBER', dlg.GetValue()))
+      dlg.Destroy()
+                      
+
+  #
   # closeTrap
   #
   # intercepts the applications closure and generates an event to the form 
requesting
@@ -480,6 +493,9 @@
           elif (1728 <= event.KeyCode() <= 1791):
             offset = 1536
             action = GFEvent('requestKEYPRESS',chr(event.KeyCode()-offset))
+          elif event.KeyCode() == WXK_F2:
+            self.promptForRecordNumber()
+
             
     #
     # Mouse Events
@@ -1007,6 +1023,7 @@
 class UIMessageBox(wxMessageDialog, UIHelper):
   def __init__(self, interface, message, caption):
     wxMessageDialog.__init__(self, interface, message, caption, 
style=wxOK|wxICON_EXCLAMATION)
+