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

[reinhard]

Author: reinhard
Date: 2007-01-12 11:57:07 -0600 (Fri, 12 Jan 2007)
New Revision: 9294

Modified:
   trunk/gnue-navigator/src/UIwx26.py
Log:
Cleanup.


Modified: trunk/gnue-navigator/src/UIwx26.py
===================================================================
--- trunk/gnue-navigator/src/UIwx26.py  2007-01-12 17:47:08 UTC (rev 9293)
+++ trunk/gnue-navigator/src/UIwx26.py  2007-01-12 17:57:07 UTC (rev 9294)
@@ -31,19 +31,13 @@
     import wxversion
     wxversion.ensureMinimal('2.6')
 
-from gnue.common.datasources import Exceptions
-from gnue.common.apps import GConfig
-
-from gnue.forms.GFInstance import GFInstance
+from gnue import paths
 from gnue.forms.uidrivers import wx26 as ui
-
 from gnue.navigator import VERSION
 
 # Must import wx *after* importing wx26 uidriver from forms.
 import wx.html
 
-images_dir = GConfig.getInstalledBase('forms_images','common_images') + '/'
-
 class Instance:
   def __init__(self, processes):
     self.processes = processes
@@ -60,7 +54,7 @@
         </center>
       </body>
     </html>
-    """ % (images_dir+"/ship2.png")
+    """ % os.path.join(paths.data, "share", "gnue", "images", "ship2.png")
 
   def run(self, connections, instance):
     #
@@ -186,12 +180,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
 
     if os.path.basename(step.location) == step.location:
       try:
@@ -202,12 +190,9 @@
     else:
       formfile = step.location
 
-    self._runForm(formfile, step._params)
-
-
-  def _runForm(self, formfile, parameters):
       self.helpText.Hide()
-      self.__current_form = self.__instance.run_from_file(formfile, parameters)
+      self.__current_form = self.__instance.run_from_file(formfile,
+              step._params)
 
 
 ID_EXIT = wx.NewId()
@@ -222,7 +207,7 @@
     self._menu = wx.Menu()
     self._help = wx.Menu()
 
-    self._menu.Append(ID_EXIT, "E&xit", "Exit GNUe Designer")
+    self._menu.Append(ID_EXIT, "E&xit", "Exit GNUe Navigator")
     self._help.Append(ID_ABOUT,'&About','About')
 
     self.Append(self._menu,'&Menu')