gnue/gnuef TODO client/gfclient src/GFClient.py...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/06/01 15:02:04

Modified files:
        gnuef          : TODO 
        gnuef/client   : gfclient 
        gnuef/src      : GFClient.py GFInstance.py GFOptions.py 
                         UIwxpython.py 

Log message:
        Added option to bypass the splashscreen
        Removed some old stuff from TODO
        Bumped the rev level to pre-0.0.8

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/TODO.diff?cvsroot=OldCVS&tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/client/gfclient.diff?cvsroot=OldCVS&tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFClient.py.diff?cvsroot=OldCVS&tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFOptions.py.diff?cvsroot=OldCVS&tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/UIwxpython.py.diff?cvsroot=OldCVS&tr1=1.90&tr2=1.91&r1=text&r2=text

Patches:
Index: gnue/gnuef/TODO
diff -u gnue/gnuef/TODO:1.49 gnue/gnuef/TODO:1.50
--- gnue/gnuef/TODO:1.49        Mon Apr 16 12:35:51 2001
+++ gnue/gnuef/TODO     Fri Jun  1 15:02:03 2001
@@ -2,9 +2,6 @@
 
    Bugs 
     I've broken msgboxs in triggers
-
-    samples/geas/ needs table creation scripts or needs to instruct to
-      build the tables from geas samples to work properly.
     
     triggers should not fire during query entry
 
@@ -42,8 +39,6 @@
   
     user extensible menus
 
-    Look into adding checkbox [ra3vat]
-
     menus should disable options not available via events 
 
     ability for ui/forms to launch other ui/forms
@@ -93,3 +88,7 @@
     Look into inlcude support (entities could do this too)
 
     Make other datasources accessible from forms easily
+
+
+
+
Index: gnue/gnuef/src/GFClient.py
diff -u gnue/gnuef/src/GFClient.py:1.16 gnue/gnuef/src/GFClient.py:1.17
--- gnue/gnuef/src/GFClient.py:1.16     Thu May 31 14:52:57 2001
+++ gnue/gnuef/src/GFClient.py  Fri Jun  1 15:02:04 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFClient.py,v 1.16 2001/05/31 21:52:57 jcater Exp $
+# $Id: GFClient.py,v 1.17 2001/06/01 22:02:04 jamest Exp $
 #
 
 import pstats
@@ -66,7 +66,10 @@
   COMMAND_OPTIONS = [ 
       [ 'user_interface', 'u', 'user_interface', 1, 'gui', 'type',  
           'The currently supported values for <type> are ' \
-          +'gui, text (unstable), and pytext' ] ]
+          +'gui, text (unstable), and pytext' ],
+      [ 'splash_screen','s','no_splash', 0, None, None,
+          'Disables the splash screen']
+      ]
   SUMMARY = \
      "GNUe Forms is the primary user interface to the GNU Enterprise system."
 
@@ -80,6 +83,7 @@
     self._lastSerialNumber = 0
 
     self.ui_type = self.OPTIONS['user_interface']
+    self.disableSplash = self.OPTIONS['splash_screen']
 
 
 #
@@ -106,7 +110,6 @@
       if os.environ.has_key('DISPLAY') or os.name != 'posix':
         from gnue.forms import UIwxpython
         self._ui=UIwxpython.GFUserInterface
-        
       else:
         self.ui_type='text'
 
@@ -125,7 +128,7 @@
   def runForm(self, formFile):    
     
     instance = GFInstance(self, self.getNextSerialNumber(), 
-        connections=self.connections, ui=self._ui)
+        connections=self.connections, ui=self._ui, 
disableSplash=self.disableSplash)
 
     #
     # Build the form tree
Index: gnue/gnuef/src/GFInstance.py
diff -u gnue/gnuef/src/GFInstance.py:1.5 gnue/gnuef/src/GFInstance.py:1.6
--- gnue/gnuef/src/GFInstance.py:1.5    Fri Jun  1 12:55:48 2001
+++ gnue/gnuef/src/GFInstance.py        Fri Jun  1 15:02:04 2001
@@ -34,7 +34,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: GFInstance.py,v 1.5 2001/06/01 19:55:48 jcater Exp $
+# $Id: GFInstance.py,v 1.6 2001/06/01 22:02:04 jamest Exp $
 #
 
 import pstats
@@ -58,14 +58,14 @@
   # 
   # Initialize the class
   #
-  def __init__(self, manager, serial, connections, ui):
+  def __init__(self, manager, serial, connections, ui, disableSplash):
     GFController.__init__(self)
 
     self.connections = connections
     self.manager = manager
     self._serial = serial 
     self._uiclass = ui
-
+    self._disableSplash = disableSplash
     # Incomming events
     self.incommingEvent = {'requestNEXTENTRY'    : self.nextEntry,
                            'requestPREVENTRY'    : self.previousEntry,
@@ -470,8 +470,7 @@
   #  Activate this puppy...
   #
   def activate(self): 
-
-    ui = self._uiclass()
+    ui = self._uiclass(self._disableSplash)
     ui.registerEventListener(self.processEvent)
     self.registerEventListener(ui.processEvent)
             
Index: gnue/gnuef/src/GFOptions.py
diff -u gnue/gnuef/src/GFOptions.py:1.28 gnue/gnuef/src/GFOptions.py:1.29
--- gnue/gnuef/src/GFOptions.py:1.28    Fri May  4 16:27:03 2001
+++ gnue/gnuef/src/GFOptions.py Fri Jun  1 15:02:04 2001
@@ -93,4 +93,4 @@
 textPercentage = 100
 
 # Version
-VERSION = "0.0.7"
+VERSION = "pre-0.0.8"
Index: gnue/gnuef/src/UIwxpython.py
diff -u gnue/gnuef/src/UIwxpython.py:1.90 gnue/gnuef/src/UIwxpython.py:1.91
--- gnue/gnuef/src/UIwxpython.py:1.90   Fri Jun  1 13:04:02 2001
+++ gnue/gnuef/src/UIwxpython.py        Fri Jun  1 15:02:04 2001
@@ -77,12 +77,12 @@
 # All UIs must provide this class
 #
 class GFUserInterface(wxApp,GFUserInterfaceBase):
-  def __init__(self):
+  def __init__(self, disableSplash = None):
+    self._disableSplash = disableSplash
     wxApp.__init__(self,0)
     GFUserInterfaceBase.__init__(self)
 
     self._loginHandler = wxLoginHandler()
-
     self.keyEvents = {WXK_PRIOR:  GFEvent('requestPREVBLOCK'),
                       WXK_NEXT:   GFEvent('requestNEXTBLOCK'),
                       WXK_TAB:    GFEvent('requestNEXTENTRY'),                 
       
@@ -133,42 +133,40 @@
     #
     # SplashScreen
     # 
-    # Note splash screen is used to bootstrap
-    # In future need to implement callback in platform
-    # independent way.
-    self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenPNG,
-                               duration=5000, # callback=self.onMain,
-                               style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
-    swidth,sheight = self.splash.GetSizeTuple()
-
-    # Make the splash 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)
+    if not self._disableSplash:
+      self.splash = SplashScreen(None,bitmapfile=GFOptions.splashScreenPNG,
+                                 # duration=65535, callback=self.onMain,
+                                 style=wxSIMPLE_BORDER|wxCENTRE_ON_SCREEN )
+      swidth,sheight = self.splash.GetSizeTuple()
+
+      # Make the splash 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)
+      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()
+      self.splash.CenterOnScreen()
+      self.splash.Show(true)
 
     #
     # Create the main window