gnue/gnuef samples/inventory/forms/sc_inv_cycle...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/02/09 17:00:19

Modified files:
        gnuef/samples/inventory/forms: sc_inv_cycle_count.gfd 
        gnuef/src      : GFForm.py GFObjects.py UIwxpython.py 

Log message:
        Initial multiline text box support

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.67&r2=1.68
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.59&r2=1.60
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.62&r2=1.63

Patches:
Index: gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd
diff -u gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd:1.1 
gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd:1.2
--- gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd:1.1       Sun Jan 
14 09:28:43 2001
+++ gnue/gnuef/samples/inventory/forms/sc_inv_cycle_count.gfd   Fri Feb  9 
17:00:19 2001
@@ -80,12 +80,12 @@
          <tip>The old on hand quantity for this item.</tip>
         </options>
       </entry>
-      <entry name="ntryNewQty" field="" x="54" y="11" width="10" 
visibleCount="20">
+      <entry name="ntryNewQty" x="54" y="11" width="10" visibleCount="20">
         <options>
          <tip>The new physical count quantity for this item.</tip>
         </options>
       </entry>
-      <entry name="ntrySold" field="" x="65" y="11" width="10" 
visibleCount="20">
+      <entry name="ntrySold" x="65" y="11" width="10" visibleCount="20">
         <options>
          <tip>The number of units sold for this item.</tip>
         </options>
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.67 gnue/gnuef/src/GFForm.py:1.68
--- gnue/gnuef/src/GFForm.py:1.67       Fri Feb  9 14:06:48 2001
+++ gnue/gnuef/src/GFForm.py    Fri Feb  9 17:00:19 2001
@@ -603,6 +603,10 @@
       if not hasattr(self.currentEntry,'readonly'):
         currentvalue = self.currentEntry.getValue()
 
+        if ord(event.data) == 13:
+          if self.currentEntry.height > 1: event.data = '\n';
+          else: return
+
         if hasattr(self.currentEntry,'foreign_key_description') and 
hasattr(self.currentEntry,'style') and (self.currentEntry.style=='dropdown'):
 #          value= 
self.currentEntry.findClosestValue(currentvalue[:self.currentEntry.cursorPosition]+event.data)
           value= self.currentEntry.findClosestValue(event.data)
@@ -646,7 +650,6 @@
   # charater be removed from the current entry object
   #
   def removeCharacter(self, event):
-    print "I'm deleting"
     if not hasattr(self.currentEntry,'readonly'):
       if event.getEvent() == 'requestBACKSPACE':
         if self.currentEntry.cursorPosition > 0:
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.59 gnue/gnuef/src/GFObjects.py:1.60
--- gnue/gnuef/src/GFObjects.py:1.59    Fri Feb  9 14:06:48 2001
+++ gnue/gnuef/src/GFObjects.py Fri Feb  9 17:00:19 2001
@@ -349,7 +349,6 @@
       datasourceName,fieldName = string.split(self.foreign_key,'.')
       datasource = self.block.form.datasourceDictionary[datasourceName]
 
-      print "do", self.value
       for count in range(datasource.getLastRecordNumber()+1):
         if datasource.getField(count,fieldName) == self.value:
           value = 1
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.62 gnue/gnuef/src/UIwxpython.py:1.63
--- gnue/gnuef/src/UIwxpython.py:1.62   Fri Feb  9 14:06:48 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri Feb  9 17:00:19 2001
@@ -89,7 +89,8 @@
                       WXK_F6:     GFEvent('requestCOMMIT'),
                       WXK_F8:     GFEvent('requestQUERY'),
                       WXK_F9:     GFEvent('executeQUERY'),
-                      WXK_F12:    GFEvent('requestNEWRECORD') 
+                      WXK_F11:    GFEvent('requestROLLBACK'),
+                      WXK_F12:    GFEvent('requestNEWRECORD'),
                      }
 
     # Create the UI from the GFForm passed in
@@ -321,13 +322,14 @@
           if event.ControlDown():
             GFDebug.printMesg(2, "Control %s" % (chr(event.KeyCode())))
             action = GFEvent('requestHOTKEY',chr(event.KeyCode()))
-          elif (32 <= event.KeyCode() <= 126):
+          elif (32 <= event.KeyCode() <= 126) or (event.KeyCode() == 
WXK_RETURN):
             action = GFEvent('requestKEYPRESS',chr(event.KeyCode()))
           # quick hack for for russian support from Dmitry Sorokin 
<address@hidden>
           elif (1728 <= event.KeyCode() <= 1791):
             offset = 1536
             action = GFEvent('requestKEYPRESS',chr(event.KeyCode()-offset))
                                     
+
     #
     # Mouse Events
     #
@@ -698,11 +700,15 @@
           EVT_CHAR(newWidget, self.uiEventTrap)
           EVT_COMBOBOX(newWidget, newWidget.GetId(), self.uiEventTrap)         
         else:
+          styles = wxTE_PROCESS_TAB
+          if object.height > 1:
+            styles = styles|wxTE_MULTILINE
+            
           newWidget = wxTextCtrl(container, -1, object.value,
                                  wxPoint(int(object.x)*int(self.widgetWidth),
                                          
(int(object.y)+spacer)*int(self.widgetHeight)),
                                  wxSize(int(object.width)*int(self.textWidth),
-                                        
int(object.height)*int(self.textHeight)),wxTE_PROCESS_TAB)
+                                        
int(object.height)*int(self.textHeight)),styles)
           
 
           EVT_CHAR(newWidget, self.uiEventTrap)