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

[reinhard]

Author: reinhard
Date: 2007-01-12 13:06:52 -0600 (Fri, 12 Jan 2007)
New Revision: 9298

Modified:
   trunk/gnue-navigator/src/GNClient.py
   trunk/gnue-navigator/src/UIgtk2.py
   trunk/gnue-navigator/src/UIqt3.py
   trunk/gnue-navigator/src/UItext.py
   trunk/gnue-navigator/src/UIweb.py
   trunk/gnue-navigator/src/UIwin32.py
   trunk/gnue-navigator/src/UIwx.py
   trunk/gnue-navigator/src/UIwx26.py
Log:
More cleanup


Modified: trunk/gnue-navigator/src/GNClient.py
===================================================================
--- trunk/gnue-navigator/src/GNClient.py        2007-01-12 18:55:25 UTC (rev 
9297)
+++ trunk/gnue-navigator/src/GNClient.py        2007-01-12 19:06:52 UTC (rev 
9298)
@@ -197,7 +197,7 @@
       sys.exit ()
 
 
-    self._ui.Instance(nav).run(self.connections, instance)
+    self._ui.Instance(nav).run(instance)
 
 
 # =============================================================================

Modified: trunk/gnue-navigator/src/UIgtk2.py
===================================================================
--- trunk/gnue-navigator/src/UIgtk2.py  2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIgtk2.py  2007-01-12 19:06:52 UTC (rev 9298)
@@ -75,12 +75,11 @@
   # Build the UI and start the navigator client
   # ---------------------------------------------------------------------------
 
-  def run (self, connections, instance):
+  def run (self, instance):
     """
     This function creates the user interface and starts the main loop
     """
 
-    self.connections = connections
     self.__instance = instance
 
     self.__buildInterface ()
@@ -634,8 +633,7 @@
     @param parameters: dictionary with user parameters for the form
     """
 
-    instance = GFInstance (self, self.connections, ui, True)
-    instance.run_from_file(formfile, parameters)
+    self.__instance.run_from_file(formfile, parameters)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-navigator/src/UIqt3.py
===================================================================
--- trunk/gnue-navigator/src/UIqt3.py   2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIqt3.py   2007-01-12 19:06:52 UTC (rev 9298)
@@ -70,12 +70,11 @@
   # Build the UI and start the navigator client
   # ---------------------------------------------------------------------------
 
-  def run (self, connections, instance):
+  def run (self, instance):
     """
     This function creates the user interface and starts the main loop
     """
 
-    self.connections = connections
     self.__instance = instance
 
     self.__buildInterface ()
@@ -427,8 +426,7 @@
     @param parameters: dictionary with user parameters for the form
     """
 
-    instance = GFInstance (self, self.connections, ui, True)
-    instance.run_from_file(formfile, parameters)
+    self.__instance.run_from_file(formfile, parameters)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-navigator/src/UItext.py
===================================================================
--- trunk/gnue-navigator/src/UItext.py  2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UItext.py  2007-01-12 19:06:52 UTC (rev 9298)
@@ -36,18 +36,10 @@
   def __init__(self, processes):
     self.processes = processes
 
-  def run(self, connections, instance):
-    print "Login Handler set"
+  def run(self, instance):
     
-    connections.setLoginHandler (BasicLoginHandler ())
     self.buildMenu(self.processes)
     
-    self.connections = connections
-    #
-    # Assign the proper login handler based upon the user interface choice
-    #
-    self.connections.setLoginHandler(ui.UILoginHandler())
-
   def buildMenu(self, process):
 
     while 1:

Modified: trunk/gnue-navigator/src/UIweb.py
===================================================================
--- trunk/gnue-navigator/src/UIweb.py   2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIweb.py   2007-01-12 19:06:52 UTC (rev 9298)
@@ -38,12 +38,7 @@
     self.processes = processes
     wxApp.__init__(self)
 
-  def run(self, connections, instance):
-    self.connections = connections
-    #
-    # Assign the proper login handler based upon the user interface choice
-    #
-    self.connections.setLoginHandler(ui.UILoginHandler())
+  def run(self, instance):
 
     self.MainLoop()
 

Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIwin32.py 2007-01-12 19:06:52 UTC (rev 9298)
@@ -106,12 +106,10 @@
     self.classAtom = win32gui.RegisterClass(wc)
     self.hTree = 0
 
-  def run(self, connections, instance):
+  def run(self, instance):
     #
     # Assign the proper login handler based upon the user interface choice
     #
-    self.connections = connections
-    self.connections.setLoginHandler(ui.UILoginHandler())
     self.__instance = instance
 
     app = get_win32_app()
@@ -317,9 +315,7 @@
 
   def _runForm(self, formfile, parameters):
 
-    instance = GFInstance(self,connections=self.connections,
-                          ui=ui,disableSplash=1)
-    instance.run_from_file(formfile, parameters)
+    self.__instance.run_from_file(formfile, parameters)
 
 
   def handleStartupError(self, errortext):

Modified: trunk/gnue-navigator/src/UIwx.py
===================================================================
--- trunk/gnue-navigator/src/UIwx.py    2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIwx.py    2007-01-12 19:06:52 UTC (rev 9298)
@@ -65,12 +65,7 @@
     </html>
     """ % (images_dir+"/ship2.png")
 
-  def run(self, connections, instance):
-    #
-    # Assign the proper login handler based upon the user interface choice
-    #
-    self.connections = connections
-    self.connections.setLoginHandler(ui.UILoginHandler())
+  def run(self, instance):
 
     self.__instance = instance
 
@@ -218,12 +213,6 @@
   def runForm(self, step, parameters = {}):
     # parameters are now part of the step in _params
     
-    # This is the code executing in the new thread. Simulation of
-    # a long process (well, 10s here) as a simple loop - you will
-    # need to structure your processing so that you periodically
-    # peek at the abort variable
-
-    #print step._params
     if os.path.basename(step.location) == step.location:
       try:
         formdir = gConfigNav('FormDir')
@@ -238,33 +227,9 @@
 
   def _runForm(self, formfile, parameters):
 
-      #
-      # Create the instance
-      #
-      
-      #print "disable splash: ", gConfigNav('disableSplash'), 
type(gConfigNav('disableSplash'))      
-      #print "embed forms: ", gConfigNav('embedForms'), 
type(gConfigNav('embedForms'))
-      #
-      # TODO: The next if looks funny because the code above results in
-      #
-      #  disable splash:  1 <type 'int'>
-      #  embed forms:  0 <type 'str'>
-      #
-      # And I don't have time to dig ATM
-      #
-      if gConfigNav('embedForms') == "%s" % True: 
-        instance = GFInstance(self,connections=self.connections,
-                              ui=ui,disableSplash=1,
-                              parentContainer=self.panel2)
-      else:
-        instance = GFInstance(id(self),
-           connections=self.connections,
-           ui=ui, disableSplash=1)
+      self.__instance.run_from_file(formfile, parameters)
 
-      instance.run_from_file(formfile, parameters)
-      instance.activate()
 
-
 ID_EXIT = wxNewId()
 ID_FAV_ORG = wxNewId()
 ID_FAV_ADD = wxNewId()

Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 18:55:25 UTC (rev 9297)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 19:06:52 UTC (rev 9298)
@@ -55,13 +55,10 @@
     </html>
     """ % os.path.join(paths.data, "share", "gnue", "images", "ship2.png")
 
-  def run(self, connections, instance):
+  def run(self, instance):
     #
     # Assign the proper login handler based upon the user interface choice
     #
-    self.connections = connections
-    self.connections.setLoginHandler(ui.UILoginHandler())
-
     self.__instance = instance
     self.__instance.keepalive(True)