[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src/uidrivers _base/UserActions.py _...
|
From: |
Jason Cater |
|
Subject: |
gnue/forms/src/uidrivers _base/UserActions.py _... |
|
Date: |
Mon, 03 Mar 2003 17:22:52 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/03 17:22:51
Modified files:
forms/src/uidrivers/_base: UserActions.py
forms/src/uidrivers/_commonGuiToolkit: MenuBar.py
forms/src/uidrivers/wx: MenuBar.py
Log message:
misc cleanup
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UserActions.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/MenuBar.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.5
gnue/forms/src/uidrivers/_base/UserActions.py:1.6
*** gnue/forms/src/uidrivers/_base/UserActions.py:1.5 Mon Mar 3 17:13:57 2003
--- gnue/forms/src/uidrivers/_base/UserActions.py Mon Mar 3 17:22:51 2003
***************
*** 87,98 ****
UserAction(
event="COMMIT",
description=_("Save all changes to the database."),
! help=_("""Save all changes to the database.""") ),
!
UserAction(
event="ROLLBACK",
description=_("Clear form."),
! help=_("Clear form and revert back to your original data.") ),
UserAction(
event="PRINTOUT",
--- 87,98 ----
UserAction(
event="COMMIT",
description=_("Save all changes to the database."),
! help=_("""Save all changes to the database.""") ),
!
UserAction(
event="ROLLBACK",
description=_("Clear form."),
! help=_("Clear form and revert back to your original data.") ),
UserAction(
event="PRINTOUT",
***************
*** 142,195 ****
UserAction(
event="FIRSTRECORD",
description=_("Jump to the first record in the current block."),
! help=_("Jump to the first record in the current block.") ),
!
UserAction(
event="PREVRECORD",
description=_("Jump to the previous record in the current block."),
! help=_("Jump to the previous record in the current block.") ),
!
UserAction(
event="NEXTRECORD",
description=_("Jump to the next record in the current block."),
! help=_("Jump to the next record in the current block.") ),
!
UserAction(
event="LASTRECORD",
description=_("Jump to the last record in the current block."),
! help=_("Jump to the last record in the current block.") ),
!
UserAction(
event="JUMPPROMPT",
description=_('Prompts for a record number to which the system should
jump.'),
! help=_('Prompts for a record number to which the system should jump.')
),
UserAction(
event="NEWRECORD",
description=_("Insert a new record into the current block."),
! help=_("Insert a new record into the current block.") ),
!
UserAction(
event="MARKFORDELETE",
description=_('Mark record for removal at next commit.'),
! help=_('Mark record for removal at next commit.') ),
!
UserAction(
event="NEXTBLOCK",
description=_('Navigate to the next data block.'),
! help=_('Navigate to the next data block.') ),
!
UserAction(
event="PREVBLOCK",
description=_('Navigate to the previous data block.'),
! help=_('Navigate to the previous data block.') ),
!
UserAction(
event="ENTERQUERY",
description=_('Switch to query mode. Select Execute Query once your
criteria has been entered.'),
! help=_('Switch to query mode. Select Execute Query once your criteria
has been entered.'),
! canToggle=1 ),
!
UserAction(
event="COPYQUERY",
description=_('Switch to query mode and retrieve the last query
parameters. Select Execute Query once your criteria has been entered.'),
--- 142,205 ----
UserAction(
event="FIRSTRECORD",
description=_("Jump to the first record in the current block."),
! help=_("Jump to the first record in the current block.") ),
!
UserAction(
event="PREVRECORD",
description=_("Jump to the previous record in the current block."),
! help=_("Jump to the previous record in the current block.") ),
!
UserAction(
event="NEXTRECORD",
description=_("Jump to the next record in the current block."),
! help=_("Jump to the next record in the current block.") ),
!
UserAction(
event="LASTRECORD",
description=_("Jump to the last record in the current block."),
! help=_("Jump to the last record in the current block.") ),
!
UserAction(
event="JUMPPROMPT",
description=_('Prompts for a record number to which the system should
jump.'),
! help=_('Prompts for a record number to which the system should jump.')
),
UserAction(
event="NEWRECORD",
description=_("Insert a new record into the current block."),
! help=_("Insert a new record into the current block.") ),
!
UserAction(
event="MARKFORDELETE",
description=_('Mark record for removal at next commit.'),
! help=_('Mark record for removal at next commit.') ),
!
UserAction(
event="NEXTBLOCK",
description=_('Navigate to the next data block.'),
! help=_('Navigate to the next data block.') ),
!
UserAction(
event="PREVBLOCK",
description=_('Navigate to the previous data block.'),
! help=_('Navigate to the previous data block.') ),
!
! UserAction(
! event="NEXTPAGE",
! description=_('Navigate to the next page.'),
! help=_('Navigate to the next page.') ),
!
! UserAction(
! event="PREVPAGE",
! description=_('Navigate to the previous page.'),
! help=_('Navigate to the previous page.') ),
!
UserAction(
event="ENTERQUERY",
description=_('Switch to query mode. Select Execute Query once your
criteria has been entered.'),
! help=_('Switch to query mode. Select Execute Query once your criteria
has been entered.'),
! canToggle=1 ),
!
UserAction(
event="COPYQUERY",
description=_('Switch to query mode and retrieve the last query
parameters. Select Execute Query once your criteria has been entered.'),
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.6
gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.7
*** gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.6 Mon Mar 3
17:13:57 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py Mon Mar 3
17:22:51 2003
***************
*** 121,178 ****
item = self.__actionMap[event.__event__[6:]]
self.disableItem(item)
!
!
!
####################################################################
#
#
_DEFAULT_MENU = (
( '&File', (
! ('&Save Changes', "COMMIT"),
! ('&Revert Changes', "ROLLBACK"),
! None,
! ('&Print', "PRINTOUT"),
! None,
! ('&Close', "EXIT") ) ),
!
( '&Edit', (
! ('C&ut', "CUT"),
! ('&Copy', "COPY"),
('C&opy Special', (
! ('&Record as Text', 'COPYRECORD'),
! ('&Screen as Text', 'COPYSCREEN' ) ) ),
! ('&Paste', "PASTE"),
! None,
! ('&Insert New Record',"NEWRECORD"),
! None,
! ('&Delete Current Record','MARKFORDELETE') ) ),
!
! ( '&Navigation', (
! ('&Next Entry', "NEXTENTRY"),
! ('&Previous Entry', "PREVENTRY"),
! None,
! ('Next &Record', "NEXTRECORD"),
! ('Previous R&ecord', "PREVRECORD"),
! ('&First Record', 'FIRSTRECORD'),
! ('&Last Record', 'LASTRECORD'),
! ('&Go to record...', 'JUMPPROMPT'),
! None,
! ('Next &Block', 'NEXTBLOCK'),
('Previous Bl&ock', 'PREVBLOCK'),
! None,
! ('Next P&age', 'NEXTBLOCK'),
! ('Pre&vious Page', 'PREVBLOCK') ) ),
!
( '&Search', (
! ('Enter Query Mode', "ENTERQUERY"),
! ('Copy Last Query', "COPYQUERY"),
! None,
! ('Perform Query', "EXECQUERY") ) ),
!
( '&Help', (
! ('Keystrokes...', "HELPKEYS"),
! ('About...', "ABOUT") ) ),
)
--- 121,178 ----
item = self.__actionMap[event.__event__[6:]]
self.disableItem(item)
!
!
!
####################################################################
#
#
_DEFAULT_MENU = (
( '&File', (
! ('&Save Changes', "COMMIT"),
! ('&Revert Changes', "ROLLBACK"),
! None,
! ('&Print', "PRINTOUT"),
! None,
! ('&Close', "EXIT") ) ),
!
( '&Edit', (
! ('C&ut', "CUT"),
! ('&Copy', "COPY"),
('C&opy Special', (
! ('&Record as Text', 'COPYRECORD'),
! ('&Screen as Text', 'COPYSCREEN' ) ) ),
! ('&Paste', "PASTE"),
! None,
! ('&Insert New Record',"NEWRECORD"),
! None,
! ('&Delete Current Record','MARKFORDELETE') ) ),
!
! ( '&Navigation', (
! ('&Next Entry', "NEXTENTRY"),
! ('&Previous Entry', "PREVENTRY"),
! None,
! ('Next &Record', "NEXTRECORD"),
! ('Previous R&ecord', "PREVRECORD"),
! ('&First Record', 'FIRSTRECORD'),
! ('&Last Record', 'LASTRECORD'),
! ('&Go to record...', 'JUMPPROMPT'),
! None,
! ('Next &Block', 'NEXTBLOCK'),
('Previous Bl&ock', 'PREVBLOCK'),
! None,
! ('Next P&age', 'NEXTPAGE'),
! ('Pre&vious Page', 'PREVPAGE') ) ),
!
( '&Search', (
! ('Enter Query Mode', "ENTERQUERY"),
! ('Copy Last Query', "COPYQUERY"),
! None,
! ('Perform Query', "EXECQUERY") ) ),
!
( '&Help', (
! ('Keystrokes...', "HELPKEYS"),
! ('About...', "ABOUT") ) ),
)
Index: gnue/forms/src/uidrivers/wx/MenuBar.py
diff -c gnue/forms/src/uidrivers/wx/MenuBar.py:1.3
gnue/forms/src/uidrivers/wx/MenuBar.py:1.4
*** gnue/forms/src/uidrivers/wx/MenuBar.py:1.3 Mon Mar 3 10:22:01 2003
--- gnue/forms/src/uidrivers/wx/MenuBar.py Mon Mar 3 17:22:51 2003
***************
*** 56,67 ****
hotkey = userAction.getHotKeyText()
iconloc = userAction.getIconLocation(size="16x16")
! if hotkey:
label += '\t%s' % hotkey
!
id = wxNewId()
item = wxMenuItem(parent, id, label, userAction.description or '')
!
event = 'request' + userAction.event
EVT_MENU(self.driver._wxapp, id,
lambda event, l=self.driver, e=event, f=self.form:
l.dispatchEvent(e,_form=f))
--- 56,69 ----
hotkey = userAction.getHotKeyText()
iconloc = userAction.getIconLocation(size="16x16")
! if hotkey == 'Enter':
label += '\t%s' % hotkey
!
! print "--> '%s'" % label
!
id = wxNewId()
item = wxMenuItem(parent, id, label, userAction.description or '')
!
event = 'request' + userAction.event
EVT_MENU(self.driver._wxapp, id,
lambda event, l=self.driver, e=event, f=self.form:
l.dispatchEvent(e,_form=f))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src/uidrivers _base/UserActions.py _...,
Jason Cater <=