[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src GFInstance.py dialogs/jumpto/jum...
|
From: |
James Thompson |
|
Subject: |
gnue/forms/src GFInstance.py dialogs/jumpto/jum... |
|
Date: |
Tue, 04 Mar 2003 19:21:34 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 03/03/04 19:21:34
Modified files:
forms/src : GFInstance.py
forms/src/dialogs/jumpto: jumpto.gfd
forms/src/uidrivers/_base: UIdriver.py
forms/src/uidrivers/_commonGuiToolkit: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
forms/src/uidrivers/wx/widgets: _base.py
forms/src/uidrivers/wx/widgets/form: widget.py wrappers.py
Log message:
start of modal dialog support (working but w/ focus issues)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/jumpto/jumpto.gfd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.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/UIdriver.py.diff?tr1=1.238&tr2=1.239&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/_base.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/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/wx/widgets/form/wrappers.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.89 gnue/forms/src/GFInstance.py:1.90
*** gnue/forms/src/GFInstance.py:1.89 Mon Mar 3 20:31:08 2003
--- gnue/forms/src/GFInstance.py Tue Mar 4 19:21:33 2003
***************
*** 273,279 ****
# Builds a UI based upon a specific form and
# sets that form to active status
#
! def activateForm(self,formName='__main__',parameters={}):
self._form = self._formsDictionary[formName]
if parameters != {}:
--- 273,279 ----
# Builds a UI based upon a specific form and
# sets that form to active status
#
! def activateForm(self,formName='__main__',parameters={}, modal=0):
self._form = self._formsDictionary[formName]
if parameters != {}:
***************
*** 284,290 ****
self._form.processTrigger('On-Activation')
! self._uiinstance.activateForm(formName)
self.dispatchEvent('gotoENTRY',object=self._form._currentEntry,
_form=self._form)
--- 284,291 ----
self._form.processTrigger('On-Activation')
! print "survey says modal = ",modal
! self._uiinstance.activateForm(formName,modal)
self.dispatchEvent('gotoENTRY',object=self._form._currentEntry,
_form=self._form)
***************
*** 664,670 ****
'author' : event._form.getOption('author') or "Unknown",
'description' : event._form.getOption('description') or "Unknown",
}
! self.activateForm('_about', parameters)
#self.dispatchEvent('uiABOUT',[VERSION,name,formversion,author,description])
--- 665,671 ----
'author' : event._form.getOption('author') or "Unknown",
'description' : event._form.getOption('description') or "Unknown",
}
! self.activateForm('_about', parameters, modal=1)
#self.dispatchEvent('uiABOUT',[VERSION,name,formversion,author,description])
***************
*** 676,703 ****
#
def requestJumpTo(self,event):
parameters = {
! 'recordNumber': ''
}
! self.activateForm('_jumpto', parameters)
! #
! # TODO: this isn't going to work
! # print "JUMPTO",parameters
! # if not parameters.has_key('cancel'):
! # if not event._form.endEditing():
! # return
! # try:
! # count = abs(int(event.data))-1
! # except ValueError:
! # message = _("Invalid numeric value entered.")
! # else:
! # message = event._form.jumpRecord(count)
! #
! # if message:
! # messageBox = GFMsgBox(self,message)
! # messageBox.show()
! # return
! #
! # self._entryUpdated()
#
# toggleInsertMode(self):
--- 677,703 ----
#
def requestJumpTo(self,event):
parameters = {
! 'recordnumber': ''
}
! self.activateForm('_jumpto', parameters, modal=1)
!
! if not parameters.has_key('cancel'):
! if not event._form.endEditing():
! return
! try:
! count = abs(int(float(parameters['recordnumber'])))-1
! print "COUNT",count
! except ValueError:
! message = _("Invalid numeric value entered.")
! else:
! message = event._form.jumpRecord(count)
!
! if message:
! messageBox = GFMsgBox(self,message)
! messageBox.show()
! return
!
! self._entryUpdated()
#
# toggleInsertMode(self):
Index: gnue/forms/src/dialogs/jumpto/jumpto.gfd
diff -c gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.2
gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.3
*** gnue/forms/src/dialogs/jumpto/jumpto.gfd:1.2 Mon Mar 3 20:31:08 2003
--- gnue/forms/src/dialogs/jumpto/jumpto.gfd Tue Mar 4 19:21:33 2003
***************
*** 26,32 ****
<trigger name="Trigger1" type="On-Action"><![CDATA[##
## [Button On-Action Trigger]
##
! setParameter('recordNumber',Block_1.Entry_1)
close()
]]></trigger>
--- 26,32 ----
<trigger name="Trigger1" type="On-Action"><![CDATA[##
## [Button On-Action Trigger]
##
! setParameter('recordNumber',"%s" % Block_1.Entry_1)
close()
]]></trigger>
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.91
gnue/forms/src/uidrivers/_base/UIdriver.py:1.92
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.91 Mon Mar 3 19:44:54 2003
--- gnue/forms/src/uidrivers/_base/UIdriver.py Tue Mar 4 19:21:33 2003
***************
*** 247,256 ****
# activateForm
#
! def activateForm(self,formName):
self._form = self._formNameToGFForm[formName]
! self._activateForm(self._form)
#############################################################################
--- 247,256 ----
# activateForm
#
! def activateForm(self,formName, modal=0):
self._form = self._formNameToGFForm[formName]
! self._activateForm(self._form, modal)
#############################################################################
Index: gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.py
diff -c gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.py:1.1
gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.py:1.2
*** gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.py:1.1 Wed Feb 26
03:05:35 2003
--- gnue/forms/src/uidrivers/_commonGuiToolkit/UIdriver.py Tue Mar 4
19:21:34 2003
***************
*** 126,131 ****
--- 126,132 ----
def _activateForm(self, form):
# Go ahead and display
+ print "I'm not really being called you foolz!"
# TODO : hack!!!!!!!!!!!!!!
for key in self._formNameToUIForm.keys():
if self._formNameToUIForm[key]._form == form:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.238
gnue/forms/src/uidrivers/wx/UIdriver.py:1.239
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.238 Mon Mar 3 19:44:54 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py Tue Mar 4 19:21:34 2003
***************
*** 137,143 ****
! def _activateForm(self, form):
# Go ahead and display
# TODO : hack!!!!!!!!!!!!!!
--- 137,143 ----
! def _activateForm(self, form, modal=0):
# Go ahead and display
# TODO : hack!!!!!!!!!!!!!!
***************
*** 145,156 ****
if self._formNameToUIForm[key]._form == form:
break
! self._formNameToUIForm[key].mainWindow.Raise()
! self._formNameToUIForm[key].mainWindow.Show(1)
! self._formNameToUIForm[key].show()
!
! ##treeShow(self._formNameToUIForm[key].mainWindow, self)
!
#############################################################################
#
--- 145,158 ----
if self._formNameToUIForm[key]._form == form:
break
! #self._formNameToUIForm[key].mainWindow.Raise()
!
! if modal:
! print "I'm going post^H^H^H^Hmodal!"
! self._formNameToUIForm[key].showModal()
! else:
! self._formNameToUIForm[key].show()
!
#############################################################################
#
Index: gnue/forms/src/uidrivers/wx/widgets/_base.py
diff -c gnue/forms/src/uidrivers/wx/widgets/_base.py:1.4
gnue/forms/src/uidrivers/wx/widgets/_base.py:1.5
*** gnue/forms/src/uidrivers/wx/widgets/_base.py:1.4 Mon Mar 3 16:28:07 2003
--- gnue/forms/src/uidrivers/wx/widgets/_base.py Tue Mar 4 19:21:34 2003
***************
*** 86,95 ****
widget.Show(0)
def showModal(self):
! self.ShowModal()
def destroy(self):
! self.Destroy()
def indexedFocus(self, index):
self.widgets[index].SetFocus()
--- 86,97 ----
widget.Show(0)
def showModal(self):
! for widget in self.widgets:
! widget.ShowModal()
def destroy(self):
! for widget in self.widgets:
! self.Destroy()
def indexedFocus(self, index):
self.widgets[index].SetFocus()
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.6
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.7
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.6 Mon Mar 3
09:58:01 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py Tue Mar 4 19:21:34 2003
***************
*** 48,53 ****
--- 48,54 ----
def __init__(self, event):
self._uiPageList=[]
+ self.statusBar = None
UIHelper.__init__(self, event)
***************
*** 69,87 ****
# The main frame of this form
! self.mainWindow = wxFrame(NULL, -1, "", wxDefaultPosition)
self.mainWindow.SetTitle(str(self._form.title))
EVT_CLOSE(self.mainWindow,self.closeTrap)
initFont(self.mainWindow,1)
! # The status bar
! self.statusBar = self.mainWindow.CreateStatusBar()
! self.statusBar.SetFieldsCount(5)
! self.statusBar.SetStatusWidths([-1,50,50,75,75])
! initFont(self.statusBar,0)
# A window that provides the scrollbars
! self._scrollWindow = self.mainWindow.panel =
wxScrolledWindow(self.mainWindow,-1, wxDefaultPosition)
self._scrollWindow.Show(1)
--- 70,96 ----
# The main frame of this form
! if self._form.name == '__main__':
! self.mainWindow = wxFrame(NULL, -1, "", wxDefaultPosition)
! self.containerFrame = self.mainWindow
! else:
! self.mainWindow = wxDialog(NULL,-1,"",wxDefaultPosition)
! self.containerFrame = self.mainWindow
!
self.mainWindow.SetTitle(str(self._form.title))
EVT_CLOSE(self.mainWindow,self.closeTrap)
initFont(self.mainWindow,1)
! # The status bar
! print "type", type(self.mainWindow)
! if isinstance(self.mainWindow,wxFrame):
! self.statusBar = self.containerFrame.CreateStatusBar()
! self.statusBar.SetFieldsCount(5)
! self.statusBar.SetStatusWidths([-1,50,50,75,75])
! initFont(self.statusBar,0)
# A window that provides the scrollbars
! self._scrollWindow = self.containerFrame.panel =
wxScrolledWindow(self.containerFrame,-1, wxDefaultPosition)
self._scrollWindow.Show(1)
***************
*** 98,108 ****
# Add the menu
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
! MenuBar(self._uiDriver, self.mainWindow, self._form)
# and the Toolbar
if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
! ToolBar(self._uiDriver, self.mainWindow, self._form)
--- 107,117 ----
# Add the menu
if not self._form._features['GUI:MENUBAR:SUPPRESS']:
! MenuBar(self._uiDriver, self.containerFrame, self._form)
# and the Toolbar
if not self._form._features['GUI:TOOLBAR:SUPPRESS']:
! ToolBar(self._uiDriver, self.containerFrame, self._form)
***************
*** 143,148 ****
--- 152,160 ----
# _setStatusBar
#
def _setStatusBar(self,tip, statusValue, insertValue, currentRecord,
maxRecord, currentPage, maxPage):
+ if not self.statusBar:
+ return
+
if tip: self.statusBar.SetStatusText(str(tip),0)
if statusValue:
***************
*** 176,179 ****
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
!
--- 188,198 ----
self.statusBar.SetStatusWidths([tipWidth,statusWidth,insertWidth,recordWidth,pageWidth])
!
! def show(self):
! self.containerFrame.Show()
! self.mainWindow.Show()
! def showModal(self):
! self.containerFrame.Show()
! self.mainWindow.ShowModal()
!
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.5
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.6
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.5 Mon Mar 3
12:00:52 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py Tue Mar 4
19:21:34 2003
***************
*** 45,51 ****
class ScrollableWrapper(wxScrolledWindow):
def __init__(self, uiform):
self.uiform = uiform
! self.frame = frame = uiform.mainWindow
self.form = form = uiform._form
wxScrolledWindow.__init__(self, frame, -1)
--- 45,51 ----
class ScrollableWrapper(wxScrolledWindow):
def __init__(self, uiform):
self.uiform = uiform
! self.frame = frame = uiform.containerFrame
self.form = form = uiform._form
wxScrolledWindow.__init__(self, frame, -1)