[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms src/GFForm.py src/GFObjects/GFBlock....
|
From: |
Jason Cater |
|
Subject: |
gnue/forms src/GFForm.py src/GFObjects/GFBlock.... |
|
Date: |
Sat, 01 Mar 2003 15:30:00 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/03/01 15:29:33
Modified files:
forms/src : GFForm.py
forms/src/GFObjects: GFBlock.py
forms/src/uidrivers/_base: UserActions.py
forms/src/uidrivers/_commonGuiToolkit: MenuBar.py ToolBar.py
forms/src/uidrivers/wx: MenuBar.py ToolBar.py
Added files:
forms/images : jumpprompt-16x16.png jumpprompt-32x32.png
Removed files:
forms/images : jumprecord-16x16.png jumprecord-32x32.png
Log message:
more work on new toolbar and menubar (added enable/disable functions)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/jumpprompt-16x16.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/images/jumpprompt-32x32.png?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.226&tr2=1.227&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBlock.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UserActions.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.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/ToolBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/MenuBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/ToolBar.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.226 gnue/forms/src/GFForm.py:1.227
*** gnue/forms/src/GFForm.py:1.226 Sat Mar 1 00:50:43 2003
--- gnue/forms/src/GFForm.py Sat Mar 1 15:29:32 2003
***************
*** 704,710 ****
if self._currentBlock.mode == 'query':
GDebug.printMesg(5,'Cannot go to last record: in query mode!')
return
- self._currentBlock.lastRecord()
def nextRecord(self):
if self._currentBlock.mode == 'query':
--- 704,709 ----
Index: gnue/forms/src/GFObjects/GFBlock.py
diff -c gnue/forms/src/GFObjects/GFBlock.py:1.75
gnue/forms/src/GFObjects/GFBlock.py:1.76
*** gnue/forms/src/GFObjects/GFBlock.py:1.75 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/GFObjects/GFBlock.py Sat Mar 1 15:29:32 2003
***************
*** 249,254 ****
--- 249,274 ----
# This for loop is probably better somewhere else
entry.recalculateVisible( adjustment, self._currentRecord,
self._recordCount)
self._form.updateUIEntry(field)
+
+ # Signal the UI Drivers of navigation button relevance
+ if self._form._currentBlock == self:
+ if self._resultSet.isFirstRecord():
+ self._form.dispatchEvent('cannotPREVRECORD')
+ self._form.dispatchEvent('cannotFIRSTRECORD')
+ else:
+ self._form.dispatchEvent('canPREVRECORD')
+ self._form.dispatchEvent('canFIRSTRECORD')
+
+ if self._resultSet.isLastRecord():
+ self._form.dispatchEvent('cannotLASTRECORD')
+ ## if self._resultSet.current.isEmpty():
+ ## self._form.dispatchEvent('cannotNEXTRECORD')
+ else:
+ self._form.dispatchEvent('canNEXTRECORD')
+ self._form.dispatchEvent('canLASTRECORD')
+
+
+
Index: gnue/forms/src/uidrivers/_base/UserActions.py
diff -c gnue/forms/src/uidrivers/_base/UserActions.py:1.2
gnue/forms/src/uidrivers/_base/UserActions.py:1.3
*** gnue/forms/src/uidrivers/_base/UserActions.py:1.2 Sat Mar 1 00:50:43 2003
--- gnue/forms/src/uidrivers/_base/UserActions.py Sat Mar 1 15:29:32 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:
***************
*** 40,47 ****
class UserAction:
! def __init__(self, event, description, help):
self.event = event
self.__iconloc = {}
# Description is short; appropriate for mouse-over tips
--- 40,48 ----
class UserAction:
! def __init__(self, event, description, help, canToggle=0):
self.event = event
+ self.canToggle = canToggle
self.__iconloc = {}
# Description is short; appropriate for mouse-over tips
***************
*** 122,133 ****
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.") ),
--- 123,134 ----
help=_("Paste text into the current field.") ),
UserAction(
! event="PREVENTRY",
description=_("Move to the previous logicalfield."),
help=_("Move to the previous logical field.") ),
UserAction(
! event="NEXTENTRY",
description=_("Move to the next logicalfield."),
help=_("Move to the next logical field.") ),
***************
*** 179,185 ****
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.') ),
UserAction(
event="COPYQUERY",
--- 180,187 ----
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",
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.3
gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.4
*** gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py:1.3 Sat Mar 1
00:50:44 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/MenuBar.py Sat Mar 1
15:29:32 2003
***************
*** 104,124 ****
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)
--- 104,124 ----
name, contents = item
if type(contents) == StringType:
userAction = UserActions.userActionMap[contents]
! self.__actionMap[userAction.event] = self.addAction(name, parent,
userAction)
self.driver.registerEventListeners(
! {'can%s' % userAction.event: self.__canRequestEvent,
! 'cannot%s' % userAction.event: self.__cannotRequestEvent })
else:
m = self.addMenu(name, parent)
self.__createmenu(contents, m)
def __canRequestEvent(self, event):
! item = self.__actionMap[event.__event__[3:]]
self.enableItem(item)
def __cannotRequestEvent(self, event):
! item = self.__actionMap[event.__event__[6:]]
self.disableItem(item)
***************
*** 150,157 ****
('&Delete Current Record','MARKFORDELETE') ) ),
( '&Navigation', (
! ('&Next Field', "NEXTFIELD"),
! ('&Previous Field', "PREVFIELD"),
None,
('Next &Record', "NEXTRECORD"),
('Previous R&ecord', "PREVRECORD"),
--- 150,157 ----
('&Delete Current Record','MARKFORDELETE') ) ),
( '&Navigation', (
! ('&Next Entry', "NEXTENTRY"),
! ('&Previous Entry', "PREVENTRY"),
None,
('Next &Record', "NEXTRECORD"),
('Previous R&ecord', "PREVRECORD"),
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.1
gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.2
*** gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py:1.1 Sat Mar 1
00:50:44 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/ToolBar.py Sat Mar 1
15:29:32 2003
***************
*** 100,128 ****
else:
name, contents = item
userAction = UserActions.userActionMap[contents]
! self.addAction(name, userAction)
! self.driver.registerEventListeners(
! { 'can%s' % userAction.event: self.__canRequestEvent,
! 'cannot%s' % userAction.event: self.__cannotRequestEvent,
! 'begin%s' % userAction.event: self.__beginRequestEvent,
! 'end%s' % userAction.event: self.__endRequestEvent })
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)
def __beginRequestEvent(self, event):
! item = self.__actionMap[event.__event__[10:]]
self.startingItem(item)
def __endRequestEvent(self, event):
! item = self.__actionMap[event.__event__[10:]]
self.endingItem(item)
--- 100,133 ----
else:
name, contents = item
userAction = UserActions.userActionMap[contents]
! self.__actionMap[userAction.event] = self.addAction(name,
userAction)
! eventListeners = {
! 'can%s' % userAction.event: self.__canRequestEvent,
! 'cannot%s' % userAction.event: self.__cannotRequestEvent }
!
! if userAction.canToggle:
! eventListeners.update( {
! 'begin%s' % userAction.event: self.__beginRequestEvent,
! 'end%s' % userAction.event: self.__endRequestEvent } )
!
! self.driver.registerEventListeners(eventListeners)
def __canRequestEvent(self, event):
! item = self.__actionMap[event.__event__[3:]]
self.enableItem(item)
def __cannotRequestEvent(self, event):
! item = self.__actionMap[event.__event__[6:]]
self.disableItem(item)
def __beginRequestEvent(self, event):
! item = self.__actionMap[event.__event__[5:]]
self.startingItem(item)
def __endRequestEvent(self, event):
! item = self.__actionMap[event.__event__[3:]]
self.endingItem(item)
Index: gnue/forms/src/uidrivers/wx/MenuBar.py
diff -c gnue/forms/src/uidrivers/wx/MenuBar.py:1.1
gnue/forms/src/uidrivers/wx/MenuBar.py:1.2
*** gnue/forms/src/uidrivers/wx/MenuBar.py:1.1 Sat Mar 1 00:50:44 2003
--- gnue/forms/src/uidrivers/wx/MenuBar.py Sat Mar 1 15:29:33 2003
***************
*** 55,61 ****
label = name
hotkey = userAction.getHotKeyText()
iconloc = userAction.getIconLocation(size="16x16")
!
if hotkey:
label += '\t%s' % hotkey
--- 55,61 ----
label = name
hotkey = userAction.getHotKeyText()
iconloc = userAction.getIconLocation(size="16x16")
!
if hotkey:
label += '\t%s' % hotkey
***************
*** 77,82 ****
--- 77,83 ----
item.SetBitmap(icon)
parent.AppendItem(item)
+ parent.SetLabel(id, label)
return item
# Add a separator
***************
*** 91,94 ****
def disableItem(self, item):
item.Enable(0)
! _cachedIcons = {}
\ No newline at end of file
--- 92,95 ----
def disableItem(self, item):
item.Enable(0)
! _cachedIcons = {}
Index: gnue/forms/src/uidrivers/wx/ToolBar.py
diff -c gnue/forms/src/uidrivers/wx/ToolBar.py:1.1
gnue/forms/src/uidrivers/wx/ToolBar.py:1.2
*** gnue/forms/src/uidrivers/wx/ToolBar.py:1.1 Sat Mar 1 00:50:44 2003
--- gnue/forms/src/uidrivers/wx/ToolBar.py Sat Mar 1 15:29:33 2003
***************
*** 52,59 ****
id = wxNewId()
event = 'request' + userAction.event
! EVT_TOOL(self.driver._wxapp, id,
! lambda event, toolevt=self.__toolEvent, i=id, e=event: toolevt(i, e))
# Set the action icon if available
if iconloc:
--- 52,59 ----
id = wxNewId()
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))
# Set the action icon if available
if iconloc:
***************
*** 68,74 ****
return
! self.toolbar.AddSimpleTool(id, icon, userAction.description or '',
isToggle=1)
self.toolbar.Realize()
return id
--- 68,75 ----
return
! self.toolbar.AddSimpleTool(id, icon, userAction.description or '',
! isToggle=userAction.canToggle)
self.toolbar.Realize()
return id
***************
*** 87,100 ****
self.toolbar.EnableTool(item, 0)
def startingItem(self, item):
! self.toolBar.ToggleTool(item,1)
def endingItem(self, item):
! self.toolBar.ToggleTool(item,0)
- def __toolEvent(self, id, action):
- self.toolbar.ToggleTool(id, 0)
- self.driver.dispatchEvent(action, _form=self.form)
!
! _cachedIcons = {}
\ No newline at end of file
--- 88,97 ----
self.toolbar.EnableTool(item, 0)
def startingItem(self, item):
! self.toolbar.ToggleTool(item,1)
def endingItem(self, item):
! self.toolbar.ToggleTool(item,0)
! _cachedIcons = {}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms src/GFForm.py src/GFObjects/GFBlock....,
Jason Cater <=