gnue/forms/src GFInstance.py dialogs/about/abou...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/03 19:44:54

Modified files:
        forms/src      : GFInstance.py 
        forms/src/dialogs/about: about.gfd 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        windows close properly in wx
        working about box ok button

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/about/about.gfd.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.237&tr2=1.238&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.87 gnue/forms/src/GFInstance.py:1.88
*** gnue/forms/src/GFInstance.py:1.87   Sat Mar  1 00:50:43 2003
--- gnue/forms/src/GFInstance.py        Mon Mar  3 19:44:54 2003
***************
*** 614,620 ****
        message.show()
      else:
        event._form.processTrigger('On-Exit')
!       self.dispatchEvent('exitApplication',_('Current data is saved'))
  
      return
  
--- 614,621 ----
        message.show()
      else:
        event._form.processTrigger('On-Exit')
!       print "Exit form is ", event._form.name
!       self.dispatchEvent('exitApplication',_('Current data is 
saved'),_formName=event._form.name)
  
      return
  
Index: gnue/forms/src/dialogs/about/about.gfd
diff -c gnue/forms/src/dialogs/about/about.gfd:1.5 
gnue/forms/src/dialogs/about/about.gfd:1.6
*** gnue/forms/src/dialogs/about/about.gfd:1.5  Sun Mar  2 17:46:02 2003
--- gnue/forms/src/dialogs/about/about.gfd      Mon Mar  3 19:44:54 2003
***************
*** 49,55 ****
        <button name="btnOK" c:height="1" label="OK" c:width="8"
                c:x="17" c:y="15">
          <trigger name="ok" type="On-Action">
!            print "OK"
          </trigger>
        </button>
  
--- 49,55 ----
        <button name="btnOK" c:height="1" label="OK" c:width="8"
                c:x="17" c:y="15">
          <trigger name="ok" type="On-Action">
!            close()
          </trigger>
        </button>
  
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.90 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.91
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.90     Mon Mar  3 19:29:17 2003
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Mon Mar  3 19:44:54 2003
***************
*** 413,419 ****
    # Form has told the application to close so call the UIs private exit 
routine
    #
    def exitApplication(self,event):
!     self._exit()
  
    #
    # _updateCreateEvent
--- 413,420 ----
    # Form has told the application to close so call the UIs private exit 
routine
    #
    def exitApplication(self,event):
!     print event.__dict__
!     self._exit(event._formName)
  
    #
    # _updateCreateEvent
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.237 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.238
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.237       Mon Mar  3 10:09:19 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Mar  3 19:44:54 2003
***************
*** 53,67 ****
  from common import *
  
  
! _PROMPTFORRECORD = None
! def treeShow(object, uiDriver):
!   try: 
!     print "Object ",object, object.Show(1), object.GetParent(), 
uiDriver._IdToGFObj[object.GetId()]
!   except KeyError:
!     print "Object ",object, object.Show(1), object.GetParent(), 
"NONE!!!!!!!!!!!!!"
      
!   for child in object.GetChildren():
!     treeShow(child, uiDriver)
      
  #
  # GFUserInterface
--- 53,67 ----
  from common import *
  
  
! ## _PROMPTFORRECORD = None
! ## def treeShow(object, uiDriver):
! ##   try: 
! ##     print "Object ",object, object.Show(1), object.GetParent(), 
uiDriver._IdToGFObj[object.GetId()]
! ##   except KeyError:
! ##     print "Object ",object, object.Show(1), object.GetParent(), 
"NONE!!!!!!!!!!!!!"
      
! ##   for child in object.GetChildren():
! ##     treeShow(child, uiDriver)
      
  #
  # GFUserInterface
***************
*** 147,156 ****
  
      self._formNameToUIForm[key].mainWindow.Raise()
      self._formNameToUIForm[key].mainWindow.Show(1)
- 
      self._formNameToUIForm[key].show()
  
!     treeShow(self._formNameToUIForm[key].mainWindow, self)
  
  
    
#############################################################################
--- 147,155 ----
  
      self._formNameToUIForm[key].mainWindow.Raise()
      self._formNameToUIForm[key].mainWindow.Show(1)
      self._formNameToUIForm[key].show()
  
!     ##treeShow(self._formNameToUIForm[key].mainWindow, self)
  
  
    
#############################################################################
***************
*** 166,175 ****
    #
    # Tells the application to close it's main window
    #
!   def _exit(self):
!     #TODO
!     self._children[0].mainWindow.Close(true)
! 
  
    # Can be used by UI drivers to add more attributes to the creation event.
    def _updateCreateEvent(self, event):
--- 165,181 ----
    #
    # Tells the application to close it's main window
    #
!   def _exit(self,formName):
!     exitApp = 1
!     for child in self._children:
!       if child._form.name == formName:
!         child.mainWindow.Hide()
! 
!       exitApp = exitApp and not child.mainWindow.IsShown()
! 
!     if exitApp:
!       for child in self._children:
!         child.mainWindow.Close(true)
  
    # Can be used by UI drivers to add more attributes to the creation event.
    def _updateCreateEvent(self, event):