[gnue] r9282 - trunk/gnue-navigator/src

[reinhard]

Author: reinhard
Date: 2007-01-12 06:31:12 -0600 (Fri, 12 Jan 2007)
New Revision: 9282

Modified:
   trunk/gnue-navigator/src/GNClient.py
   trunk/gnue-navigator/src/GNConfig.py
   trunk/gnue-navigator/src/UIgtk2.py
   trunk/gnue-navigator/src/UIqt3.py
   trunk/gnue-navigator/src/UIwin32.py
   trunk/gnue-navigator/src/UIwx.py
   trunk/gnue-navigator/src/UIwx26.py
Log:
Use new functions of GFInstance.


Modified: trunk/gnue-navigator/src/GNClient.py
===================================================================
--- trunk/gnue-navigator/src/GNClient.py        2007-01-12 12:19:05 UTC (rev 
9281)
+++ trunk/gnue-navigator/src/GNClient.py        2007-01-12 12:31:12 UTC (rev 
9282)
@@ -147,7 +147,7 @@
     # if we have a forms-uidriver available take over it's exception handling
     # and set the login handler for the connection manager.
     if hasattr (self._ui, 'ui'):
-      instance = GFInstance (self, self.connections, self._ui.ui, False)
+      instance = GFInstance (self, self.connections, self._ui.ui, True)
       self._showException = instance.show_exception
 
       loginHandler = self._ui.ui.UILoginHandler ()
@@ -196,11 +196,6 @@
       sys.exit ()
 
 
-    if gConfigNav ('disableSplash'):
-      self.disableSplash = True
-    else:
-      self.disableSplash = self.OPTIONS ['splash_screen']
-
     self._ui.Instance (nav).run (self.connections)
 
 

Modified: trunk/gnue-navigator/src/GNConfig.py
===================================================================
--- trunk/gnue-navigator/src/GNConfig.py        2007-01-12 12:19:05 UTC (rev 
9281)
+++ trunk/gnue-navigator/src/GNConfig.py        2007-01-12 12:31:12 UTC (rev 
9282)
@@ -62,13 +62,6 @@
     'Description': 'Directory to search for .gpd files.',
     'Typecast'   : GTypecast.text,
     'Default'    : 'navigator' },
-
-  { 'Name'       : 'disableSplash',
-    'Type'       : 'Setting',
-    'Comment'    : "Do not display the splashscreen.",
-    'Description': "Do not display the splashscreen.",
-    'Typecast'   : GTypecast.boolean,
-    'Default'    : True },
   
   { 'Name'       : 'embedForms',
     'Type'       : 'Setting',

Modified: trunk/gnue-navigator/src/UIgtk2.py
===================================================================
--- trunk/gnue-navigator/src/UIgtk2.py  2007-01-12 12:19:05 UTC (rev 9281)
+++ trunk/gnue-navigator/src/UIgtk2.py  2007-01-12 12:31:12 UTC (rev 9282)
@@ -634,12 +634,10 @@
     @param parameters: dictionary with user parameters for the form
     """
 
-    instance = GFInstance (self, self.connections, ui, True, parameters)
+    instance = GFInstance (self, self.connections, ui, True)
     self._formInstances [id (self)] = instance
          
-    instance.addFormFromFile (formfile)
-    #instance.addDialogs ()
-    instance.activate ()
+    instance.run_from_file(formfile, parameters)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-navigator/src/UIqt3.py
===================================================================
--- trunk/gnue-navigator/src/UIqt3.py   2007-01-12 12:19:05 UTC (rev 9281)
+++ trunk/gnue-navigator/src/UIqt3.py   2007-01-12 12:31:12 UTC (rev 9282)
@@ -427,12 +427,10 @@
     @param parameters: dictionary with user parameters for the form
     """
 
-    instance = GFInstance (self, self.connections, ui, True, parameters)
+    instance = GFInstance (self, self.connections, ui, True)
     self._formInstances [id (self)] = instance
          
-    instance.addFormFromFile (formfile)
-    #instance.addDialogs ()
-    instance.activate ()
+    instance.run_from_file(formfile, parameters)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2007-01-12 12:19:05 UTC (rev 9281)
+++ trunk/gnue-navigator/src/UIwin32.py 2007-01-12 12:31:12 UTC (rev 9282)
@@ -317,38 +317,13 @@
 
   def _runForm(self, formfile, parameters):
 
-    try:
-      #
-      # Create the instance
-      #
-      #instance = GFInstance(id(self),
-      #    connections=self.connections,
-      #    ui=ui, disableSplash=1)
-      instance = GFInstance(self,connections=self.connections,
-                            ui=ui,disableSplash=1, parameters=parameters)
-      self._formInstances[id(self)] = instance
-         
-      #
-      # Build the form tree
-      #
-      instance.addFormFromFile(formfile)
+    instance = GFInstance(self,connections=self.connections,
+                          ui=ui,disableSplash=1)
+    self._formInstances[id(self)] = instance
 
-      #
-      # Start the instance
-      #
-      #instance.addDialogs()
-          
-      #instance.buildForm(form)
-      instance.activate()
+    instance.run_from_file(formfile, parameters)
 
-    except IOError, mesg:
-      self.handleError(_("Unable to open file\n\n     %s")%mesg)
 
-    except Exceptions.ConnectionError, mesg:
-      self.handleError(\
-         _("Error while communicating with datasource.\n\n       %s") %mesg)
-
-
   def handleStartupError(self, errortext):
     print
     print '-' * 60

Modified: trunk/gnue-navigator/src/UIwx.py
===================================================================
--- trunk/gnue-navigator/src/UIwx.py    2007-01-12 12:19:05 UTC (rev 9281)
+++ trunk/gnue-navigator/src/UIwx.py    2007-01-12 12:31:12 UTC (rev 9282)
@@ -260,7 +260,7 @@
       #
       if gConfigNav('embedForms') == "%s" % True: 
         instance = GFInstance(self,connections=self.connections,
-                              ui=ui,disableSplash=1, parameters=parameters,
+                              ui=ui,disableSplash=1,
                               parentContainer=self.panel2)
       else:
         instance = GFInstance(id(self),
@@ -269,22 +269,7 @@
 
       self._formInstances[id(self)] = instance
 
-      #
-      # Build the form tree
-      #
-      instance.addFormFromFile(formfile)
-
-      # Temp stuff to test embedding
-      self.panel2.SetTitle = self.setTitle
-      self.panel2.SetMenuBar = self.setMenuBar
-      self.panel2.SetToolBar = self.setToolBar
-
-      #
-      # Start the instance
-      #
-      #instance.addDialogs()
-
-      #instance.buildForm(form)
+      instance.run_from_file(formfile, parameters)
       instance.activate()
 
     except IOError, mesg:

Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 12:19:05 UTC (rev 9281)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 12:31:12 UTC (rev 9282)
@@ -218,7 +218,7 @@
       # if gConfigNav('embedForms') == "%s" % True: 
       if False:
         instance = GFInstance(self,connections=self.connections,
-                              ui=ui,disableSplash=1, parameters=parameters,
+                              ui=ui,disableSplash=1,
                               parentContainer=self.panel2)
       else:
         instance = GFInstance(id(self),
@@ -226,25 +226,8 @@
            ui=ui, disableSplash=1)
 
       self._formInstances[id(self)] = instance
+      instance.run_from_file(formfile, parameters)
 
-      #
-      # Build the form tree
-      #
-      instance.addFormFromFile(formfile)
-
-      # Temp stuff to test embedding
-      self.panel2.SetTitle = self.setTitle
-      self.panel2.SetMenuBar = self.setMenuBar
-      self.panel2.SetToolBar = self.setToolBar
-
-      #
-      # Start the instance
-      #
-      #instance.addDialogs()
-
-      #instance.buildForm(form)
-      instance.activate()
-
     except IOError, mesg:
       self.handleError(_("Unable to open file\n\n     %s")%mesg)