gnue-designer/src Designer.py base/startup/Star...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-designer
Branch:         
Changes by:     Jason Cater <address@hidden>    03/09/05 15:46:53

Modified files:
        src            : Designer.py 
        src/base/startup: Startup.py 

Log message:
        stop designer from hanging on exit and restored menubar functionality

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/Designer.py.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-designer/src/base/startup/Startup.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue-designer/src/Designer.py
diff -c gnue-designer/src/Designer.py:1.73 gnue-designer/src/Designer.py:1.74
*** gnue-designer/src/Designer.py:1.73  Fri Aug 22 14:39:18 2003
--- gnue-designer/src/Designer.py       Fri Sep  5 15:46:52 2003
***************
*** 39,44 ****
--- 39,47 ----
  
  import_indent = 0
  
+ import __builtin__
+ __builtin__.__dict__['StartupStatus'] = lambda string:string
+ 
  class MyModuleLoader(ihooks.ModuleLoader):
  
    def load_module(self, name, stuff):
***************
*** 89,94 ****
--- 92,109 ----
    USAGE = GClientApp.USAGE + " [file] [file] ..."
  
    def __init__(self):
+     GClientApp.__init__(self, application="forms",defaults=ConfigOptions)
+     self.mru = MRUManager.MRUManager(self)
+     self._instances = []
+ 
+     
self.configurationManager.loadApplicationConfig(section="designer",defaults=DesignerConfigOptions)
+     self.configurationManager.registerAlias('gConfigNav', 'navigator')
+     self.configurationManager.registerAlias('gConfigForms', 'forms')
+     self.configurationManager.registerAlias('gConfigReports', 'reports')
+ 
+     self.getConnectionManager().setLoginHandler(UILoginHandler())
+     self.loadModuleInformation()
+ 
      wxApp.__init__(self,0)
  
  
***************
*** 103,121 ****
      self.startup = Startup()
      StartupStatus(_('Initializing Client Library'))
  
-     self.mru = MRUManager.MRUManager(self)
-     self._instances = []
- 
- 
-     GClientApp.__init__(self, application="forms",defaults=ConfigOptions)
-     
self.configurationManager.loadApplicationConfig(section="designer",defaults=DesignerConfigOptions)
-     self.configurationManager.registerAlias('gConfigNav', 'navigator')
-     self.configurationManager.registerAlias('gConfigForms', 'forms')
-     self.configurationManager.registerAlias('gConfigReports', 'reports')
- 
-     self.getConnectionManager().setLoginHandler(UILoginHandler())
-     self.loadModuleInformation()
- 
      if len(self.ARGUMENTS):
        for arg in self.ARGUMENTS:
          self.SetTopWindow(self.load(arg))
--- 118,123 ----
***************
*** 133,139 ****
        # TODO: or, restore the session to the way it was (same files, etc)
  
        self.SetTopWindow(self.newInstance('forms'))
!       
      self.startup.pauseAndClose()
      return 1
  
--- 135,141 ----
        # TODO: or, restore the session to the way it was (same files, etc)
  
        self.SetTopWindow(self.newInstance('forms'))
! 
      self.startup.pauseAndClose()
      return 1
  
Index: gnue-designer/src/base/startup/Startup.py
diff -c gnue-designer/src/base/startup/Startup.py:1.2 
gnue-designer/src/base/startup/Startup.py:1.3
*** gnue-designer/src/base/startup/Startup.py:1.2       Fri Aug 22 21:50:16 2003
--- gnue-designer/src/base/startup/Startup.py   Fri Sep  5 15:46:53 2003
***************
*** 25,31 ****
    def pauseAndClose(self):
      self.Raise()
      StartupStatus('Finalizing Settings')
!     self.timer = MyTimer(self.setSettingsText).Start(100)
      self.timer = MyTimer(self.destroy).Start(1000)
  
    def setSettingsText(self):
--- 25,31 ----
    def pauseAndClose(self):
      self.Raise()
      StartupStatus('Finalizing Settings')
!     MyTimer(self.setSettingsText).Start(100)
      self.timer = MyTimer(self.destroy).Start(1000)
  
    def setSettingsText(self):