[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms doc/Developers-Guide.sxw samples/dia...
|
From: |
James Thompson |
|
Subject: |
gnue/forms doc/Developers-Guide.sxw samples/dia... |
|
Date: |
Sat, 08 Mar 2003 23:08:51 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 03/03/08 23:08:51
Modified files:
forms/doc : Developers-Guide.sxw
forms/samples/dialog: dialog.gfd
forms/src : GFForm.py GFInstance.py
forms/src/dialogs/jumpto: jumpto.gfd
forms/src/uidrivers/curses: UIdriver.py
forms/src/uidrivers/gtk2: UIdriver.py
forms/src/uidrivers/qt: common.py
forms/src/uidrivers/qt/widgets/form: widget.py
forms/src/uidrivers/win32: common.py
forms/src/uidrivers/win32/widgets/form: widget.py
forms/src/uidrivers/wx: common.py
forms/src/uidrivers/wx/widgets: _base.py entry.py
forms/src/uidrivers/wx/widgets/form: widget.py
Log message:
removed unneeded code from ui drivers
no longer display previous entry's tip if a entry doesn't have it's own
previous record fix to allow it to work if entry immeidiately prior to
current entry isn't navigable
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/Developers-Guide.sxw.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/samples/dialog/dialog.gfd.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.231&tr2=1.232&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/jumpto/jumpto.gfd.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/common.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/qt/widgets/form/widget.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/common.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/form/widget.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/common.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/_base.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/widgets/entry.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.10&tr2=1.11&r1=text&r2=text
Patches:
Index: gnue/forms/doc/Developers-Guide.sxw
Index: gnue/forms/samples/dialog/dialog.gfd
diff -c gnue/forms/samples/dialog/dialog.gfd:1.5
gnue/forms/samples/dialog/dialog.gfd:1.6
*** gnue/forms/samples/dialog/dialog.gfd:1.5 Wed Dec 11 23:08:09 2002
--- gnue/forms/samples/dialog/dialog.gfd Sat Mar 8 23:08:50 2003
***************
*** 27,32 ****
--- 27,38 ----
</layout>
<dialog xmlns:c="GNUe:Layout:Char" name="selector">
+ <trigger type="On-Startup">
+ form.setFeature('GUI:MENUBAR:SUPPRESS',1)
+ form.setFeature('GUI:TOOLBAR:SUPPRESS',1)
+ form.setFeature('GUI:STATUSBAR:SUPPRESS',1)
+ </trigger>
+
<options/>
<datasource name="dtsDrpStaticdrop1" type="static">
<staticset fields="key,descr">
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.231 gnue/forms/src/GFForm.py:1.232
*** gnue/forms/src/GFForm.py:1.231 Thu Mar 6 17:04:34 2003
--- gnue/forms/src/GFForm.py Sat Mar 8 23:08:50 2003
***************
*** 583,598 ****
else:
source = self._currentBlock._focusOrder
for object in source:
if ((object._navigable) and ((not object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
nextEntry = object
lastEntry = object
keepNext = 0
for object in source:
# Put the first field as the next to rollover
! if ((not object.hidden) and ((not object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
if object == self._currentEntry:
break
--- 583,605 ----
else:
source = self._currentBlock._focusOrder
+ #
+ # Find the last focusable entry in the focus list
+ #
for object in source:
if ((object._navigable) and ((not object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
nextEntry = object
lastEntry = object
+ #
+ # Find the first navigable field prior to the
+ # field losing focus
+ #
keepNext = 0
for object in source:
# Put the first field as the next to rollover
! if ((object._navigable) and (not object.hidden) and ((not
object.readonly) or
(self._currentBlock.mode=='query' and object._queryable))):
if object == self._currentEntry:
break
***************
*** 733,740 ****
instance.addFormFromFile(fileName)
instance.activate()
! def triggerActivateDialog(self,dialogName,parameters):
! self._instance.activateForm(dialogName,parameters)
# Close this form.
def close(self):
--- 740,747 ----
instance.addFormFromFile(fileName)
instance.activate()
! def triggerActivateDialog(self,dialogName, parameters={}, modal=0):
! self._instance.activateForm(dialogName,parameters, modal)
# Close this form.
def close(self):
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.94 gnue/forms/src/GFInstance.py:1.95
*** gnue/forms/src/GFInstance.py:1.94 Thu Mar 6 17:04:34 2003
--- gnue/forms/src/GFInstance.py Sat Mar 8 23:08:50 2003
***************
*** 450,456 ****
--- 450,458 ----
def previousEntry(self, event):
if not event._form.endEditing():
return
+
event._form.previousEntry()
+
self.dispatchEvent('gotoENTRY',object=event._form._currentEntry,
_form=event._form)
self.updateRecordStatus(event._form)
self.updateTip(event._form)
Index: gnue/forms/src/dialogs/jumpto/jumpto.gfd
diff -c gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.4
gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.5
*** gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.4 Wed Mar 5 21:06:03 2003
--- gnue/forms/src/dialogs/jumpto/jumpto.gfd Sat Mar 8 23:08:50 2003
***************
*** 9,14 ****
--- 9,17 ----
form.setFeature('GUI:TOOLBAR:SUPPRESS',1)
form.setFeature('GUI:STATUSBAR:SUPPRESS',1)
</trigger>
+ <trigger type="on-activate">
+ Block_1.Entry_1 = ''
+ </trigger>
<options/>
<logic>
<block name="Block_1">
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.35
gnue/forms/src/uidrivers/curses/UIdriver.py:1.36
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.35 Thu Mar 6 22:25:41 2003
--- gnue/forms/src/uidrivers/curses/UIdriver.py Sat Mar 8 23:08:50 2003
***************
*** 144,150 ****
self.mainWindow.Run()
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip: self.statusBar.SetText(0,str(tip))
if statusValue:
self.statusBar.SetText(1,statusValue)
--- 144,150 ----
self.mainWindow.Run()
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip != None: self.statusBar.SetText(0,str(tip))
if statusValue:
self.statusBar.SetText(1,statusValue)
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.21
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.22
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.21 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py Sat Mar 8 23:08:50 2003
***************
*** 573,579 ****
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip:
self.statusBar1.push(self.statusBar1.get_context_id("tip"),str(tip))
#$self.statusBar.push(self.statusBar.get_context_id("status bar"),"Shri
Harih")
#$self.statusBar.get_context_id("")
--- 573,579 ----
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip != None:
self.statusBar1.push(self.statusBar1.get_context_id("tip"),str(tip))
#$self.statusBar.push(self.statusBar.get_context_id("status bar"),"Shri
Harih")
#$self.statusBar.get_context_id("")
Index: gnue/forms/src/uidrivers/qt/common.py
diff -c gnue/forms/src/uidrivers/qt/common.py:1.5
gnue/forms/src/uidrivers/qt/common.py:1.6
*** gnue/forms/src/uidrivers/qt/common.py:1.5 Sat Mar 8 00:11:22 2003
--- gnue/forms/src/uidrivers/qt/common.py Sat Mar 8 23:08:50 2003
***************
*** 56,70 ****
'':''
}
- disabledColour = 0 # wxLIGHT_GREY
-
- def setDisabledColour(color):
- global disabledColour
- disabledColour = color
-
- def getDisabledColour():
- global disabledColour
- return disabledColour
# hack for wxPython 2.2 (2.3+ doesn't need this)
--- 56,61 ----
Index: gnue/forms/src/uidrivers/qt/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.6
gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.7
*** gnue/forms/src/uidrivers/qt/widgets/form/widget.py:1.6 Sat Mar 8
12:24:40 2003
--- gnue/forms/src/uidrivers/qt/widgets/form/widget.py Sat Mar 8 23:08:50 2003
***************
*** 156,162 ****
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip: self.statusFields[0].setText(str(tip))
if statusValue:
self.statusFields[1].setText(statusValue)
--- 156,162 ----
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip != None: self.statusFields[0].setText(str(tip))
if statusValue:
self.statusFields[1].setText(statusValue)
Index: gnue/forms/src/uidrivers/win32/common.py
diff -c gnue/forms/src/uidrivers/win32/common.py:1.3
gnue/forms/src/uidrivers/win32/common.py:1.4
*** gnue/forms/src/uidrivers/win32/common.py:1.3 Mon Mar 3 16:28:07 2003
--- gnue/forms/src/uidrivers/win32/common.py Sat Mar 8 23:08:50 2003
***************
*** 36,50 ****
_idPos += 1
return _idPos
- disabledColour = 0 # wxLIGHT_GREY
-
- def setDisabledColour(color):
- global disabledColour
- disabledColour = color
-
- def getDisabledColour():
- global disabledColour
- return disabledColour
# hack for wxPython 2.2 (2.3+ doesn't need this)
--- 36,41 ----
Index: gnue/forms/src/uidrivers/win32/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.5
gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.6
*** gnue/forms/src/uidrivers/win32/widgets/form/widget.py:1.5 Sat Mar 8
14:59:07 2003
--- gnue/forms/src/uidrivers/win32/widgets/form/widget.py Sat Mar 8
23:08:50 2003
***************
*** 173,179 ****
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip:
win32gui.SendMessage(self.statusBar.GetId(), commctrl.SB_SETTEXT, 0,
str(tip))
if statusValue:
--- 173,179 ----
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
! if tip != None:
win32gui.SendMessage(self.statusBar.GetId(), commctrl.SB_SETTEXT, 0,
str(tip))
if statusValue:
Index: gnue/forms/src/uidrivers/wx/common.py
diff -c gnue/forms/src/uidrivers/wx/common.py:1.3
gnue/forms/src/uidrivers/wx/common.py:1.4
*** gnue/forms/src/uidrivers/wx/common.py:1.3 Tue Mar 4 21:04:33 2003
--- gnue/forms/src/uidrivers/wx/common.py Sat Mar 8 23:08:50 2003
***************
*** 26,41 ****
'cp1252': wxFONTENCODING_CP1252
}
- disabledColour = 0 # wxLIGHT_GREY
-
- def setDisabledColour(color):
- global disabledColour
- disabledColour = color
-
- def getDisabledColour():
- global disabledColour
- return disabledColour
-
# hack for wxPython 2.2 (2.3+ doesn't need this)
def _eventObjTowxWindow(event):
--- 26,31 ----
***************
*** 139,144 ****
--- 129,135 ----
uiBaseEvtHandler.__init__(self, eventList, eventProcessor, uiDriver)
def _processEvent(self,event):
+
action = None
# hack for swig shortcomming needed by wxPython 2.2.x (2.3 does not need
this)
# compute the location of the character in the widget
Index: gnue/forms/src/uidrivers/wx/widgets/_base.py
diff -c gnue/forms/src/uidrivers/wx/widgets/_base.py:1.6
gnue/forms/src/uidrivers/wx/widgets/_base.py:1.7
*** gnue/forms/src/uidrivers/wx/widgets/_base.py:1.6 Tue Mar 4 21:04:33 2003
--- gnue/forms/src/uidrivers/wx/widgets/_base.py Sat Mar 8 23:08:51 2003
***************
*** 127,135 ****
--- 127,141 ----
widget.SetValue(value)
widget.Enable(enabled)
widget.SetEvtHandlerEnabled(TRUE)
+ if object.height > 1:
+ print "OBJ", object.name, object.height, widget.__origBackgroundColor
if enabled:
+ if object.height > 1:
+ print "enabled"
widget.SetBackgroundColour(widget.__origBackgroundColor)
else:
+ if object.height > 1:
+ print
"disabled",self._uiDriver._disabledColour,widget.__origBackgroundColor
widget.SetBackgroundColour(self._uiDriver._disabledColour)
widget.Refresh()
Index: gnue/forms/src/uidrivers/wx/widgets/entry.py
diff -c gnue/forms/src/uidrivers/wx/widgets/entry.py:1.2
gnue/forms/src/uidrivers/wx/widgets/entry.py:1.3
*** gnue/forms/src/uidrivers/wx/widgets/entry.py:1.2 Sun Mar 2 11:42:26 2003
--- gnue/forms/src/uidrivers/wx/widgets/entry.py Sat Mar 8 23:08:51 2003
***************
*** 72,78 ****
elif style == 'checkbox':
newWidget = wxCheckBox(event.container, -1, "",defaultPoint,
wxSize(2*event.textWidth,event.textHeight),
! wxNO_BORDER)
if event.initialize:
newWidget.SetValue(0)
EVT_CHECKBOX(newWidget, newWidget.GetId(), self.checkboxHandler)
--- 72,78 ----
elif style == 'checkbox':
newWidget = wxCheckBox(event.container, -1, "",defaultPoint,
wxSize(2*event.textWidth,event.textHeight),
! wxNO_BORDER|wxWANTS_CHARS)
if event.initialize:
newWidget.SetValue(0)
EVT_CHECKBOX(newWidget, newWidget.GetId(), self.checkboxHandler)
***************
*** 109,114 ****
--- 109,115 ----
self._eventHandler(action)
def checkboxHandler(self,event):
+ action = None
if event.GetEventType() == wxEVT_COMMAND_CHECKBOX_CLICKED:
object = _eventObjTowxWindow(event)
id = object.GetId()
***************
*** 116,122 ****
gfObject = self._uiDriver._IdToGFObj[id]
eventdata = [gfObject, event.GetString()]
action = events.Event('requestTOGGLECHKBOX', _form=gfObject._form)
! self._eventHandler(action)
configuration = {
'baseClass' : UIEntry,
--- 117,123 ----
gfObject = self._uiDriver._IdToGFObj[id]
eventdata = [gfObject, event.GetString()]
action = events.Event('requestTOGGLECHKBOX', _form=gfObject._form)
! self._eventHandler(action)
configuration = {
'baseClass' : UIEntry,
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.10
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.11
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.10 Sat Mar 8
12:24:43 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py Sat Mar 8 23:08:51 2003
***************
*** 154,160 ****
if not self.statusBar:
return
! if tip: self.statusBar.SetStatusText(str(tip),0)
if statusValue:
self.statusBar.SetStatusText(statusValue,1)
--- 154,160 ----
if not self.statusBar:
return
! if tip != None: self.statusBar.SetStatusText(str(tip),0)
if statusValue:
self.statusBar.SetStatusText(statusValue,1)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms doc/Developers-Guide.sxw samples/dia...,
James Thompson <=