gnue forms/setup.py forms/src/GFClient.py forms...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/02/17 14:54:06

Modified files:
        forms          : setup.py 
        forms/src      : GFClient.py 
        forms/src/GFObjects: GFDataSource.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 
Added files:
        forms/src/uidrivers: __init__.py 
        forms/src/uidrivers/_base: __init__.py 
        forms/src/uidrivers/wx: __init__.py 
Removed files:
        common/src/dbdrivers: factory.py 
        forms/src      : UIbase.py UIcurses.py UIpyncurses.py 
                         UIwxpython.py 

Log message:
        UI driver system changed to dir based dynamic system
        More code cleanup

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/setup.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFDataSource.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.143&tr2=1.144&r1=text&r2=text

Patches:
Index: gnue/forms/setup.py
diff -c gnue/forms/setup.py:1.58 gnue/forms/setup.py:1.59
*** gnue/forms/setup.py:1.58    Fri Feb 15 09:51:45 2002
--- gnue/forms/setup.py Sun Feb 17 14:54:06 2002
***************
*** 298,304 ****
  
         data_files = [ ('doc', docfiles) ], 
  
!        packages = ["gnue.forms", "gnue.forms.GFObjects"],
         package_dir = {"gnue.forms" : "src"},
         scripts = ["client/gfclient"]
         )
--- 298,309 ----
  
         data_files = [ ('doc', docfiles) ], 
  
!        packages = ["gnue.forms",
!                    "gnue.forms.GFObjects",
!                    "gnue.forms.uidrivers",
!                    "gnue.forms.uidrivers._base",
!                    "gnue.forms.uidrivers.wx",
!                    ],
         package_dir = {"gnue.forms" : "src"},
         scripts = ["client/gfclient"]
         )
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.34 gnue/forms/src/GFClient.py:1.35
*** gnue/forms/src/GFClient.py:1.34     Thu Jan 31 00:47:24 2002
--- gnue/forms/src/GFClient.py  Sun Feb 17 14:54:06 2002
***************
*** 41,47 ****
  from gnue.forms.GFParser import loadForm
  from gnue.forms import GFKeyMapper
  from gnue.common import GDebug
! from gnue.common import GConfig, GDataObjects, GConnections
  from gnue.common.GClientApp import *
  from gnue.forms import VERSION
  
--- 41,47 ----
  from gnue.forms.GFParser import loadForm
  from gnue.forms import GFKeyMapper
  from gnue.common import GDebug
! from gnue.common import GConfig, GDataObjects, GConnections, dyn_import
  from gnue.common.GClientApp import *
  from gnue.forms import VERSION
  
***************
*** 54,62 ****
    NAME = "GNUe Forms"
    USAGE = "gfclient [options] file" 
    COMMAND_OPTIONS = [
!       [ 'user_interface', 'u', 'user_interface', 1, 'gui', 'type',  
            'The currently supported values for <type> are ' \
!           +'gui, text (unstable), and pytext' ],
        [ 'splash_screen','s','no_splash', 0, None, None,
            'Disables the splash screen']
        ]
--- 54,62 ----
    NAME = "GNUe Forms"
    USAGE = "gfclient [options] file" 
    COMMAND_OPTIONS = [
!       [ 'user_interface', 'u', 'user_interface', 1, 'wx', 'type',  
            'The currently supported values for <type> are ' \
!           +'wx(GUI), nttsi(curses)' ],
        [ 'splash_screen','s','no_splash', 0, None, None,
            'Disables the splash screen']
        ]
***************
*** 73,78 ****
--- 73,79 ----
      self._lastSerialNumber = 0
  
      self.ui_type = self.OPTIONS['user_interface']
+     
      if GConfig.get('disableSplash') == '1': 
        self.disableSplash = 1
      else:
***************
*** 100,119 ****
  
      # Initialize user interface (defaults to gui)
      #  If the DISPLAY var isn't set then switch to text
!     if self.ui_type == 'gui'  :
!       if os.environ.has_key('DISPLAY') or os.name != 'posix':
!         from gnue.forms import UIwxpython
!         self._ui=UIwxpython
!       else:
!         self.ui_type='text'
! 
!     if self.ui_type == 'pytext':
!       from gnue.forms import UIpyncurses
!       self._ui=UIpyncurses
! 
!     if self.ui_type == 'text' :
!       from gnue.forms import UIcurses
!       self._ui=UIcurses
  
      self.loadKeyMappings()
      self.runForm(formfile, self.disableSplash)
--- 101,117 ----
  
      # Initialize user interface (defaults to gui)
      #  If the DISPLAY var isn't set then switch to text
!     uiloaded = 0
!     while not uiloaded:
!       try:
!         self._ui = dyn_import("gnue.forms.uidrivers.%s" % (self.ui_type))
!         uiloaded = 1
!       except ImportError, err:
!         GDebug.printMesg(0,'Unable to load UI driver %s' % (self.ui_type))
!         if self.ui_type != 'nstti':
!           self.ui_type = 'nstti'
!         else:
!           sys.exit()
  
      self.loadKeyMappings()
      self.runForm(formfile, self.disableSplash)
Index: gnue/forms/src/GFObjects/GFDataSource.py
diff -c gnue/forms/src/GFObjects/GFDataSource.py:1.12 
gnue/forms/src/GFObjects/GFDataSource.py:1.13
*** gnue/forms/src/GFObjects/GFDataSource.py:1.12       Mon Feb 11 22:03:50 2002
--- gnue/forms/src/GFObjects/GFDataSource.py    Sun Feb 17 14:54:06 2002
***************
*** 30,39 ****
  # HISTORY:
  #
  
- from gnue.common.GObjects import *
- from gnue.common.dbdrivers.factory import factory
- 
- from gnue.common import GDebug
  from gnue.common.GDataSource import GDataSource
  
  ############################################################
--- 30,35 ----
***************
*** 44,104 ****
    def __init__(self, parent):
      GDataSource.__init__(self, parent, 'GFDataSource')
      self._toplevelParent = 'GFForm'
-     
- #    self._inits =[self.primaryInit, self.secondaryInit]
- #    self._currentResultSet = None
- #    self._resultSetListeners = []
- 
- #  def primaryInit(self):
- #    self._form = self.findParentOfType('GFForm')
- #    GDebug.printMesg(10,"Setting %s to connect mgr %s" 
%(self.name,self._form._connections))
- #    self.setConnectionManager(self._form._connections)
- #    self.initialize()
- #    self.connect()
- #    # TODO: For now, adding to dtsrc to avoid a global namespace conflict 
(jcater)
- #    self.extensions = self._dataObject.triggerExtensions
- 
-   # TODO: The linking of master to detail should occur in GDataSource
-   # TODO: as both Forms and Reports is executing basically the same code...
- ##   def secondaryInit(self):
- ##     if hasattr(self, 'master') and self.master:
- ##       self.master = string.lower(self.master)
- ##       GDebug.printMesg(3,"Linking detail '%s' to master '%s'" \
- ##                          % (self.name, self.master) )
- 
- ##       if self._form._datasourceDictionary.has_key(self.master):
- ##         self._form._datasourceDictionary[self.master] \
- ##             .getDataObject().addDetailDataObject(self.getDataObject(),
- ##                                                  self)
- ##       else:
- ##         raise StandardError, \
- ##            "Detail source '%s' references non-existant master '%s'" \
- ##                          % (self.name, self.master)
- 
- #  # Called by dbdrivers whenever this datasource's master has changed
- #  def masterResultSetChanged(self, masterResultSet, detailResultSet):
- #    self._masterResultSet = masterResultSet
- #    self.__setResultSet( detailResultSet )
- 
- #  def createResultSet(self, conditions={}):
- #    resultSet = GDataSource.createResultSet(self, conditions=conditions)
- #    self.__setResultSet( resultSet )
- #    return resultSet
- 
- #  def createEmptyResultSet(self, masterRecordSet=None):
- #    resultSet = 
GDataSource.createEmptyResultSet(self,masterRecordSet=masterRecordSet)
- #    self.__setResultSet( resultSet )
- #    return resultSet
- 
- #  def __setResultSet(self, resultSet):
- #    self._currentResultSet = resultSet
- #    # Notify all the listeners (i.e., blocks) that the result set changed
- #    for listener in self._resultSetListeners:
- #      listener(resultSet)
- #
- #
- #  def registerResultSetListener(self, listener):
- #    self._resultSetListeners.append(listener)
  
  
  
--- 40,45 ----
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.57 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.58
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.57     Sun Feb 17 13:25:32 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Sun Feb 17 14:54:06 2002
***************
*** 80,90 ****
      #
      # Someone tell me theres a better way to get to the classes in a specific 
UI driver
      #
-     global UI
-     UI = __import__(self.getModule(), globals(), locals(), ['UIAbout'])
- 
-     self.widgets = UI.WIDGETS
  
      self._loginHandler = None             # A handle to the login dialog box
                                            # implemented by the UIdriver
  
--- 80,87 ----
      #
      # Someone tell me theres a better way to get to the classes in a specific 
UI driver
      #
  
+     self.widgets = self._WIDGETS
      self._loginHandler = None             # A handle to the login dialog box
                                            # implemented by the UIdriver
  
***************
*** 257,263 ****
      author = event.data[3]
      description = event.data[4]
  
!     about = UI.UIAbout(self.mainWindow, programVersion, formName, 
formVersion, author, description)
  
      about.showModal()
      about.destroy()
--- 254,260 ----
      author = event.data[3]
      description = event.data[4]
  
!     about = self._aboutDialog(self.mainWindow, programVersion, formName, 
formVersion, author, description)
  
      about.showModal()
      about.destroy()
***************
*** 268,274 ****
    def msgBox(self,event):
      message = event.data.message
      caption = event.data.caption
!     dialog = UI.UIMessageBox(self.mainWindow, message, caption)
      dialog.ShowModal()
      dialog.Destroy()
  
--- 265,271 ----
    def msgBox(self,event):
      message = event.data.message
      caption = event.data.caption
!     dialog = self._messageDialog(self.mainWindow, message, caption)
      dialog.ShowModal()
      dialog.Destroy()
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.143 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.144
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.143       Sun Feb 17 01:43:19 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Sun Feb 17 14:54:06 2002
***************
*** 33,39 ****
  
  from GFForm import *
  from GFEvent import *
! from UIbase import *
  
  import GFKeyMapper
  
--- 33,39 ----
  
  from GFForm import *
  from GFEvent import *
! from gnue.forms.uidrivers._base.UIdriver import *
  
  import GFKeyMapper
  
***************
*** 96,101 ****
--- 96,111 ----
  #
  class GFUserInterface(GFUserInterfaceBase):
    def __init__(self, eventController, disableSplash = None):
+     self._aboutDialog = UIAbout
+     self._messageDialog = UIMessageBox
+     self._WIDGETS = {'GFLabel'     : UILabel,
+            'GFBox'       : UIBox,
+            'GFPage'      : UIPage,
+            'GFForm'      : UIForm,
+            'GFEntry'     : UIEntry,
+            'GFButton'    : UIButton,
+            'GFScrollBar' : UIScrollBar}
+ 
      global _EVENTPROCESSOR
      self._wxapp = getWxApp()
      self._disableSplash = disableSplash
***************
*** 112,123 ****
    #
    def mainLoop(self):
      self._wxapp.MainLoop() # simply call the wxApp's MainLoop method
- 
-   #
-   # getModule
-   #
-   def getModule(self):
-     return GFUserInterface.__module__
  
    #
    # init
--- 122,127 ----