[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/forms/src GFClient.py GFForm.py GFInstance...
|
From: |
James Thompson |
|
Subject: |
gnue/forms/src GFClient.py GFForm.py GFInstance... |
|
Date: |
Fri, 28 Feb 2003 19:15:10 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: James Thompson <address@hidden> 03/02/28 19:15:08
Modified files:
forms/src : GFClient.py GFForm.py GFInstance.py
forms/src/dialogs/about: __init__.py about.gfd
forms/src/uidrivers/_base: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
forms/src/uidrivers/wx/widgets/form: widget.py
Added files:
forms/src/dialogs/jumpto: __init__.py jumpto.gfd
Log message:
more dialog support work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.224&tr2=1.225&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/about/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/about/about.gfd.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/jumpto/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/dialogs/jumpto/jumpto.gfd?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.234&tr2=1.235&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/widget.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.64 gnue/forms/src/GFClient.py:1.65
*** gnue/forms/src/GFClient.py:1.64 Fri Feb 21 01:30:50 2003
--- gnue/forms/src/GFClient.py Fri Feb 28 19:15:06 2003
***************
*** 88,106 ****
#
# Get the user supplied parameters
#
! paramList = self.ARGUMENTS[1:]
!
! userParameters = {}
!
! for param in paramList:
! psplit = string.split(param,'=',1)
! if len(psplit) == 1:
! self.handleStartupError ( \
! 'Parameter "%s" specified, but no value supplied.' % psplit[0] )
! userParameters[string.lower(psplit[0])] = psplit[1]
!
! GDebug.printMesg(2,'Param "%s"="%s" ' % \
! (string.lower(psplit[0]), psplit[1]))
#
# Initialize user interface
--- 88,95 ----
#
# Get the user supplied parameters
#
! userParameters = self.getCommandLineParameters(self.ARGUMENTS[1:])
! print "Parameters are ", userParameters
#
# Initialize user interface
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.224 gnue/forms/src/GFForm.py:1.225
*** gnue/forms/src/GFForm.py:1.224 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/GFForm.py Fri Feb 28 19:15:06 2003
***************
*** 94,99 ****
--- 94,100 ----
# New trigger support
#
self._validTriggers = { 'ON-STARTUP': 'On-Startup',
+ 'ON-ACTIVATION': 'On-Activation',
'ON-EXIT': 'On-Exit',
'PRE-COMMIT': 'Pre-Commit',
'POST-COMMIT': 'Post-Commit' }
***************
*** 235,240 ****
--- 236,243 ----
# Set initial focus
self.findAndChangeFocus(self)
self.processTrigger('On-Startup')
+
+ print "PARAMETERS******************", self._parameters
#
# Get a user parameter. If parameter not specified, pull default value
***************
*** 748,754 ****
def triggerSetStatusText(self,tip=''):
self.dispatchEvent('uiUPDATESTATUS',tip=tip, _form=self)
! def triggerRunForm(self,fileName):
from GFInstance import GFInstance
instance = GFInstance(self._instance.manager,
self._instance.connections,
--- 751,757 ----
def triggerSetStatusText(self,tip=''):
self.dispatchEvent('uiUPDATESTATUS',tip=tip, _form=self)
! def triggerRunForm(self, fileName):
from GFInstance import GFInstance
instance = GFInstance(self._instance.manager,
self._instance.connections,
***************
*** 756,763 ****
instance.addFormFromFile(fileName)
instance.activate()
! def triggerActivateDialog(self,dialogName):
! self._instance.activateForm(dialogName)
# Close this form.
def close(self):
--- 759,766 ----
instance.addFormFromFile(fileName)
instance.activate()
! def triggerActivateDialog(self,dialogName,parameters):
! self._instance.activateForm(dialogName,parameters)
# Close this form.
def close(self):
***************
*** 780,782 ****
--- 783,787 ----
def getAuthenticatedUser(self, connection=None):
return self._instance.connections.getAuthenticatedUser(connection)
+
+
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.85 gnue/forms/src/GFInstance.py:1.86
*** gnue/forms/src/GFInstance.py:1.85 Fri Feb 21 01:30:50 2003
--- gnue/forms/src/GFInstance.py Fri Feb 28 19:15:06 2003
***************
*** 77,82 ****
--- 77,83 ----
'requestPREVRECORD' : self.prevRecord,
'requestNEXTRECORD' : self.nextRecord,
'requestRECORDNUMBER' : self.jumpToRecord,
+ 'requestJUMPTO' : self.requestJumpTo,
'requestJUMPRECORD' : self.jumpRecords,
'requestPAGE' : self.gotoPage,
'requestFOCUS' : self.changeFocus,
***************
*** 157,176 ****
#
basedir = os.path.dirname(sys.modules[self.__module__].__file__)
basedir +='/dialogs/'
-
for dialogName in dircache.listdir(basedir):
#try:
if dialogName[0] != '_' and dialogName != 'CVS':
- print "DIALOG : ",basedir+dialogName
if os.path.isfile(basedir+dialogName) and
os.path.splitext(dialogName)[1] == ".py":
dialogName = os.path.splitext(dialogName)[0]
- print "FILE", dialogName
dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
elif os.path.isdir(basedir+dialogName):
- print "DIR", dialogName
dialog = dyn_import('gnue.forms.dialogs.%s' %(dialogName))
- ## print "TYPE",type(dialog.buildForm()),dialog.buildForm()
try:
self.addFormFromBuffer(dialog.buildForm())
except:
--- 158,172 ----
***************
*** 226,232 ****
#
# Add the main form into the dictionary
#
- print "Adding ", form.name
self._formsDictionary[form.name] = form
#
--- 222,227 ----
***************
*** 252,261 ****
#
for dialog in self._formsDictionary.keys():
object = self._formsDictionary[dialog]
- print "GFInstance Initializing ", object
object.phaseInit()
-
#
# Construct an instance of the UI driver
self._uiinstance = self._uimodule.GFUserInterface(self.eventController,
self._disableSplash)
--- 247,254 ----
***************
*** 265,271 ****
# Build the UIs for all the forms
#
for dialog in self._formsDictionary.keys():
- print "Building form named ", dialog
self.buildForm(dialog)
#
--- 258,263 ----
***************
*** 279,290 ****
# Builds a UI based upon a specific form and
# sets that form to active status
#
! def activateForm(self,formName='__main__'):
self._form = self._formsDictionary[formName]
if not self._form._currentEntry:
raise _('There are no navigable widgets in this form. Unable to
display.')
self._uiinstance.activateForm(formName)
self.dispatchEvent('gotoENTRY',object=self._form._currentEntry,
--- 271,287 ----
# 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 != {}:
+ self._form._parameters=parameters
if not self._form._currentEntry:
raise _('There are no navigable widgets in this form. Unable to
display.')
+ self._form.processTrigger('On-Activation')
+
self._uiinstance.activateForm(formName)
self.dispatchEvent('gotoENTRY',object=self._form._currentEntry,
***************
*** 301,307 ****
#
def buildForm(self,formName='__main__'):
form = self._formsDictionary[formName]
- print "I'm going to build form ", form
try:
self._uiinstance.buildForm(form, formName)
--- 298,303 ----
***************
*** 657,669 ****
#
# TODO: This will go away once the generic dialog callbacks are working
def executeAbout(self,event):
! name = event._form.title or "Unknown"
! formversion = event._form.getOption('version') or "Unknown"
! author = event._form.getOption('author') or "Unknown"
! description = event._form.getOption('description') or "Unknown"
! self.activateForm('_about')
#self.dispatchEvent('uiABOUT',[VERSION,name,formversion,author,description])
#
# toggleInsertMode(self):
--- 653,681 ----
#
# TODO: This will go away once the generic dialog callbacks are working
def executeAbout(self,event):
! parameters = {
! 'appversion' : VERSION,
! 'ui_driver' : self._uiinstance.name,
! 'name' : event._form.title or "Unknown",
! 'formversion' : event._form.getOption('version') or "Unknown",
! '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])
+
+ #
+ # requestJumpTo
+ #
+ # Displays a dialog box prompting for record to jump to
+ # then jumps to the requested record
+ #
+ def requestJumpTo(self,event):
+ parameters = {
+ 'recordNumber': ''
+ }
+ self.activateForm('_jumpto', parameters)
#
# toggleInsertMode(self):
Index: gnue/forms/src/dialogs/about/__init__.py
diff -c gnue/forms/src/dialogs/about/__init__.py:1.2
gnue/forms/src/dialogs/about/__init__.py:1.3
*** gnue/forms/src/dialogs/about/__init__.py:1.2 Wed Feb 12 22:27:31 2003
--- gnue/forms/src/dialogs/about/__init__.py Fri Feb 28 19:15:07 2003
***************
*** 4,13 ****
def buildForm():
basedir = os.path.dirname(__file__)
- print "BASE DIR", basedir
formFile = open(basedir+dialogName)
form = formFile.read()
formFile.close()
return form
-
--- 4,11 ----
Index: gnue/forms/src/dialogs/about/about.gfd
diff -c gnue/forms/src/dialogs/about/about.gfd:1.2
gnue/forms/src/dialogs/about/about.gfd:1.3
*** gnue/forms/src/dialogs/about/about.gfd:1.2 Wed Feb 12 22:27:31 2003
--- gnue/forms/src/dialogs/about/about.gfd Fri Feb 28 19:15:07 2003
***************
*** 4,12 ****
Saved on: 2003-02-11 18:56:36 -->
<form style="dialog" name="_about">
<options/>
<logic>
! <block name="Block_1">
<field name="app_version"/>
<field name="ui_driver"/>
<field name="name"/>
--- 4,20 ----
Saved on: 2003-02-11 18:56:36 -->
<form style="dialog" name="_about">
+ <trigger type="on-activation" name="activate">
+ aboutBlock.name = getParameter('name')
+ aboutBlock.form_version = getParameter('formVersion')
+ aboutBlock.author = getParameter('author')
+ aboutBlock.description = getParameter('description')
+ aboutBlock.ui_driver = getParameter('ui_driver')
+ aboutBlock.app_version = getParameter('appversion')
+ </trigger>
<options/>
<logic>
! <block name="aboutBlock">
<field name="app_version"/>
<field name="ui_driver"/>
<field name="name"/>
***************
*** 15,21 ****
<field name="description"/>
</block>
</logic>
! <layout xmlns:c="GNUe:Layout:Char" c:height="15" c:width="40">
<page name="Page_1">
<label name="Label_1" text="GNUe Forms:" c:width="11" c:x="1" c:y="1"/>
<label name="Label_2" text="Version:" c:width="8" c:x="2" c:y="2"/>
--- 23,29 ----
<field name="description"/>
</block>
</logic>
! <layout xmlns:c="GNUe:Layout:Char" c:height="16" c:width="40">
<page name="Page_1">
<label name="Label_1" text="GNUe Forms:" c:width="11" c:x="1" c:y="1"/>
<label name="Label_2" text="Version:" c:width="8" c:x="2" c:y="2"/>
***************
*** 26,38 ****
<label name="Label_7" text="Description:" c:width="12" c:x="2" c:y="9"/>
<box name="Box_1" c:height="11" label="Form Information" c:width="38"
c:x="1" c:y="4"/>
! <entry block="Block_1" field="app_version" c:width="26" c:x="11"
c:y="2" style="label"/>
! <entry block="Block_1" field="ui_driver" c:width="26" c:x="11" c:y="3"
style="label"/>
! <entry block="Block_1" field="name" c:width="26" c:x="11" c:y="6"
style="label"/>
! <entry block="Block_1" field="form_version" c:width="26" c:x="11"
c:y="7" style="label"/>
! <entry block="Block_1" field="author" c:width="26" c:x="11" c:y="8"
style="label"/>
! <entry block="Block_1" field="description" c:height="4" c:width="36"
c:x="2"
! c:y="10"/>
</page>
</layout>
</form>
--- 34,53 ----
<label name="Label_7" text="Description:" c:width="12" c:x="2" c:y="9"/>
<box name="Box_1" c:height="11" label="Form Information" c:width="38"
c:x="1" c:y="4"/>
! <entry block="aboutBlock" field="app_version" c:width="26" c:x="11"
c:y="2" style="label"/>
! <entry block="aboutBlock" field="ui_driver" c:width="26" c:x="11"
c:y="3" style="label"/>
! <entry block="aboutBlock" field="name" c:width="26" c:x="11" c:y="6"
style="label"/>
! <entry block="aboutBlock" field="form_version" c:width="26" c:x="11"
c:y="7" style="label"/>
! <entry block="aboutBlock" field="author" c:width="26" c:x="11" c:y="8"
style="label"/>
! <entry block="aboutBlock" field="description" c:height="4" c:width="36"
c:x="2"
! c:y="10"/>
! <button name="btnOK" c:height="1" label="OK" c:width="8"
! c:x="17" c:y="15">
! <trigger name="ok" type="On-Action">
! print "OK"
! </trigger>
! </button>
!
</page>
</layout>
</form>
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.88
gnue/forms/src/uidrivers/_base/UIdriver.py:1.89
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.88 Mon Feb 17 02:32:53 2003
--- gnue/forms/src/uidrivers/_base/UIdriver.py Fri Feb 28 19:15:07 2003
***************
*** 43,49 ****
# Provides basic functionality.
#
class GFUserInterfaceBase(GRootObj,events.EventAware):
! def __init__(self, eventHandler):
############################################################
#
--- 43,49 ----
# Provides basic functionality.
#
class GFUserInterfaceBase(GRootObj,events.EventAware):
! def __init__(self, eventHandler, name="Undefined"):
############################################################
#
***************
*** 52,57 ****
--- 52,58 ----
############################################################
GRootObj.__init__(self, 'uiDriver', None, None)
self._type = 'UIDriver'
+ self.name = name
events.EventAware.__init__(self, eventHandler)
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.234
gnue/forms/src/uidrivers/wx/UIdriver.py:1.235
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.234 Wed Feb 26 20:33:58 2003
--- gnue/forms/src/uidrivers/wx/UIdriver.py Fri Feb 28 19:15:08 2003
***************
*** 70,82 ****
class GFUserInterface(GFUserInterfaceBase):
def __init__(self, eventController, disableSplash = None):
##commonToolkit.GFUserInterface.__init__(self,eventController)
! GFUserInterfaceBase.__init__(self,eventController)
self._disableSplash = disableSplash
! self._DIALOGS = {'about' :UIAbout,
! 'messageBox' :UIMessageBox,
! }
# Shortcut
self.images_dir =
GConfig.getInstalledBase('forms_images','common_images') + '/'
--- 70,82 ----
class GFUserInterface(GFUserInterfaceBase):
def __init__(self, eventController, disableSplash = None):
##commonToolkit.GFUserInterface.__init__(self,eventController)
! GFUserInterfaceBase.__init__(self,eventController,'wx')
self._disableSplash = disableSplash
! self._DIALOGS = {
! 'messageBox' :UIMessageBox,
! }
# Shortcut
self.images_dir =
GConfig.getInstalledBase('forms_images','common_images') + '/'
***************
*** 300,323 ****
##
#####################################################################
! #
! # UIAbout
! #
! # A dialog box providing about info
! #
! class UIAbout(wxMessageDialog, UIHelper):
! def __init__(self, interface, programVersion, formName, formVersion,
author, description):
! text = _("GNUE Forms")+"\n"+ \
! _(" Version : ")+"%s\n"+ \
! _(" Driver : UIwxpython")+"\n"+ \
! _("-= Form Info =-")+"\n"+ \
! _(" Name : ")+"%s\n"+ \
! _(" Version: ")+"%s\n"+ \
! _(" Author : ")+"%s\n"+ \
! _(" Description:")+"%s\n"
! wxMessageDialog.__init__(self, interface,
! text % (programVersion, formName
,formVersion,author,description),
! _("About"), wxOK | wxICON_INFORMATION)
#
# UImessageBox
#
--- 300,306 ----
##
#####################################################################
!
#
# UImessageBox
#
Index: gnue/forms/src/uidrivers/wx/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.1
gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.2
*** gnue/forms/src/uidrivers/wx/widgets/form/widget.py:1.1 Mon Feb 10
21:01:49 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/widget.py Fri Feb 28 19:15:08 2003
***************
*** 155,164 ****
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)
! 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)
--- 155,165 ----
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)
***************
*** 213,219 ****
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to
next record in memory.'))
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_last'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to
last record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['_promptForRecord_'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_jump'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Jump to Record"),_('Navigate
to user specified record in memory.'))
mainToolBar.AddSeparator()
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestENTERQUERY'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query_prep'),
--- 214,220 ----
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to
next record in memory.'))
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_last'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to
last record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestJUMPTO'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_jump'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Jump to Record"),_('Navigate
to user specified record in memory.'))
mainToolBar.AddSeparator()
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestENTERQUERY'],
wxImage(self._uiDriver.images_dir+gConfigForms('tb_query_prep'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/forms/src GFClient.py GFForm.py GFInstance...,
James Thompson <=