gnue/forms src/uidrivers/_base/UserActions.py s...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/01 15:55:57

Modified files:
        forms/src/uidrivers/_base: UserActions.py 
        forms/src/uidrivers/_commonGuiToolkit: MenuBar.py ToolBar.py 
        forms/src/uidrivers/wx/widgets/form: widget.py 
Added files:
        forms/images   : exit-16x16.png exit-32x32.png 
Removed files:
        forms/images   : close-16x16.png close-32x32.png 

Log message:
        fixed for exit event

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/exit-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/exit-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UserActions.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/widget.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/_base/UserActions.py
diff -c gnue/forms/src/uidrivers/_base/UserActions.py:1.3 
gnue/forms/src/uidrivers/_base/UserActions.py:1.4
*** gnue/forms/src/uidrivers/_base/UserActions.py:1.3   Sat Mar  1 15:29:32 2003
--- gnue/forms/src/uidrivers/_base/UserActions.py       Sat Mar  1 15:55:56 2003
***************
*** 93,99 ****
         help=_("Perform print routine for this form.") ), 
         
      UserAction(
!        event="CLOSE",
         description=_("Leave the application."),
         help=_("Leave the application.") ), 
         
--- 93,99 ----
         help=_("Perform print routine for this form.") ), 
         
      UserAction(
!        event="EXIT",
         description=_("Leave the application."),
         help=_("Leave the application.") ), 
         
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.4 
gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.5
*** gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.4   Sat Mar  1 
15:29:32 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py       Sat Mar  1 
15:55:57 2003
***************
*** 135,141 ****
         None, 
         ('&Print', "PRINTOUT"), 
         None, 
!        ('&Close', "CLOSE") ) ), 
         
     ( '&Edit', (
         ('C&ut', "CUT"), 
--- 135,141 ----
         None, 
         ('&Print', "PRINTOUT"), 
         None, 
!        ('&Close', "EXIT") ) ), 
         
     ( '&Edit', (
         ('C&ut', "CUT"), 
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.2 
gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.3
*** gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.2   Sat Mar  1 
15:29:32 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py       Sat Mar  1 
15:55:57 2003
***************
*** 153,157 ****
      None,       
      ('Revert Changes', "ROLLBACK"), 
      None, 
!     ('Close', "CLOSE") )
         
--- 153,157 ----
      None,       
      ('Revert Changes', "ROLLBACK"), 
      None, 
!     ('Close', "EXIT") )
         
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.3 
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.4
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.3      Sat Mar  1 
00:50:44 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py  Sat Mar  1 15:55:57 2003
***************
*** 109,172 ****
  
      
      
-     #
      # Add the menu
!     #
!     MenuBar(self._uiDriver, self.mainWindow, self._form)
      
  
!     #
!     # Build Toolbar
!     #
!     
!     ToolBar(self._uiDriver, self.mainWindow, self._form)
!     
!     if 0: # not self._form._features['GUI:TOOLBAR:SUPPRESS']:
!       #
!       #  There has got to be better way to call events to ride off the 
EVT_MENU
!       #  Ok if i give buttons same id as menu's they share events
!       #  I dont know if this is horribly wrong or design
!       #
!       if sys.platform == 'win32':
!         mainToolBar = wxToolBar(self.mainWindow, -1)
!       else:
!         mainToolBar = wxToolBar(self.mainWindow,-1, 
style=wxTB_HORIZONTAL|wxTB_DOCKABLE)
! 
!       mainToolBar.SetToolBitmapSize(wxSize(24,24))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestCOMMIT'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_commit'),
!                                                                               
    wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Save  Changes"), _('Save all 
changes to database.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEWRECORD'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_insert'),
!                                                                               
       wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Insert Record"), _('Create a 
new record for data input.'))
!       
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestMARKFORDELETE'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_delete'),
!                                                                               
           wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Delete Record"), _('Mark 
record for removal at next commit.'))
!       mainToolBar.AddSeparator()
!       
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestFIRSTRECORD'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_first'),
!                                                                               
         wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("First Record"),_('Navigate to 
first record in memory.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestPREVRECORD'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_previous'),
!                                                                               
        wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate 
to previous record in memory.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEXTRECORD'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_next'),
!                                                                               
        wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to 
next record in memory.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_last'),
!                                                                               
        wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to 
last record in memory.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestJUMPTO'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_jump'),
!                                                                               
        wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Jump to Record"),_('Navigate 
to user specified record in memory.'))
!       mainToolBar.AddSeparator()
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestENTERQUERY'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query_prep'),
!                                                                               
        wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to 
input query mask mode.'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestEXECQUERY'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query'),
!                                                                               
       wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Execute Query"), _('Execute 
query using current mask.'))
!       mainToolBar.AddSeparator()
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestROLLBACK'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_rollback'),
!                                                                               
      wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
!       mainToolBar.AddSimpleTool(self.__eventMenuMapping['_exit_'], 
wxImage(self._uiDriver.images_dir+gConfigForms('tb_exit'),
!                                                                            
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Exit Form"), _('Exit Form'))
! 
!       self._mainToolBar = mainToolBar
!       self.mainWindow.SetToolBar( mainToolBar );
!       self._mainToolBar.Realize()
! 
      self._eventHandler = event.eventHandler
- 
      self._wrapper.finalize()
  
      return newWidget
--- 109,125 ----
  
      
      
      # Add the menu
!     if not self._form._features['GUI:MENUBAR:SUPPRESS']:
!       MenuBar(self._uiDriver, self.mainWindow, self._form)
      
+     # and the Toolbar
+     if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
+       ToolBar(self._uiDriver, self.mainWindow, self._form)
+      
  
!       
      self._eventHandler = event.eventHandler
      self._wrapper.finalize()
  
      return newWidget