gnue/gnuef INSTALL TODO setup.py images/gnue-sp...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/02/09 14:06:48

Modified files:
        gnuef          : INSTALL TODO setup.py 
        gnuef/images   : gnue-splash.xcf 
        gnuef/samples/zipcode: zipcode.gfd 
        gnuef/src      : GFForm.py GFObjects.py GFOptions.py GFParser.py 
                         UIbase.py UIwxpython.py 
Added files:
        gnuef/images   : gnue-splash.png gnue.png gnue.xcf 
Removed files:
        gnuef/images   : gnue.bmp gnuef-splash.bmp 

Log message:
        switched all images to png format
        altered splash screen to use text widgets to display info instead of 
graphic
        added <scrollbar> tag support - not implemented yet in code
        added partial support for keying thru dropdown values (1 char only)

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/INSTALL.diff?r1=1.9&r2=1.10
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/TODO.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/setup.py.diff?r1=1.10&r2=1.11
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnue-splash.png.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnue.png.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnue.xcf.diff?r1=NONE&r2=1.1
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnue-splash.xcf.diff?r1=1.1&r2=1.2
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnue.bmp.diff?r1=1.1&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/images/gnuef-splash.bmp.diff?r1=1.1&r2=NONE
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/zipcode/zipcode.gfd.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.66&r2=1.67
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.58&r2=1.59
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFOptions.py.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFParser.py.diff?r1=1.12&r2=1.13
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIbase.py.diff?r1=1.16&r2=1.17
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.61&r2=1.62

Patches:
Index: gnue/gnuef/INSTALL
diff -u gnue/gnuef/INSTALL:1.9 gnue/gnuef/INSTALL:1.10
--- gnue/gnuef/INSTALL:1.9      Mon Feb  5 17:21:10 2001
+++ gnue/gnuef/INSTALL  Fri Feb  9 14:06:46 2001
@@ -59,12 +59,19 @@
        root "./setup.py install".
 
 PyGreSQL.tgz:                   www.druid.net/pygresql         
+        Only needed for acceess to postgresql databases.
        Untar in some place. Enter in the directory PyGreSQL-3.0,
        issue "./setup.py build".
        PyGreSQL needs to find the postgres header files in other
        place then debian installs them. One workaround is
        "ln -s /usr/include/postgresql /usr/include/pgsql".
        As root issue finally "./setup.py install".
+
+MySQLdb-0.3.2: http://dustman.net/andy/python/MySQLdb/
+        Only needed to access to mysql databases.
+        Note: The debian package is current too old and does not work
+        Untar in some place. Enter in the directory, issue
+        "python setup.py build" and as root "python setup.py install".
 
 PyXML-0.6.x.tar.gz:      pyxml.sourceforge.net/topics/download.html
   ->sourceforge.net/project/showfiles.php?group_id=6473&release_id=13315
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.43 gnue/gnuef/TODO:1.44
--- gnue/gnuef/TODO:1.43        Tue Feb  6 22:46:25 2001
+++ gnue/gnuef/TODO     Fri Feb  9 14:06:46 2001
@@ -1,8 +1,5 @@
 A name inside of [] means that person has taken that task
 
-**MUST HAVES for 0.0.6 
-**  complete DBError support
-
    Bugs 
     I've broken msgboxs in triggers
 
@@ -52,7 +49,13 @@
       that can be put in UIbase.  Maybe adjust UIpython to use NC*style
       ojbects so that most of the core functionality can be moved to UIbase
 
-    Dropdowns don't allow you to go to next|prev record via up and down arrows
+    Dropdown Issues:
+      wxpython dropdowns don't allow you to go to next|prev record via up and 
down arrows
+      mouse events not getting thru properly
+      mouse click to focus not getting thru properly
+      autocompletion is screwed up - currently only works on first character 
typed
+        this is due to wxpython's setValue on dropdowns setting the displayed 
value
+        but the internal value isn't changing
 
   Entry enhancements 
 
Index: gnue/gnuef/images/gnue-splash.xcf
Index: gnue/gnuef/samples/zipcode/zipcode.gfd
diff -u gnue/gnuef/samples/zipcode/zipcode.gfd:1.6 
gnue/gnuef/samples/zipcode/zipcode.gfd:1.7
--- gnue/gnuef/samples/zipcode/zipcode.gfd:1.6  Wed Jan 24 19:13:19 2001
+++ gnue/gnuef/samples/zipcode/zipcode.gfd      Fri Feb  9 14:06:48 2001
@@ -5,10 +5,12 @@
     <title>ZIP Code Maintenance</title>
     <version>0.0.1</version>
     <height>17</height>
-    <width>39</width>
+    <width>42</width>
   </options>
 
-  <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/>
+<!--  <database name="gnue" provider="mysql" dbname="gnue" host="localhost"/> 
-->
+  <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/> 
+
   <datasource name="zips" database="gnue" table="zipcode" cache="5" 
order_by="state_code,city"/> 
   <datasource name="validator" database="gnue" table="state" prequery="" 
order_by="description"/>
 
@@ -34,6 +36,8 @@
          <tip>US Postal Zip Code</tip>
        </options>
       </entry>
+
+      <scrollbar x="40" y="2" width="1" height="15"/>
 
     </block>
   </page>
Index: gnue/gnuef/setup.py
diff -u gnue/gnuef/setup.py:1.10 gnue/gnuef/setup.py:1.11
--- gnue/gnuef/setup.py:1.10    Wed Feb  7 19:11:43 2001
+++ gnue/gnuef/setup.py Fri Feb  9 14:06:46 2001
@@ -96,7 +96,7 @@
 #  Maybe later :)
 
 imagefiles="""
-  recursive-include images *.bmp
+  recursive-include images *.png
 """
 print os.path.splitdrive(sys.prefix)[0]+'/usr/local/gnue/shared',
 
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.66 gnue/gnuef/src/GFForm.py:1.67
--- gnue/gnuef/src/GFForm.py:1.66       Mon Feb  5 17:21:11 2001
+++ gnue/gnuef/src/GFForm.py    Fri Feb  9 14:06:48 2001
@@ -602,6 +602,15 @@
     if (self.currentEntry != None):
       if not hasattr(self.currentEntry,'readonly'):
         currentvalue = self.currentEntry.getValue()
+
+        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)
+          if not value: return
+          self.currentEntry.setValue(value)
+          self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
+          return
+          
         if hasattr(self.currentEntry,'lowercase'):
           event.data = string.lower(event.data)
         if hasattr(self.currentEntry,'uppercase'):
@@ -637,6 +646,7 @@
   # 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.58 gnue/gnuef/src/GFObjects.py:1.59
--- gnue/gnuef/src/GFObjects.py:1.58    Mon Feb  5 17:21:11 2001
+++ gnue/gnuef/src/GFObjects.py Fri Feb  9 14:06:48 2001
@@ -91,6 +91,14 @@
     GFObj.__init__(self, parent)
     self.type = "GFBox"
     self.label = ""
+#
+# GFScrollBar
+#
+class GFScrollBar(GFObj):
+  def __init__(self, parent=None):
+    GFObj.__init__(self, parent)
+    self.type = "GFScrollBar"
+    self.label = ""
 
 #
 #GFLabel
@@ -341,6 +349,7 @@
       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
@@ -348,6 +357,21 @@
     return value
 
   #
+  # findClosestValue
+  # 
+  def findClosestValue(self, value):
+    newvalue=None
+    if hasattr(self,'foreign_key'):
+      datasourceName,fieldName = string.split(self.foreign_key,'.')
+      datasource = self.block.form.datasourceDictionary[datasourceName]
+      for count in range(datasource.getLastRecordNumber()+1):
+        if 
string.lower(datasource.getField(count,self.foreign_key_description)[:len(value)])
 == string.lower(value):
+          newvalue = datasource.getField(count,fieldName)
+          if newvalue == self.value: continue
+          break
+    return newvalue
+                                                    
+  #
   # allowedValues
   #
   def allowedValues(self):
@@ -457,9 +481,6 @@
           if not self.resultSet[0].has_key(fieldName):
             for result in self.resultSet:
               result [fieldName] = ""
-            #Replacing this code with above two lines
-            #for count in range(len(self.resultSet)):
-            #  self.resultSet[count][fieldName] = ""
 
             
         # Reset the internal type to string so things like len() work properly
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.18 gnue/gnuef/src/GFOptions.py:1.19
--- gnue/gnuef/src/GFOptions.py:1.18    Fri Feb  9 10:14:33 2001
+++ gnue/gnuef/src/GFOptions.py Fri Feb  9 14:06:48 2001
@@ -8,13 +8,13 @@
                           # is the form name to run
                           
 # Startup graphic
-splashScreenBMP=prefix+"/shared/images/gnuef-splash.bmp"
+splashScreenPNG=prefix+"/shared/images/gnue-splash.png"
 
 #GNUe Button 16x16
 generic_button=prefix+"/shared/images/button16.png"
 
 # GNUe logo
-smallBMP=prefix+"/shared/images/gnue.bmp"
+smallPNG=prefix+"/shared/images/gnue.png"
 
 
 
Index: gnue/gnuef/src/GFParser.py
diff -u gnue/gnuef/src/GFParser.py:1.12 gnue/gnuef/src/GFParser.py:1.13
--- gnue/gnuef/src/GFParser.py:1.12     Sun Jan 14 15:32:38 2001
+++ gnue/gnuef/src/GFParser.py  Fri Feb  9 14:06:48 2001
@@ -163,6 +163,7 @@
               'label' : GFLabel,
               'entry' : GFEntry,
               'box'   : GFBox,
+              'scrollbar' : GFScrollBar,
               'datasource': GFDataSource,
               'database':   GFDatabase
               }
Index: gnue/gnuef/src/UIbase.py
diff -u gnue/gnuef/src/UIbase.py:1.16 gnue/gnuef/src/UIbase.py:1.17
--- gnue/gnuef/src/UIbase.py:1.16       Mon Dec 18 11:59:28 2000
+++ gnue/gnuef/src/UIbase.py    Fri Feb  9 14:06:48 2001
@@ -56,6 +56,7 @@
       'GFPage': self.pageHandler,        # to build the widgets.  Can override 
in 
       'GFLabel': self.stdHandler,        # UI specific module if necessary
       'GFBox': self.stdHandler,          # UI specific module if necessary
+      'GFScrollBar': self.stdHandler,          # UI specific module if 
necessary
       'GFEntry': self.entryHandler,
       'GFForm': self.formHandler
       }
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.61 gnue/gnuef/src/UIwxpython.py:1.62
--- gnue/gnuef/src/UIwxpython.py:1.61   Fri Feb  9 10:14:33 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri Feb  9 14:06:48 2001
@@ -59,7 +59,14 @@
                                 
wxPoint(int(object.x)*int(self.widgetWidth)+(int(self.widgetWidth)/2),
                                         
(int(object.y)+spacer)*int(self.widgetHeight)+(int(self.widgetHeight)/2)),
                                 
wxSize(int(object.width)*int(self.widgetWidth)-(int(self.widgetWidth)/2),
-                                       
int(object.height)*int(self.widgetHeight)-(int(self.widgetHeight)/2)))"""
+                                       
int(object.height)*int(self.widgetHeight)-(int(self.widgetHeight)/2)))""",
+                              'GFScrollBar':
+                              """wxScrollBar(container,-1,
+                              
wxPoint(int(object.x)*int(self.widgetWidth),(int(object.y)+spacer)*int(self.widgetHeight)),
+                              
wxSize(int(object.width)*int(self.widgetWidth),int(object.height)*int(self.widgetHeight)),
+                              wxSB_VERTICAL
+                              )"""
+                              
                               }
 #                                
wxSize(int(object.width)*int(self.widgetWidth),int(object.height)*int(self.widgetHeight)))"""
     
@@ -111,9 +118,41 @@
     #independent way.
     #object tree building
     wxInitAllImageHandlers()
-    self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenBMP,
+    self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenPNG,
                                duration=1000, callback=self.onMain,
                                style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
+
+    swidth,sheight = self.splash.GetSizeTuple()
+
+    # Make the text print white
+    self.splash.SetForegroundColour(wxColour(0xFF, 0xFF, 0xFF))
+    self.splash.SetFont(wxFont(20,wxSWISS,wxNORMAL,wxBOLD))
+
+    
+
+    text = "GNU Enterprise Forms"
+    twidth,theight = self.splash.GetTextExtent(text)
+    wxStaticText(parent=self.splash, id=-1, label=str(text),
+                 
size=wxSize(swidth,theight),pos=wxPoint(1,1),style=wxALIGN_CENTRE)
+
+    self.splash.SetFont(wxFont(10,wxSWISS,wxNORMAL,wxBOLD))
+
+    text = "Version %s" % GFOptions.VERSION
+    twidth,theight = self.splash.GetTextExtent(text)
+    wxStaticText(parent=self.splash, id=-1, label=str(text),
+                 size=wxSize(swidth,theight), 
pos=wxPoint(1,25),style=wxALIGN_CENTRE)
+    
+    text = "(c)2000 Free Software Foundation"
+    twidth,theight = self.splash.GetTextExtent(text)
+    wxStaticText(self.splash, -1, str(text),
+                 wxPoint(1,50),wxSize(swidth,theight),wxALIGN_CENTRE)
+
+    text = "Protected by GNU General Public Licence 2.0 or greater"
+    wxStaticText(self.splash, -1, str(text),
+                 
wxPoint(1,sheight-(theight+10)),wxSize(swidth-5,theight),wxALIGN_RIGHT)
+    
+    
+    
     self.splash.Show(true)
     self.splash.CenterOnScreen()
     return true
@@ -299,7 +338,6 @@
 
       for key in self.formToUI.keys():
         for count in range(len(self.formToUI[key][0])):
-#          GFDebug.printMesg(3, "uiItem 
",self.formToUI[key][0][count].GetId(),"we want ", object.GetId())
           if self.formToUI[key][0][count].GetId() == object.GetId():
             # Move to proper row
             if count < self.formToUI[key][1]:
@@ -448,8 +486,6 @@
 
     return widget
     
-                                                                               
                                                                
-
   def pageHandler(self):
     object    = self.currentObject[0]
     container = self.currentWidget[0]
@@ -551,7 +587,7 @@
 
     mainToolBar = 
self.frame.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
     mainToolBar.AddSimpleTool(10, png, "new", "long new")
-#this platform specific    mainToolBar.AddSimpleTool(10, 
wxBitmap('/home/dneighbo/cvs/gnue/gnuef/images/button16.bmp', 
wxBITMAP_TYPE_BMP), "new", "long new")
+#     mainToolBar.AddSimpleTool(10, wxBitmap(GFOptions.generic_button, 
wxBITMAP_TYPE_PNG), "new", "long new")
     EVT_TOOL(self, 10, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestABOUT')))
     mainToolBar.Realize()
 #
@@ -656,7 +692,7 @@
                                          
(int(object.y)+spacer)*int(self.widgetHeight)),
                                  wxSize(int(object.width)*int(self.textWidth),
                                         
int(object.height)*int(self.textHeight)),
-                                 choices, wxCB_READONLY)
+                                 choices, wxCB_DROPDOWN)
           newWidget.SetValue("")
 
           EVT_CHAR(newWidget, self.uiEventTrap)
@@ -687,7 +723,7 @@
     self.dlg.SetBackgroundColour(wxWHITE)
     self.dlg.SetAutoLayout(true)
     
-    bmp = wxImage(GFOptions.smallBMP, wxBITMAP_TYPE_BMP).ConvertToBitmap()
+    bmp = wxImage(GFOptions.smallPNG, wxBITMAP_TYPE_PNG).ConvertToBitmap()
     dlgWidth, dlgHeight = self.dlg.GetSizeTuple()
     
     wxStaticBitmap(self.dlg,-1, bmp, wxPoint((dlgWidth-bmp.GetWidth())/2, 
10),wxSize(bmp.GetWidth(), bmp.GetHeight()))