[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms src/GFForm.py src/GFInstance.py src/...
|
From: |
Jason Cater |
|
Subject: |
gnue/forms src/GFForm.py src/GFInstance.py src/... |
|
Date: |
Sat, 01 Mar 2003 00:50:46 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/01 00:50:44
Modified files:
forms/src : GFForm.py GFInstance.py
forms/src/uidrivers/_base: UserActions.py
forms/src/uidrivers/_commonGuiToolkit: MenuBar.py
forms/src/uidrivers/wx: UIdriver.py __init__.py
forms/src/uidrivers/wx/widgets/form: widget.py
Added files:
forms/images : close-16x16.png close-32x32.png
commit-16x16.png commit-32x32.png
execquery-16x16.png execquery-32x32.png
firstrecord-16x16.png firstrecord-32x32.png
jumprecord-16x16.png jumprecord-32x32.png
lastrecord-16x16.png lastrecord-32x32.png
markfordelete-16x16.png markfordelete-32x32.png
newrecord-16x16.png newrecord-32x32.png
nextrecord-16x16.png nextrecord-32x32.png
prevrecord-16x16.png prevrecord-32x32.png
rollback-16x16.png rollback-32x32.png
forms/src/uidrivers/_commonGuiToolkit: ToolBar.py
forms/src/uidrivers/wx: MenuBar.py ToolBar.py
Removed files:
forms/src/uidrivers/_commonGuiToolkit: Toolbar.py
Log message:
added common MenuBar and ToolBar support
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/close-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/close-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/commit-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/commit-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/execquery-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/execquery-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/firstrecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/firstrecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/jumprecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/jumprecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/lastrecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/lastrecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/markfordelete-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/markfordelete-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/newrecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/newrecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/nextrecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/nextrecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/prevrecord-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/prevrecord-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/rollback-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/rollback-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.225&tr2=1.226&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UserActions.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.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/MenuBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/ToolBar.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.235&tr2=1.236&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/__init__.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.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.225 gnue/forms/src/GFForm.py:1.226
*** gnue/forms/src/GFForm.py:1.225 Fri Feb 28 19:15:06 2003
--- gnue/forms/src/GFForm.py Sat Mar 1 00:50:43 2003
***************
*** 173,202 ****
## if isinstance(child, GObj):
## child._phaseInit(phase)
- #
- # Convert some deprecated options to new style
- #
- def _buildObject(self):
- i = 0
- while i < len(self._children):
- if isinstance(self._children[i], GFOptions):
- j = 0
- while j < len(self._children[i]._children):
- if self._children[i]._children[j].name in \
- ('title','width','height'):
- self.__dict__[self._children[i]._children[j].name] = \
- self._children[i]._children[j].value
- self._children[i]._children.pop(j)
- else:
- j = j + 1
- if not len (self._children[i]._children):
- self._children.pop(i)
- else:
- i = i + 1
- else:
- i = i + 1
- return GFObj._buildObject(self)
#
# primaryInit
--- 173,179 ----
***************
*** 449,461 ****
--- 426,447 ----
# If Enter-Query is hit once, enter query mode
# If Enter-Query is hit twice, bring back conditions from last query.
# If Enter-Query is hit thrice, cancel the query and go into normal mode.
+
+ self._instance.dispatchEvent('beginENTERQUERY', _form=self);
for block in self._logic._blockList:
block.initQuery()
+
return message
+
+ def cancelQuery(self):
+ return message
+
+
def executeQuery(self):
+ self._instance.dispatchEvent('endENTERQUERY', _form=self);
self._instance.dispatchEvent('beginWAIT',None, _form=self);
message = None
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.86 gnue/forms/src/GFInstance.py:1.87
*** gnue/forms/src/GFInstance.py:1.86 Fri Feb 28 19:15:06 2003
--- gnue/forms/src/GFInstance.py Sat Mar 1 00:50:43 2003
***************
*** 95,100 ****
--- 95,102 ----
'requestEXIT' : self.executeExit,
'requestABOUT' : self.executeAbout,
'requestMODETOGGLE' : self.toggleInsertMode,
+ 'cancelQUERY' : self.cancelQuery,
+
'fireTRIGGER' : self.fireTrigger,
'buttonActivated' : self.fireButton,
***************
*** 762,768 ****
self.updateStatus()
#
! # requestQuery
#
def executeCommit(self, event):
if not event._form.endEditing():
--- 764,788 ----
self.updateStatus()
#
! # cancelQuery
! #
! def cancelQuery(self, event):
! if not event._form.endEditing():
! return
!
! message = event._form.cancelQuery()
!
! if message:
! messageBox = GFMsgBox(self,message)
! messageBox.show()
! return
!
! event._form.refreshDisplay(event._form)
! self.dispatchEvent('gotoENTRY',object=event._form._currentEntry,
_form=event._form)
! self.updateStatus()
!
! #
! # executeQuery
#
def executeCommit(self, event):
if not event._form.endEditing():
Index: gnue/forms/src/uidrivers/_base/UserActions.py
diff -c gnue/forms/src/uidrivers/_base/UserActions.py:1.1
gnue/forms/src/uidrivers/_base/UserActions.py:1.2
*** gnue/forms/src/uidrivers/_base/UserActions.py:1.1 Thu Feb 27 01:59:25 2003
--- gnue/forms/src/uidrivers/_base/UserActions.py Sat Mar 1 00:50:43 2003
***************
*** 21,27 ****
# FILE:
# UserAction.py
#
! # DESCRIPTION:
# A generic UIdriver base for common message-based GUI toolkits.
#
# NOTES:
--- 21,27 ----
# FILE:
# UserAction.py
#
! # DESCRIPTION::
# A generic UIdriver base for common message-based GUI toolkits.
#
# NOTES:
***************
*** 30,36 ****
from gnue.common.apps import GConfig
import os
! _iconpath = GConfig.getInstalledBase('form_images')
######################################################################
--- 30,36 ----
from gnue.common.apps import GConfig
import os
! _iconpath = GConfig.getInstalledBase('form_images', 'common_images')
######################################################################
***************
*** 42,63 ****
def __init__(self, event, description, help):
self.event = event
! self.description = description
self.help = help
def getIconLocation(self, format="png",size="32x32"):
try:
! return self.__iconloc
except:
! loc = os.path.join(iconpath,
! 'gf-%s-%s.%s' % (self.event.lower(),size, format))
if not os.path.isfile(loc):
loc = None
! self.__iconloc = loc
return loc
######################################################################
#
--- 42,71 ----
def __init__(self, event, description, help):
self.event = event
! self.__iconloc = {}
!
! # Description is short; appropriate for mouse-over tips
! self.description = description
!
! # Help is more detailed; suitable for a manual or online help
self.help = help
def getIconLocation(self, format="png",size="32x32"):
try:
! return self.__iconloc[size + format]
except:
! loc = os.path.join(_iconpath, 'forms',
! '%s-%s.%s' % (self.event.lower(),size, format))
if not os.path.isfile(loc):
loc = None
! self.__iconloc[size + format] = loc
return loc
+ def getHotKeyText(self, metamappings={}, separator='+'):
+ return "Alt+T"
+
######################################################################
#
***************
*** 114,119 ****
--- 122,137 ----
help=_("Paste text into the current field.") ),
UserAction(
+ event="PREVFIELD",
+ description=_("Move to the previous logicalfield."),
+ help=_("Move to the previous logical field.") ),
+
+ UserAction(
+ event="NEXTFIELD",
+ description=_("Move to the next logicalfield."),
+ help=_("Move to the next logical field.") ),
+
+ UserAction(
event="FIRSTRECORD",
description=_("Jump to the first record in the current block."),
help=_("Jump to the first record in the current block.") ),
***************
*** 164,169 ****
--- 182,192 ----
help=_('Switch to query mode. Select Execute Query once your criteria
has been entered.') ),
UserAction(
+ event="COPYQUERY",
+ description=_('Switch to query mode and retrieve the last query
parameters. Select Execute Query once your criteria has been entered.'),
+ help=_('Switch to query mode and retrieve the last query parameters.
Select Execute Query once your criteria has been entered.') ),
+
+ UserAction(
event="EXECQUERY",
description=_('Perform a query and show the results.'),
help=_('Perform a query and show the results.') ),
***************
*** 173,180 ****
description=_('Display info about GNUe Forms.'),
help=_('Display info about GNUe Forms.') ),
]:
! actionMap[action.event] = actionMap
--- 196,208 ----
description=_('Display info about GNUe Forms.'),
help=_('Display info about GNUe Forms.') ),
+ UserAction(
+ event="HELPKEYS",
+ description=_('Display the keystroke bindings currently in use.'),
+ help=_('Display the keystroke bindings currently in use.') ),
+
]:
! userActionMap[action.event] = action
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.2
gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.3
*** gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.2 Thu Feb 27
01:59:25 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py Sat Mar 1
00:50:44 2003
***************
*** 19,25 ****
# Copyright 2000-2003 Free Software Foundation
#
# FILE:
! # UIdriver.py
#
# DESCRIPTION:
# A generic UIdriver base for common message-based GUI toolkits.
--- 19,25 ----
# Copyright 2000-2003 Free Software Foundation
#
# FILE:
! # MenuBar.py
#
# DESCRIPTION:
# A generic UIdriver base for common message-based GUI toolkits.
***************
*** 27,32 ****
--- 27,36 ----
# NOTES:
#
+ import string
+ from types import StringType
+
+ from gnue.forms.uidrivers._base import UserActions
class MenuBar:
***************
*** 38,46 ****
#
# Smile. It's menu-building time!
! def build(self):
! return
# Enable a menu item
def enableItem(self, item):
pass
--- 42,62 ----
#
# Smile. It's menu-building time!
! def init(self):
! pass
+ # Add a (sub)menu
+ def addMenu(self, name, parent):
+ pass
+
+ # Add a menu item (action)
+ def addAction(self, name, parent, userAction):
+ pass
+
+ # Add a separator
+ def addSeparator(self, parent):
+ pass
+
# Enable a menu item
def enableItem(self, item):
pass
***************
*** 48,55 ****
# Disable a menu item
def disableItem(self, item):
pass
!
!
####################################################################
#
# These methods should not be touched
--- 64,71 ----
# Disable a menu item
def disableItem(self, item):
pass
!
!
####################################################################
#
# These methods should not be touched
***************
*** 59,94 ****
# M.C. Hammer, "Can't touch this!"
#
! def __init__(self, UIdriver, container):
self.driver = uidriver
self.container = container
! self.enabled = 0
! self.menuMap = {
! 'File
def disable(self):
self.enabled = 0
def finalize(self):
if self.enabled:
!
!
!
! # Let specific
! self.build(self)
!
!
! def recordMenuEvent(self, handle, data):
! pass
!
!
! def enableItemEvent(self, event):
! pass
!
!
####################################################################
#
#
--- 75,129 ----
# M.C. Hammer, "Can't touch this!"
#
! def __init__(self, uidriver, container, form):
self.driver = uidriver
self.container = container
! self.form = form
! self.enabled = 1
! self.__actionMap = {}
!
! self.finalize()
def disable(self):
self.enabled = 0
def finalize(self):
if self.enabled:
+
+ # Let specific drivers create themselves
+ m = self.init()
! self.__createmenu(_DEFAULT_MENU,m)
+
+ def __createmenu(self, contents, parent):
+ for item in contents:
+ if item == None:
+ self.addSeparator(parent)
+ else:
+ name, contents = item
+ if type(contents) == StringType:
+ userAction = UserActions.userActionMap[contents]
+ self.addAction(name, parent, userAction)
+ self.driver.registerEventListeners(
+ {'canRequest%s' % userAction.event: self.__canRequestEvent,
+ 'cannotRequest%s' % userAction.event: self.__canRequestEvent
})
+
+ else:
+ m = self.addMenu(name, parent)
+ self.__createmenu(contents, m)
+
+ def __canRequestEvent(self, event):
+ item = self.__actionMap[event.__event__[10:]]
+ self.enableItem(item)
+
+ def __cannotRequestEvent(self, event):
+ item = self.__actionMap[event.__event__[10:]]
+ self.disableItem(item)
!
!
!
####################################################################
#
#
***************
*** 128,143 ****
('Previous Bl&ock', 'PREVBLOCK'),
None,
('Next P&age', 'NEXTBLOCK'),
! ('Pre&vious Page', 'PREVBLOCK'),
( '&Search', (
! ('Enter Search Mode', "ENTQUERY"),
! ('Copy Last Search', "ENTQUERY2"),
None,
! ('Perform Search', "EXECQUERY") ) ),
( '&Help', (
('Keystrokes...', "HELPKEYS"),
! ('About...', "HELP") ) ),
)
--- 163,178 ----
('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") ) ),
)
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.235
gnue/forms/src/uidrivers/wx/UIdriver.py:1.236
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.235 Fri Feb 28 19:15:08 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py Sat Mar 1 00:50:44 2003
***************
*** 47,52 ****
--- 47,55 ----
from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
from gnue.forms.uidrivers.wx.widgets._base import *
from gnue.forms.uidrivers.wx.common import _eventObjTowxWindow
+
+ ##from MenuBar import MyMenuBar
+
from common import *
***************
*** 73,78 ****
--- 76,82 ----
GFUserInterfaceBase.__init__(self,eventController,'wx')
self._disableSplash = disableSplash
+ ## self.MenuBar = MenuBar
self._DIALOGS = {
'messageBox' :UIMessageBox,
Index: gnue/forms/src/uidrivers/wx/__init__.py
diff -c gnue/forms/src/uidrivers/wx/__init__.py:1.2
gnue/forms/src/uidrivers/wx/__init__.py:1.3
*** gnue/forms/src/uidrivers/wx/__init__.py:1.2 Sat Dec 21 14:29:55 2002
--- gnue/forms/src/uidrivers/wx/__init__.py Sat Mar 1 00:50:44 2003
***************
*** 1,2 ****
! from UIdriver import *
from UILoginHandler import *
--- 1,3 ----
! from UIdriver import GFUserInterface
from UILoginHandler import *
+
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.2
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.3
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.2 Fri Feb 28
19:15:08 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py Sat Mar 1 00:50:44 2003
***************
*** 36,41 ****
--- 36,44 ----
import wrappers
+ from gnue.forms.uidrivers.wx.MenuBar import MenuBar
+ from gnue.forms.uidrivers.wx.ToolBar import ToolBar
+
#
# UIForm
#
***************
*** 47,73 ****
self._uiPageList=[]
UIHelper.__init__(self, event)
- #
- # Internal helper function to add a menu item and an event
- #
- def __addMenuItem(self, menu, text, help, event=None, form=None):
- id = wxNewId()
- menu.Append(id, text, help)
- if event:
- EVT_MENU(self._uiDriver._wxapp, id,
- lambda event, l=self._uiDriver, e=event, f=self._form:
l.dispatchEvent(events.Event(e,_form=f)))
- self.__eventMenuMapping[event] = id
-
- return id
-
- #
- # _menuExitEvent
- #
- # Catches the Exit event from the menu and make sure it closes in such a
way to
- # trigger the closeTrap method
- #
- def _menuExitEvent(self, event):
- self.mainWindow.Close()
def _createWidget(self, event, spacer):
object = event.object
--- 50,55 ----
***************
*** 125,193 ****
## mainWindowSize = wxSize(20+tempx, 20+tempy)
## self.mainWindow.SetSize(mainWindowSize)
#
# Add the menu
#
! if not self._form._features['GUI:MENUBAR:SUPPRESS']:
! # 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\tF6"),_('Save all changes to
database.'),'requestCOMMIT', form=self._form)
! self.__addMenuItem(fileMenu, _("&Clear Form\tF11"),_('Clear
Form'),'requestROLLBACK', form=self._form)
! fileMenu.AppendSeparator()
!
! self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for
this form.'),'requestPRINTOUT', form=self._form)
! fileMenu.AppendSeparator()
!
! id = self.__addMenuItem(fileMenu, _("E&xit"),_('Leave the
application.'), form=self._form)
! EVT_MENU(self._uiDriver._wxapp, id, self._menuExitEvent)
! self.__eventMenuMapping['_exit_'] = id
!
! editMenu = wxMenu()
! self.__addMenuItem(editMenu, _("C&ut"),_("Cut the selected
text"),'requestCUT', form=self._form)
! self.__addMenuItem(editMenu, _("&Copy"),_("Copy the selected text"),
'requestCOPY', form=self._form)
! self.__addMenuItem(editMenu, _("&Paste"),_("Paste
text"),'requestPASTE', form=self._form)
!
! dataMenu = wxMenu()
! self.__addMenuItem(dataMenu, _("&First Record\tCtrl+Up"),_('Navigate to
first record in memory.'),'requestFIRSTRECORD', form=self._form)
! self.__addMenuItem(dataMenu, _("&Previous Record\tUp"),_('Navigate to
previous record in memory.'),'requestPREVRECORD', form=self._form)
! self.__addMenuItem(dataMenu, _("&Next Record\tDown"),_('Navigate to
next record in memory.'),'requestNEXTRECORD', form=self._form)
! self.__addMenuItem(dataMenu, _("&Last Record\tCtrl+Down"),_('Navigate
to last record in memory.'),'requestLASTRECORD', form=self._form)
! self.__addMenuItem(dataMenu, _("&Jump to Record...\tF2"),_('Prompts for
a record number to which the system should jump.'),
'requestJUMPTO',form=self._form)
! #id = self.__addMenuItem(dataMenu, _("&Jump to
Record...\tF2"),_('Prompts for a record number to which the system should
jump.'), form=self._form)
!
! #EVT_MENU(self._uiDriver._wxapp, id, _PROMPTFORRECORD)
! #self.__eventMenuMapping['_promptForRecord_'] = id
!
! self.__addMenuItem(dataMenu, _("N&ew Record\tF12"),_('Create a new
record for data input.'),'requestNEWRECORD', form=self._form)
! self.__addMenuItem(dataMenu, _("Mark Record for &Delete\tF5"),_('Mark
record for removal at next commit.'),'requestMARKFORDELETE', form=self._form)
!
! dataMenu.AppendSeparator()
! self.__addMenuItem(dataMenu, _("Next &Block\tPgDn"),_('Navigate to next
data block.'),'requestNEXTBLOCK', form=self._form)
! self.__addMenuItem(dataMenu, _("P&revious Block\tPgUp"),_('Navigate to
previous data block.'),'requestPREVBLOCK', form=self._form)
!
! dataMenu.AppendSeparator()
! self.__addMenuItem(dataMenu, _("&Enter Query\tF8"),_('Switch to input
query mask mode.'),'requestENTERQUERY', form=self._form)
! self.__addMenuItem(dataMenu, _("Execute &Query\tF9"), _('Execute query
using current mask.'),'requestEXECQUERY', form=self._form)
!
! helpMenu = wxMenu()
! self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe
Forms.'),'requestABOUT', form=self._form)
!
! menuBar = wxMenuBar()
! menuBar.Append( fileMenu, _("&File") )
! menuBar.Append( editMenu, _("&Edit") )
! menuBar.Append( dataMenu, _("&Data") )
! menuBar.Append( helpMenu, _("&Help") )
!
! self._menuBar = menuBar
! self.mainWindow.SetMenuBar( self._menuBar );
#
# Build Toolbar
#
! if 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
--- 107,127 ----
## mainWindowSize = wxSize(20+tempx, 20+tempy)
## self.mainWindow.SetSize(mainWindowSize)
+
+
#
# 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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms src/GFForm.py src/GFInstance.py src/...,
Jason Cater <=