gnue/forms/src GFForm.py uidrivers/wx/UIdriver.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/25 00:29:20

Modified files:
        forms/src      : GFForm.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        * Cleaned up the HotKey display on the menus
        * fixed bug with a GFField being passed to findFocus

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.206&tr2=1.207&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.215&tr2=1.216&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.206 gnue/forms/src/GFForm.py:1.207
*** gnue/forms/src/GFForm.py:1.206      Fri Nov 22 20:48:02 2002
--- gnue/forms/src/GFForm.py    Mon Nov 25 00:29:20 2002
***************
*** 231,239 ****
    #
    def findFocus(self, object):
    
!     if object._type == 'GFField': 
        GDebug.printMesg(0,"Ack! A GFField was passed to 'findFocus'.")
!       object = object._fieldList[0]
  
      entry = None
  
--- 231,239 ----
    #
    def findFocus(self, object):
    
!     if object._type == 'GFField':
        GDebug.printMesg(0,"Ack! A GFField was passed to 'findFocus'.")
!       object = object._entryList[0]
  
      entry = None
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.215 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.216
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.215       Mon Nov 25 00:23:32 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Mon Nov 25 00:29:20 2002
***************
*** 272,279 ****
  
  
        fileMenu = wxMenu()
!       self.__addMenuItem(fileMenu, _("Save       (F6)"),_('Save all changes 
to database.'),'requestCOMMIT')
!       self.__addMenuItem(fileMenu, _("Clear Form (F11)"),_('Clear 
Form'),'requestROLLBACK')
        fileMenu.AppendSeparator()
  
        self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for 
this form.'),'requestPRINTOUT')
--- 272,279 ----
  
  
        fileMenu = wxMenu()
!       self.__addMenuItem(fileMenu, _("&Save\tF6"),_('Save all changes to 
database.'),'requestCOMMIT')
!       self.__addMenuItem(fileMenu, _("&Clear Form\tF11"),_('Clear 
Form'),'requestROLLBACK')
        fileMenu.AppendSeparator()
  
        self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for 
this form.'),'requestPRINTOUT')
***************
*** 284,312 ****
        self.__eventMenuMapping['_exit_'] = id
  
        editMenu = wxMenu()
!       self.__addMenuItem(editMenu, _("Cut"),_("Cut the selected 
text"),'requestCUT')
!       self.__addMenuItem(editMenu, _("Copy"),_("Copy the selected text"), 
'requestCOPY')
!       self.__addMenuItem(editMenu, _("Paste"),_("Paste text"),'requestPASTE')
  
        dataMenu = wxMenu()
!       self.__addMenuItem(dataMenu, _("First Record        
(Ctrl+Up)"),_('Navigate to first record in memory.'),'requestFIRSTRECORD')
!       self.__addMenuItem(dataMenu, _("Previous Record         
(Up)"),_('Navigate to previous record in memory.'),'requestPREVRECORD')
!       self.__addMenuItem(dataMenu, _("Next Record           
(Down)"),_('Navigate to next record in memory.'),'requestNEXTRECORD')
!       self.__addMenuItem(dataMenu, _("Last Record    
(Ctrl+Down)"),_('Navigate to last record in memory.'),'requestLASTRECORD')
!       id = self.__addMenuItem(dataMenu, _("Jump to Record...        
(F2)"),_('Prompts for a record number to which the system should jump.'))
        EVT_MENU(self._wxapp, id, _PROMPTFORRECORD)
        self.__eventMenuMapping['_promptForRecord_'] = id
  
!       self.__addMenuItem(dataMenu, _("New Record              
(F12)"),_('Create a new record for data input.'),'requestNEWRECORD')
!       self.__addMenuItem(dataMenu, _("Mark Record for Delete   (F5)"),_('Mark 
record for removal at next commit.'),'requestMARKFORDELETE')
  
        dataMenu.AppendSeparator()
!       self.__addMenuItem(dataMenu, _("Next Block              
(PgDn)"),_('Navigate to next data block.'),'requestNEXTBLOCK')
!       self.__addMenuItem(dataMenu, _("Previous Block       
(PgUp)"),_('Navigate to previous data block.'),'requestPREVBLOCK')
  
        dataMenu.AppendSeparator()
!       self.__addMenuItem(dataMenu, _("Enter Query             
(F8)"),_('Switch to input query mask mode.'),'requestENTERQUERY')
!       self.__addMenuItem(dataMenu, _("Execute Query           (F9)"), 
_('Execute query using current mask.'),'requestEXECQUERY')
  
        helpMenu = wxMenu()
        self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe 
Forms.'),'requestABOUT')
--- 284,312 ----
        self.__eventMenuMapping['_exit_'] = id
  
        editMenu = wxMenu()
!       self.__addMenuItem(editMenu, _("C&ut"),_("Cut the selected 
text"),'requestCUT')
!       self.__addMenuItem(editMenu, _("&Copy"),_("Copy the selected text"), 
'requestCOPY')
!       self.__addMenuItem(editMenu, _("&Paste"),_("Paste text"),'requestPASTE')
  
        dataMenu = wxMenu()
!       self.__addMenuItem(dataMenu, _("&First Record\tCtrl+Up"),_('Navigate to 
first record in memory.'),'requestFIRSTRECORD')
!       self.__addMenuItem(dataMenu, _("&Previous Record\tUp"),_('Navigate to 
previous record in memory.'),'requestPREVRECORD')
!       self.__addMenuItem(dataMenu, _("&Next Record\tDown"),_('Navigate to 
next record in memory.'),'requestNEXTRECORD')
!       self.__addMenuItem(dataMenu, _("&Last Record\tCtrl+Down"),_('Navigate 
to last record in memory.'),'requestLASTRECORD')
!       id = self.__addMenuItem(dataMenu, _("&Jump to 
Record...\tF2"),_('Prompts for a record number to which the system should 
jump.'))
        EVT_MENU(self._wxapp, id, _PROMPTFORRECORD)
        self.__eventMenuMapping['_promptForRecord_'] = id
  
!       self.__addMenuItem(dataMenu, _("N&ew Record\tF12"),_('Create a new 
record for data input.'),'requestNEWRECORD')
!       self.__addMenuItem(dataMenu, _("Mark Record for &Delete\tF5"),_('Mark 
record for removal at next commit.'),'requestMARKFORDELETE')
  
        dataMenu.AppendSeparator()
!       self.__addMenuItem(dataMenu, _("Next &Block\tPgDn"),_('Navigate to next 
data block.'),'requestNEXTBLOCK')
!       self.__addMenuItem(dataMenu, _("P&revious Block\tPgUp"),_('Navigate to 
previous data block.'),'requestPREVBLOCK')
  
        dataMenu.AppendSeparator()
!       self.__addMenuItem(dataMenu, _("&Enter Query\tF8"),_('Switch to input 
query mask mode.'),'requestENTERQUERY')
!       self.__addMenuItem(dataMenu, _("Execute &Query\tF9"), _('Execute query 
using current mask.'),'requestEXECQUERY')
  
        helpMenu = wxMenu()
        self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe 
Forms.'),'requestABOUT')