gnue/gnuef client/gfclient src/UIwxpython.py sr...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/02/08 20:55:15

Modified files:
        gnuef/client   : gfclient 
        gnuef/src      : UIwxpython.py 
        gnuef/src/drivers/mysql: DBdriver.py 
        gnuef/src/drivers/odbc: DBdriver.py 

Log message:
        Win32 urllib drive letter bug work arround
        Win32 login dialog under splashscreen bug
        MySQL/ODBC driver changes
        Remove function key ref from about dialog

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/client/gfclient.diff?r1=1.17&r2=1.18
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/UIwxpython.py.diff?r1=1.59&r2=1.60
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/mysql/DBdriver.py.diff?r1=1.7&r2=1.8
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/odbc/DBdriver.py.diff?r1=1.3&r2=1.4

Patches:
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.17 gnue/gnuef/client/gfclient:1.18
--- gnue/gnuef/client/gfclient:1.17     Wed Feb  7 19:11:43 2001
+++ gnue/gnuef/client/gfclient  Thu Feb  8 20:55:14 2001
@@ -73,14 +73,15 @@
           print "No Forms Definition File Specified.  Use GFClient -h for more 
information."
           sys.exit()
 
-    # Make sure the form file is a proper url
-        
-
-    
-
     # get the form file handler
+    # we have to deal with win32 urllib thinking the the c: in c:/foo/bar is a 
protocol 
+    drive = os.path.splitdrive(self.formfile) 
     try:
-      fp = urllib.urlopen(self.formfile)
+      if len(drive[0]):
+        fp = open(self.formfile,'r')
+      else:
+        fp = urllib.urlopen(self.formfile)
+        
     except:
       print "The file %s doesn't seem to exist.\n%s\n%s" % (self.formfile, 
sys.exc_info()[0], sys.exc_info()[1])
       
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.59 gnue/gnuef/src/UIwxpython.py:1.60
--- gnue/gnuef/src/UIwxpython.py:1.59   Tue Feb  6 22:41:40 2001
+++ gnue/gnuef/src/UIwxpython.py        Thu Feb  8 20:55:14 2001
@@ -112,8 +112,10 @@
     #object tree building
     wxInitAllImageHandlers()
     self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenBMP,
-                               duration=1000, callback=self.onMain)
+                               duration=1000, callback=self.onMain,
+                               style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
     self.splash.Show(true)
+    self.splash.CenterOnScreen()
     return true
     
   #
@@ -587,12 +589,13 @@
                           "  Version: %s\n"
                           "  Author : %s\n"
                           "  Description: %s\n" 
-                          "-= Quick Reference =-\n"
-                          "  F5 : Mark record for delete at next commit\n"
-                          "  F6 : Commit Changes\n"
-                          "  F8 : Enter query mode|Abort query mode\n"
-                          "  F9 : Execute query with current mask\n"
-                          "  F12: Add new record\n" % (programVersion, 
formName ,formVersion,author,description),
+#                          "-= Quick Reference =-\n"
+#                          "  F5 : Mark record for delete at next commit\n"
+#                          "  F6 : Commit Changes\n"
+#                          "  F8 : Enter query mode|Abort query mode\n"
+#                          "  F9 : Execute query with current mask\n"
+#                          "  F12: Add new record\n"
+                          % (programVersion, formName 
,formVersion,author,description),
                           "About", wxOK | wxICON_INFORMATION)
     dlg.ShowModal()
     dlg.Destroy()
@@ -692,7 +695,10 @@
     EVT_CHAR(self.usernameEntry, self.usernameEventTrap)
     EVT_TEXT_ENTER(self.passwordEntry, 10, self.passwordEnterTrap)
     EVT_CHAR(self.passwordEntry, self.passwordEventTrap)
-        
+
+    self.dlg.Raise()
+    #self.dlg.Refresh()
+    self.dlg.CenterOnScreen()
     self.dlg.ShowModal()
     self.dlg.Destroy()
     
Index: gnue/gnuef/src/drivers/mysql/DBdriver.py
diff -u gnue/gnuef/src/drivers/mysql/DBdriver.py:1.7 
gnue/gnuef/src/drivers/mysql/DBdriver.py:1.8
--- gnue/gnuef/src/drivers/mysql/DBdriver.py:1.7        Wed Feb  7 19:11:43 2001
+++ gnue/gnuef/src/drivers/mysql/DBdriver.py    Thu Feb  8 20:55:14 2001
@@ -14,7 +14,9 @@
 
 import MySQLdb
 import string
+import sys
 from gnue.forms import GFOptions
+from gnue.forms.GFError import DBError
 
 class DBdriver:
   def __init__(self):
Index: gnue/gnuef/src/drivers/odbc/DBdriver.py
diff -u gnue/gnuef/src/drivers/odbc/DBdriver.py:1.3 
gnue/gnuef/src/drivers/odbc/DBdriver.py:1.4
--- gnue/gnuef/src/drivers/odbc/DBdriver.py:1.3 Wed Feb  7 19:11:43 2001
+++ gnue/gnuef/src/drivers/odbc/DBdriver.py     Thu Feb  8 20:55:15 2001
@@ -12,7 +12,9 @@
 #
 
 import string
+import sys
 from gnue.forms import GFOptions
+from gnue.forms.GFError import DBError
 
 class DBdriver:
   def __init__(self):