gnue/navigator/src UIwxpython.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/04/07 13:50:28

Modified files:
        navigator/src  : UIwxpython.py 

Log message:
        get navigator working again

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.27 
gnue/navigator/src/UIwxpython.py:1.28
*** gnue/navigator/src/UIwxpython.py:1.27       Mon Feb 17 02:32:54 2003
--- gnue/navigator/src/UIwxpython.py    Mon Apr  7 13:50:28 2003
***************
*** 47,53 ****
    print 'GNUe Forms is not installed on your system'
  
  images_dir = GConfig.getInstalledBase('forms_images','common_images') + '/'
! print images_dir
  class Instance:
    def __init__(self, processes):
      self.processes = processes
--- 47,53 ----
    print 'GNUe Forms is not installed on your system'
  
  images_dir = GConfig.getInstalledBase('forms_images','common_images') + '/'
! 
  class Instance:
    def __init__(self, processes):
      self.processes = processes
***************
*** 232,266 ****
          formdir = gConfigNav('FormDir')
        except KeyError:
          formdir = ""
!       formfile = os.environ['INSTALL_PREFIX']+'/'+formdir+"/"+step.location
      else:
        formfile = step.location
  
!     self._runForm(formfile)
  
  
!   def _runForm(self, formfile):
  
      try:
        #
        # Create the instance
        #
!       instance = GFInstance(self, id(self),
!           connections=self.connections,
!           ui=ui, disableSplash=1)
        self._formInstances[id(self)] = instance
! 
        #
        # Build the form tree
        #
!       fileHandle = openResource(formfile)
!       form = GFParser.loadFile (fileHandle, instance)
!       fileHandle.close()
  
        #
        # Start the instance
        #
!       instance.setForm(form)
        instance.activate()
  
      except GConnections.Error, mesg:
--- 232,268 ----
          formdir = gConfigNav('FormDir')
        except KeyError:
          formdir = ""
!       formfile = formdir+"/"+step.location
      else:
        formfile = step.location
  
!     self._runForm(formfile, parameters)
  
  
!   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)
  
        #
        # Start the instance
        #
!       instance.addDialogs()
!           
!       #instance.buildForm(form)
        instance.activate()
  
      except GConnections.Error, mesg: