[gnue] r10291 - in trunk/gnue-designer: . scripts src/app src/base src/forms src/forms/LayoutEditor src/ui/wx

[reinhard]

Author: reinhard
Date: 2011-02-17 01:47:22 -0600 (Thu, 17 Feb 2011)
New Revision: 10291

Modified:
   trunk/gnue-designer/
   trunk/gnue-designer/scripts/gnue-designer
   trunk/gnue-designer/src/app/designer.py
   trunk/gnue-designer/src/base/document.py
   trunk/gnue-designer/src/forms/Debugger.py
   trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
   trunk/gnue-designer/src/ui/wx/Base.py
Log:
Patch designer to open initial window without fatal error.


Property changes on: trunk/gnue-designer
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-04-26 10:37:44.627000093 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: designer

   + timestamp: 2011-01-31 12:10:23.516999960 -0800
committer: Whizman Software Solutions <www.whizman.com>
properties: 
        branch-nick: designer

Name: bzr:file-ids
   - po/el.po   address@hidden:trunk%2Fgnue-designer:po%2Fel.po

   + scripts/gnue-designer      
address@hidden:trunk%2Fgnue-designer:scripts%2Fgnue-designer
src/app/designer.py     
address@hidden:trunk%2Fgnue-designer:src%2Fapp%2Fdesigner.py
src/base/document.py    
address@hidden:trunk%2Fgnue-designer:src%2Fbase%2Fdocument.py
src/forms/Debugger.py   
address@hidden:trunk%2Fgnue-designer:src%2Fforms%2FDebugger.py
src/forms/LayoutEditor/LayoutEditor.py  
address@hidden:trunk%2Fgnue-designer:src%2Fforms%2FLayoutEditor%2FLayoutEditor.py
src/ui/wx/Base.py       
address@hidden:trunk%2Fgnue-designer:src%2Fui%2Fwx%2FBase.py

Name: bzr:revision-id:v4
   - 937 address@hidden

   + 937 address@hidden
938 whizman_software_solutions_www.whizman.com-20110131201023-bmx4kgkf4erlim85

Name: bzr:text-parents
   - po/el.po   
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9877

   + scripts/gnue-designer      
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/app/designer.py     
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/base/document.py    
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/forms/Debugger.py   
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/forms/LayoutEditor/LayoutEditor.py  
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955
src/ui/wx/Base.py       
svn-v3-single1-dHJ1bmsvZ251ZS1kZXNpZ25lcg..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-designer:9955


Modified: trunk/gnue-designer/scripts/gnue-designer
===================================================================
--- trunk/gnue-designer/scripts/gnue-designer   2011-02-15 18:14:20 UTC (rev 
10290)
+++ trunk/gnue-designer/scripts/gnue-designer   2011-02-17 07:47:22 UTC (rev 
10291)
@@ -2,7 +2,7 @@
 #
 # GNU Enterprise Designer - Main Script
 #
-# Copyright 2001-2003 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -34,7 +34,7 @@
 except: 
     print "ERROR: You must first install GNUe Common"
     sys.exit(1)
-    
+
 from gnue.designer.app.designer import Designer
 
 if __name__ == '__main__':

Modified: trunk/gnue-designer/src/app/designer.py
===================================================================
--- trunk/gnue-designer/src/app/designer.py     2011-02-15 18:14:20 UTC (rev 
10290)
+++ trunk/gnue-designer/src/app/designer.py     2011-02-17 07:47:22 UTC (rev 
10291)
@@ -1,6 +1,6 @@
 # GNU Enterprise Designer
 #
-# Copyright 2001-2009 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -31,11 +31,15 @@
 import time
 from StringIO import StringIO
 
-# Force the forms uidriver to call wxversion.ensureMinimal()
-from gnue.forms.uidrivers.wx26 import UIdriver as UIwxpython
+# Designer requires wx-2.8 for wx.aui
+import wxversion
+wxversion.ensureMinimal('2.8')
+# Force the forms uidriver to call wxversion.ensureMinimal() on time
+from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
 
 from gnue.common.apps import RuntimeSettings
 from gnue.common.apps.GClientApp import GClientApp
+from gnue.common.base import errors, log
 from gnue.common.utils.FileUtils import dyn_import
 
 # This is needed to force wxselect to be called # TODO: Fix
@@ -45,19 +49,19 @@
 from gnue.designer.base import TemplateParser, TemplateChooser, MRUManager
 from gnue.designer.base.Config import ConfigOptions
 
-try:
-    from xml.sax import saxlib
-except ImportError:
-    print """
-     This GNUe tool requires PyXML package to be installed.
-     Typically this is the case, however some GNU/Linux distro's
-     like Debian distribute this in another seperate package
+# try:
+#     from xml.sax import saxlib
+# except ImportError:
+#     print """
+#      This GNUe tool requires PyXML package to be installed.
+#      Typically this is the case, however some GNU/Linux distro's
+#      like Debian distribute this in another seperate package
 
-     To install this package...
-       On Debian: apt-get install python-xml
+#      To install this package...
+#        On Debian: apt-get install python-xml
 
-  """
-    sys.exit()
+#   """
+#     sys.exit()
 
 
 class Designer(GClientApp):
@@ -121,7 +125,7 @@
         print "Init'ing"
         # Init the splashscreen
 #    self.ui.createStartupSplash()
-        gStartupStatus(u_('Initializing Client Library'))
+        assert log.debug(u_('Initializing Client Library'))
 
         # Load the specified file, a requested new
         # instance, or the default empty instance
@@ -158,7 +162,7 @@
         extracts from them a list of file types/extensions
         that they support
         """
-        gStartupStatus(u_('Loading available tool modules'))
+        assert log.debug(u_('Loading available tool modules'))
 
         # Load the primary editor modules. Their __init__.py
         # should register themselves
@@ -233,7 +237,7 @@
         @return: An instance of the appropriate editor module or None if
                  an error is encountered
         """
-        gStartupStatus(u_('Loading document'))
+        assert log.debug(u_('Loading document'))
 
         extension = string.lower(os.path.splitext(file)[1][1:])
 
@@ -395,7 +399,7 @@
         self.ui.dialogOk(
             self.NAME + " " +
             u_("Version  ") + self.VERSION + "\n\n" +
-            u_("Copyright 2001-2009 Free Software Foundation\n\n") +
+            u_("Copyright 2001-2011 Free Software Foundation\n\n") +
             u_("Environment:\n  %s\n\n") % string.join(imports,'\n  ') +
             u_("For help, email address@hidden"),
             u_("About ") + self.NAME)

Modified: trunk/gnue-designer/src/base/document.py
===================================================================
--- trunk/gnue-designer/src/base/document.py    2011-02-15 18:14:20 UTC (rev 
10290)
+++ trunk/gnue-designer/src/base/document.py    2011-02-17 07:47:22 UTC (rev 
10291)
@@ -1,6 +1,6 @@
 # GNU Enterprise Designer - Basic Framework
 #
-# Copyright 2001-2009 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -42,6 +42,7 @@
 # -----------------------------------------------------------------
 from gnue.common.apps import GDebug
 from gnue.common.apps import RuntimeSettings
+from gnue.common.base import errors, log
 from gnue.common.utils.FileUtils import dyn_import
 from gnue.common.events import EventController, Event
 
@@ -444,7 +445,7 @@
         self.menubar = MenuBar(self)
 
 
-        gStartupStatus(u_('Creating User Interface'))
+        assert log.debug(u_('Creating User Interface'))
 
         # Set up the menu system
         #   ... our common menu
@@ -489,7 +490,7 @@
                            object=self.rootObject)
 
         # Inventory the objects
-        gStartupStatus(u_('Inventorying Document Objects'))
+        assert log.debug(u_('Inventorying Document Objects'))
         self.rootObject.walk(self.__inventory)
 
         self.finalize()

Modified: trunk/gnue-designer/src/forms/Debugger.py
===================================================================
--- trunk/gnue-designer/src/forms/Debugger.py   2011-02-15 18:14:20 UTC (rev 
10290)
+++ trunk/gnue-designer/src/forms/Debugger.py   2011-02-17 07:47:22 UTC (rev 
10291)
@@ -1,6 +1,6 @@
 # GNU Enterprise Designer - Forms Support
 #
-# Copyright 2001-2009 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -30,7 +30,7 @@
 from gnue.common.apps.GClientApp import GClientApp
 from gnue.forms import GFForm, GFInstance, GFParser
 from StringIO import StringIO
-from gnue.forms.uidrivers.wx26 import UIdriver as UIwxpython
+from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
 
 #####################################################
 ## TODO

Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2011-02-15 
18:14:20 UTC (rev 10290)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2011-02-17 
07:47:22 UTC (rev 10291)
@@ -1,6 +1,6 @@
 # GNU Enterprise Designer - Forms Support
 #
-# Copyright 2001-2009 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -33,7 +33,7 @@
 from gnue.common.apps import GDebug
 from gnue.common.events import Event
 from gnue.forms import GFObjects
-from gnue.forms.uidrivers.wx26 import UIdriver as UIwxpython
+from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
 from gnue.designer.base.PopupMenu import PageMenu
 from gnue.designer.base.TemplateParser import TemplateParser
 from gnue.designer.base.EditorBase import EditorBase

Modified: trunk/gnue-designer/src/ui/wx/Base.py
===================================================================
--- trunk/gnue-designer/src/ui/wx/Base.py       2011-02-15 18:14:20 UTC (rev 
10290)
+++ trunk/gnue-designer/src/ui/wx/Base.py       2011-02-17 07:47:22 UTC (rev 
10291)
@@ -1,6 +1,6 @@
 # GNU Enterprise Designer - wxWidgets Support
 #
-# Copyright 2001-2009 Free Software Foundation
+# Copyright 2001-2011 Free Software Foundation
 #
 # This file is part of GNU Enterprise.
 #
@@ -66,7 +66,7 @@
 
         # Reuse the login handler from Form's wx driver
         # This has to happen after setWxApp, otherwise bad things happen
-        from gnue.forms.uidrivers.wx26 import UILoginHandler
+        from gnue.forms.uidrivers.wx import UILoginHandler
         self.app.getConnectionManager().setLoginHandler(UILoginHandler())
 
         # Call wx's MainLoop