[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers/wx UIdriver.py
|
From: |
Jason Cater |
|
Subject: |
gnue/forms/src/uidrivers/wx UIdriver.py |
|
Date: |
Mon, 07 Oct 2002 19:08:40 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/10/07 19:08:40
Modified files:
forms/src/uidrivers/wx: UIdriver.py
Log message:
Improved the menu creation logic to create dynamic ids; cleaned up init
logic
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.190&tr2=1.191&r1=text&r2=text
Patches:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.190
gnue/forms/src/uidrivers/wx/UIdriver.py:1.191
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.190 Mon Sep 23 08:46:40 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Mon Oct 7 19:08:40 2002
***************
*** 227,281 ****
self.statusBar.SetStatusWidths([-1,50,50,75,75])
initFont(self.statusBar,0)
fileMenu = wxMenu()
! fileMenu.Append( 100, _("Save (F6)"),_('Save all changes to
database.'))
! EVT_MENU(self._wxapp, 100, lambda event, l=self:
l.dispatchEvent(GFEvent('requestCOMMIT')))
! fileMenu.Append( 102, _("Clear Form (F11)"),_('Clear Form'))
! EVT_MENU(self._wxapp, 102, lambda event, l=self:
l.dispatchEvent(GFEvent('requestROLLBACK')))
fileMenu.AppendSeparator()
! fileMenu.Append( 104, _("&Print"),_('Perform print routine for this
form.'))
! EVT_MENU(self._wxapp, 104, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPRINTOUT')))
fileMenu.AppendSeparator()
! fileMenu.Append( 101, _("E&xit"),_('Leave the application.'))
! EVT_MENU(self._wxapp, 101, self.menuExitEvent)
editMenu = wxMenu()
! editMenu.Append(401, _("Cut"),_("Cut the selected text"))
! EVT_MENU(self._wxapp, 401, lambda event, l=self:
l.dispatchEvent(GFEvent('requestCUT')))
! editMenu.Append(402, _("Copy"),_("Copy the selected text"))
! EVT_MENU(self._wxapp, 402, lambda event, l=self:
l.dispatchEvent(GFEvent('requestCOPY')))
! editMenu.Append(403, _("Paste"),_("Paste text"))
! EVT_MENU(self._wxapp, 403, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPASTE')))
dataMenu = wxMenu()
! dataMenu.Append( 211, _("First Record (Shft+Up)"),_('Navigate to
first record in memory.'))
! EVT_MENU(self._wxapp, 211, lambda event, l=self:
l.dispatchEvent(GFEvent('requestFIRSTRECORD')))
! dataMenu.Append( 202, _("Previous Record (Up)"),_('Navigate to
previous record in memory.'))
! EVT_MENU(self._wxapp, 202, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVRECORD')))
! dataMenu.Append( 201, _("Next Record (Down)"),_('Navigate to
next record in memory.'))
! EVT_MENU(self._wxapp, 201, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTRECORD')))
! dataMenu.Append( 210, _("Last Record (Shft+Down)"),_('Navigate to last
record in memory.'))
! EVT_MENU(self._wxapp, 210, lambda event, l=self:
l.dispatchEvent(GFEvent('requestLASTRECORD')))
! dataMenu.Append( 209, _("Jump to Record... (F2)"),_('Prompts for a
record number to which the system should jump.'))
! EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
! dataMenu.Append( 203, _("New Record (F12)"),_('Create a new
record for data input.'))
! EVT_MENU(self._wxapp, 203, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEWRECORD')))
! dataMenu.Append( 204, _("Mark Record for Delete (F5)"),_('Mark record
for removal at next commit.'))
! EVT_MENU(self._wxapp, 204, lambda event, l=self:
l.dispatchEvent(GFEvent('requestMARKFORDELETE')))
dataMenu.AppendSeparator()
! dataMenu.Append( 205, _("Next Block (PgDn)"),_('Navigate to
next data block.'))
! EVT_MENU(self._wxapp, 205, lambda event, l=self:
l.dispatchEvent(GFEvent('requestNEXTBLOCK')))
! dataMenu.Append( 206, _("Previous Block (PgUp)"),_('Navigate to
previous data block.'))
! EVT_MENU(self._wxapp, 206, lambda event, l=self:
l.dispatchEvent(GFEvent('requestPREVBLOCK')))
dataMenu.AppendSeparator()
! dataMenu.Append( 207, _("Enter Query (F8)"),_('Switch to
input query mask mode.'))
! EVT_MENU(self._wxapp, 207, lambda event, l=self:
l.dispatchEvent(GFEvent('requestENTERQUERY')))
! dataMenu.Append( 208, _("Execute Query (F9)"), _('Execute query
using current mask.'))
! EVT_MENU(self._wxapp, 208, lambda event, l=self:
l.dispatchEvent(GFEvent('requestEXECQUERY')))
helpMenu = wxMenu()
! helpMenu.Append( 300, _("&About..."), _('Display info about GNUe Forms.'))
! EVT_MENU(self._wxapp, 300, lambda event, l=self:
l.dispatchEvent(GFEvent('requestABOUT')))
menuBar = wxMenuBar()
menuBar.Append( fileMenu, _("&File") )
--- 227,277 ----
self.statusBar.SetStatusWidths([-1,50,50,75,75])
initFont(self.statusBar,0)
+
+ # This will be a dict of the form { 'requestROLLBACK': 1001 }
+ # where 1001 is the wxId associated with requestROLLBACK.
+ self.__eventMenuMapping = {}
+
+
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')
fileMenu.AppendSeparator()
!
! id = self.__addMenuItem(fileMenu, _("E&xit"),_('Leave the application.'))
! EVT_MENU(self._wxapp, id, self.menuExitEvent)
! 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
(Shft+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 (Shft+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')
menuBar = wxMenuBar()
menuBar.Append( fileMenu, _("&File") )
***************
*** 296,316 ****
mainToolBar =
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
mainToolBar.SetToolBitmapSize(wxSize(24,24))
! mainToolBar.AddSimpleTool(100, wxImage(images_dir+gConfig('tb_commit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Save Changes"), _('Save all changes
to database.'))
! mainToolBar.AddSimpleTool(203, wxImage(images_dir+gConfig('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Insert Record"), _('Create a new
record for data input.'))
! mainToolBar.AddSimpleTool(204, wxImage(images_dir+gConfig('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Delete Record"), _('Mark record for
removal at next commit.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(211, wxImage(images_dir+gConfig('tb_first'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("First Record"),_('Navigate to first
record in memory.'))
! mainToolBar.AddSimpleTool(202, wxImage(images_dir+gConfig('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate to
previous record in memory.'))
! mainToolBar.AddSimpleTool(201, wxImage(images_dir+gConfig('tb_next'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to next
record in memory.'))
! mainToolBar.AddSimpleTool(210, wxImage(images_dir+gConfig('tb_last'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to last
record in memory.'))
! mainToolBar.AddSimpleTool(209, wxImage(images_dir+gConfig('tb_jump'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Jump to Record"),_('Navigate to user
specified record in memory.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(207,
wxImage(images_dir+gConfig('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to input
query mask mode.'))
! mainToolBar.AddSimpleTool(208, wxImage(images_dir+gConfig('tb_query'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Execute Query"), _('Execute query
using current mask.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(102, wxImage(images_dir+gConfig('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
! mainToolBar.AddSimpleTool(101, wxImage(images_dir+gConfig('tb_exit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Exit Form"), _('Exit Form'))
mainToolBar.Realize()
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetSize())
--- 292,312 ----
mainToolBar =
self.mainWindow.CreateToolBar(wxTB_HORIZONTAL|wxTB_DOCKABLE)
mainToolBar.SetToolBitmapSize(wxSize(24,24))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestCOMMIT'],
wxImage(images_dir+gConfig('tb_commit'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Save Changes"), _('Save all changes to database.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEWRECORD'],
wxImage(images_dir+gConfig('tb_insert'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Insert Record"), _('Create a new record for data input.'))
!
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestMARKFORDELETE'],
wxImage(images_dir+gConfig('tb_delete'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Delete Record"), _('Mark record for removal at next commit.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestFIRSTRECORD'],
wxImage(images_dir+gConfig('tb_first'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("First Record"),_('Navigate to first record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestPREVRECORD'],
wxImage(images_dir+gConfig('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate to
previous record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEXTRECORD'],
wxImage(images_dir+gConfig('tb_next'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Next Record"),_('Navigate to next record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(images_dir+gConfig('tb_last'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Last Record"),_('Navigate to last record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['_promptForRecord_'],
wxImage(images_dir+gConfig('tb_jump'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Jump to Record"),_('Navigate to user specified record in memory.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestENTERQUERY'],
wxImage(images_dir+gConfig('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to input
query mask mode.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestEXECQUERY'],
wxImage(images_dir+gConfig('tb_query'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Execute Query"), _('Execute query using current mask.'))
mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestROLLBACK'],
wxImage(images_dir+gConfig('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['_exit_'],
wxImage(images_dir+gConfig('tb_exit'), wxBITMAP_TYPE_PNG).ConvertToBitmap(),
_("Exit Form"), _('Exit Form'))
mainToolBar.Realize()
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetSize())
***************
*** 323,328 ****
--- 319,325 ----
self.mainWindow.Show(true)
return true
+
def activateForm(self, form):
width = int(self._form.width)
height = int(self._form.height)
***************
*** 365,370 ****
--- 362,381 ----
#
def _exit(self):
self.mainWindow.Close(true)
+
+
+ #
+ # Internal helper function to add a menu item and an event
+ #
+ def __addMenuItem(self, menu, text, help, event=None):
+ id = wxNewId()
+ menu.Append(id, text, help)
+ if event:
+ EVT_MENU(self._wxapp, id,
+ lambda event, l=self, e=event: l.dispatchEvent(GFEvent(e)))
+ self.__eventMenuMapping[event] = id
+ return id
+
#
# _setStatusBar
- gnue/forms/src/uidrivers/wx UIdriver.py,
Jason Cater <=
- gnue/forms/src/uidrivers/wx UIdriver.py, Jason Cater, 2002/10/07
- gnue/forms/src/uidrivers/wx UIdriver.py, Jason Cater, 2002/10/08
- gnue/forms/src/uidrivers/wx UIdriver.py, Jason Cater, 2002/10/09
- gnue/forms/src/uidrivers/wx UIdriver.py, Arturas Kriukovas, 2002/10/15
- gnue/forms/src/uidrivers/wx UIdriver.py, James Thompson, 2002/10/30
- gnue/forms/src/uidrivers/wx UIdriver.py, James Thompson, 2002/10/31