gnue/forms/src GFClient.py GFInstance.py uidriv...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/04/09 13:00:38

Modified files:
        forms/src      : GFClient.py GFInstance.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UILoginHandler.py 

Log message:
        A dirty hack for McMillan packaging to
        fix dialogs in forms if no login required

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.68&tr2=1.69&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UILoginHandler.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.68 gnue/forms/src/GFClient.py:1.69
*** gnue/forms/src/GFClient.py:1.68     Mon Mar 31 21:38:11 2003
--- gnue/forms/src/GFClient.py  Wed Apr  9 13:00:37 2003
***************
*** 138,143 ****
--- 138,147 ----
      #
      self.getConnectionManager().setLoginHandler(self._ui.UILoginHandler())
  
+     # Hack for McMillan packaging on win32
+     if hasattr(sys, 'frozen'):
+       self._ui.UILoginHandler().getDummyLogin()
+     
      #
      # Create the Instance that will control the loaded form(s)
      #
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.107 gnue/forms/src/GFInstance.py:1.108
*** gnue/forms/src/GFInstance.py:1.107  Sun Apr  6 18:17:57 2003
--- gnue/forms/src/GFInstance.py        Wed Apr  9 13:00:37 2003
***************
*** 170,176 ****
  ############################
      if hasattr(sys, 'frozen'):
        from gnue.forms.dialogs import DialogFiles
-       print DialogFiles.DialogFiles
        for dialog in DialogFiles.DialogFiles:
          try:
            dialog = dyn_import('%s' % dialog)
--- 170,175 ----
***************
*** 179,185 ****
          try:
            self.addFormFromBuffer(dialog.buildForm())
          except StandardError, mesg: 
!           print "WARNING: Cannot build %s form \n%s" % (dialogName,mesg)
      else:
  ############
  # end of workaround
--- 178,184 ----
          try:
            self.addFormFromBuffer(dialog.buildForm())
          except StandardError, mesg: 
!           print "WARNING: Cannot build %s form \n%s" % (dialog,mesg)
      else:
  ############
  # end of workaround
***************
*** 314,320 ****
      # Bring up the main form
      #
      self.activateForm('__main__')
- 
      self._uiinstance.mainLoop()
  
    #
--- 313,318 ----
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.99 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.100
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.99     Sun Apr  6 18:18:18 2003
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Wed Apr  9 13:00:38 2003
***************
*** 124,130 ****
            widget = dyn_import('%s' % widget)
          except ImportError:
            print 'ImportError',widget
-           pass
          self._supportedWidgets[widget.configuration['provides']]=widget
      else:
  ############
--- 124,129 ----
Index: gnue/forms/src/uidrivers/wx/UILoginHandler.py
diff -c gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.3 
gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.4
*** gnue/forms/src/uidrivers/wx/UILoginHandler.py:1.3   Mon Feb 17 02:32:53 2003
--- gnue/forms/src/uidrivers/wx/UILoginHandler.py       Wed Apr  9 13:00:38 2003
***************
*** 56,61 ****
--- 56,66 ----
      self._wxapp = getWxApp()
      self.dlg = None
  
+   # Hack for McMillan packaging on win32
+   def getDummyLogin(self):
+     self.dlg = wxDialog(NULL, -1,'dummy')
+     self.destroyLoginDialog()
+     
    def getLogin(self, loginData, errortext=None):#"Invalid username/password"):
      if 1: # TODO: This is left here to prevent me from having to unindent 
this code
            # TODO: Since the UI stuff is currently being gutted I'm not 
wasting the time