[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/src/GParser.py forms/src/GFForm.py ...
|
From: |
Jason Cater |
|
Subject: |
gnue common/src/GParser.py forms/src/GFForm.py ... |
|
Date: |
Fri, 08 Nov 2002 10:55:04 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/11/08 10:55:03
Modified files:
common/src : GParser.py
forms/src : GFForm.py GFInstance.py
forms/src/uidrivers/wx: UIdriver.py
Added files:
common/src/schema/scripter: __init__.py
Log message:
fixed new GParser.py issue w/namespace support
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GParser.py.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/schema/scripter/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.198&tr2=1.199&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.207&tr2=1.208&r1=text&r2=text
Patches:
Index: gnue/common/src/GParser.py
diff -c gnue/common/src/GParser.py:1.47 gnue/common/src/GParser.py:1.48
*** gnue/common/src/GParser.py:1.47 Wed Nov 6 22:20:33 2002
--- gnue/common/src/GParser.py Fri Nov 8 10:55:03 2002
***************
*** 220,230 ****
attrs = {}
loadedxmlattrs = {}
- self._tagCounts[name] += 1
if not ns:
#
# No namespace qualifier
#
GDebug.printMesg(50, "<%s>" % name)
try:
--- 220,230 ----
attrs = {}
loadedxmlattrs = {}
if not ns:
#
# No namespace qualifier
#
+ self._tagCounts[name] += 1
GDebug.printMesg(50, "<%s>" % name)
try:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.198 gnue/forms/src/GFForm.py:1.199
*** gnue/forms/src/GFForm.py:1.198 Mon Nov 4 19:38:47 2002
--- gnue/forms/src/GFForm.py Fri Nov 8 10:55:03 2002
***************
*** 76,83 ****
self._triggerns={}
! # This will be set by GFInstance
! self._parameters = {}
# The "None" init gives datasources time to setup master/detail
self._inits = [self.primaryInit, None, self.secondaryInit]
--- 76,83 ----
self._triggerns={}
! # Grab our parameters from GFInstance
! self._parameters = app._parameters
# The "None" init gives datasources time to setup master/detail
self._inits = [self.primaryInit, None, self.secondaryInit]
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.64 gnue/forms/src/GFInstance.py:1.65
*** gnue/forms/src/GFInstance.py:1.64 Wed Nov 6 14:13:16 2002
--- gnue/forms/src/GFInstance.py Fri Nov 8 10:55:03 2002
***************
*** 128,134 ****
#
def setForm(self, form):
self._form = form
- form._parameters = self._parameters
#
# Return this instance's serial number
--- 128,133 ----
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.207
gnue/forms/src/uidrivers/wx/UIdriver.py:1.208
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.207 Tue Nov 5 21:03:43 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Fri Nov 8 10:55:03 2002
***************
*** 244,331 ****
initFont(self.statusBar,0)
- # 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 (F6)"),_('Save all changes to
database.'),'requestCOMMIT')
- self.__addMenuItem(fileMenu, _("Clear Form (F11)"),_('Clear
Form'),'requestROLLBACK')
- fileMenu.AppendSeparator()
-
- self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for
this form.'),'requestPRINTOUT')
- fileMenu.AppendSeparator()
-
- id = self.__addMenuItem(fileMenu, _("E&xit"),_('Leave the application.'))
- EVT_MENU(self._wxapp, id, self.menuExitEvent)
- self.__eventMenuMapping['_exit_'] = id
-
- editMenu = wxMenu()
- self.__addMenuItem(editMenu, _("Cut"),_("Cut the selected
text"),'requestCUT')
- self.__addMenuItem(editMenu, _("Copy"),_("Copy the selected text"),
'requestCOPY')
- self.__addMenuItem(editMenu, _("Paste"),_("Paste text"),'requestPASTE')
-
- dataMenu = wxMenu()
- self.__addMenuItem(dataMenu, _("First Record
(Shft+Up)"),_('Navigate to first record in memory.'),'requestFIRSTRECORD')
- self.__addMenuItem(dataMenu, _("Previous Record
(Up)"),_('Navigate to previous record in memory.'),'requestPREVRECORD')
- self.__addMenuItem(dataMenu, _("Next Record
(Down)"),_('Navigate to next record in memory.'),'requestNEXTRECORD')
- self.__addMenuItem(dataMenu, _("Last Record (Shft+Down)"),_('Navigate
to last record in memory.'),'requestLASTRECORD')
- id = self.__addMenuItem(dataMenu, _("Jump to Record...
(F2)"),_('Prompts for a record number to which the system should jump.'))
- EVT_MENU(self._wxapp, id, _PROMPTFORRECORD)
- self.__eventMenuMapping['_promptForRecord_'] = id
-
- self.__addMenuItem(dataMenu, _("New Record (F12)"),_('Create
a new record for data input.'),'requestNEWRECORD')
- self.__addMenuItem(dataMenu, _("Mark Record for Delete (F5)"),_('Mark
record for removal at next commit.'),'requestMARKFORDELETE')
-
- dataMenu.AppendSeparator()
- self.__addMenuItem(dataMenu, _("Next Block
(PgDn)"),_('Navigate to next data block.'),'requestNEXTBLOCK')
- self.__addMenuItem(dataMenu, _("Previous Block (PgUp)"),_('Navigate
to previous data block.'),'requestPREVBLOCK')
-
- dataMenu.AppendSeparator()
- self.__addMenuItem(dataMenu, _("Enter Query (F8)"),_('Switch
to input query mask mode.'),'requestENTERQUERY')
- self.__addMenuItem(dataMenu, _("Execute Query (F9)"),
_('Execute query using current mask.'),'requestEXECQUERY')
-
- helpMenu = wxMenu()
- self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe
Forms.'),'requestABOUT')
-
- menuBar = wxMenuBar()
- menuBar.Append( fileMenu, _("&File") )
- menuBar.Append( editMenu, _("&Edit") )
- menuBar.Append( dataMenu, _("&Data") )
- menuBar.Append( helpMenu, _("&Help") )
-
- self._menuBar = menuBar
-
- #
- # 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
- # I dont know if this is horribly wrong or design
- #
- if sys.platform == 'win32':
- mainToolBar = wxToolBar(self.mainWindow, -1)
- else:
- mainToolBar = wxToolBar(self.mainWindow,-1,
style=wxTB_HORIZONTAL|wxTB_DOCKABLE)
-
- mainToolBar.SetToolBitmapSize(wxSize(24,24))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestCOMMIT'],
wxImage(images_dir+gConfigForms('tb_commit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Save Changes"), _('Save all changes
to database.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEWRECORD'],
wxImage(images_dir+gConfigForms('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Insert Record"), _('Create a new
record for data input.'))
-
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestMARKFORDELETE'],
wxImage(images_dir+gConfigForms('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Delete Record"), _('Mark record for
removal at next commit.'))
- mainToolBar.AddSeparator()
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestFIRSTRECORD'],
wxImage(images_dir+gConfigForms('tb_first'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("First Record"),_('Navigate to first
record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestPREVRECORD'],
wxImage(images_dir+gConfigForms('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate to
previous record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEXTRECORD'],
wxImage(images_dir+gConfigForms('tb_next'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to next
record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(images_dir+gConfigForms('tb_last'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to last
record in memory.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['_promptForRecord_'],
wxImage(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(images_dir+gConfigForms('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to input
query mask mode.'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestEXECQUERY'],
wxImage(images_dir+gConfigForms('tb_query'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Execute Query"), _('Execute query
using current mask.'))
- mainToolBar.AddSeparator()
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestROLLBACK'],
wxImage(images_dir+gConfigForms('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
- mainToolBar.AddSimpleTool(self.__eventMenuMapping['_exit_'],
wxImage(images_dir+gConfigForms('tb_exit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Exit Form"), _('Exit Form'))
-
- self._mainToolBar = mainToolBar
-
self.mainWindow.panel = wxPanel(self.mainWindow,-1,
wxDefaultPosition,self.mainWindow.GetClientSize())
global _disabledColour
--- 244,249 ----
***************
*** 341,353 ****
def activateForm(self, form):
if not form._features['GUI:MENUBAR:SUPPRESS']:
self.mainWindow.SetMenuBar( self._menuBar );
if not form._features['GUI:TOOLBAR:SUPPRESS']:
! self.mainWindow.SetToolBar( self._mainToolBar );
self._mainToolBar.Realize()
width = int(self._form.width)
height = int(self._form.height)
--- 259,359 ----
def activateForm(self, form):
+ self.menu_sb_space = 0
if not form._features['GUI:MENUBAR:SUPPRESS']:
+ self.menu_sb_space += 2
+
+
+ # 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 (F6)"),_('Save all changes
to database.'),'requestCOMMIT')
+ self.__addMenuItem(fileMenu, _("Clear Form (F11)"),_('Clear
Form'),'requestROLLBACK')
+ fileMenu.AppendSeparator()
+
+ self.__addMenuItem(fileMenu, _("&Print"),_('Perform print routine for
this form.'),'requestPRINTOUT')
+ fileMenu.AppendSeparator()
+
+ id = self.__addMenuItem(fileMenu, _("E&xit"),_('Leave the
application.'))
+ EVT_MENU(self._wxapp, id, self.menuExitEvent)
+ self.__eventMenuMapping['_exit_'] = id
+
+ editMenu = wxMenu()
+ self.__addMenuItem(editMenu, _("Cut"),_("Cut the selected
text"),'requestCUT')
+ self.__addMenuItem(editMenu, _("Copy"),_("Copy the selected text"),
'requestCOPY')
+ self.__addMenuItem(editMenu, _("Paste"),_("Paste text"),'requestPASTE')
+
+ dataMenu = wxMenu()
+ self.__addMenuItem(dataMenu, _("First Record
(Shft+Up)"),_('Navigate to first record in memory.'),'requestFIRSTRECORD')
+ self.__addMenuItem(dataMenu, _("Previous Record
(Up)"),_('Navigate to previous record in memory.'),'requestPREVRECORD')
+ self.__addMenuItem(dataMenu, _("Next Record
(Down)"),_('Navigate to next record in memory.'),'requestNEXTRECORD')
+ self.__addMenuItem(dataMenu, _("Last Record
(Shft+Down)"),_('Navigate to last record in memory.'),'requestLASTRECORD')
+ id = self.__addMenuItem(dataMenu, _("Jump to Record...
(F2)"),_('Prompts for a record number to which the system should jump.'))
+ EVT_MENU(self._wxapp, id, _PROMPTFORRECORD)
+ self.__eventMenuMapping['_promptForRecord_'] = id
+
+ self.__addMenuItem(dataMenu, _("New Record
(F12)"),_('Create a new record for data input.'),'requestNEWRECORD')
+ self.__addMenuItem(dataMenu, _("Mark Record for Delete (F5)"),_('Mark
record for removal at next commit.'),'requestMARKFORDELETE')
+
+ dataMenu.AppendSeparator()
+ self.__addMenuItem(dataMenu, _("Next Block
(PgDn)"),_('Navigate to next data block.'),'requestNEXTBLOCK')
+ self.__addMenuItem(dataMenu, _("Previous Block
(PgUp)"),_('Navigate to previous data block.'),'requestPREVBLOCK')
+
+ dataMenu.AppendSeparator()
+ self.__addMenuItem(dataMenu, _("Enter Query
(F8)"),_('Switch to input query mask mode.'),'requestENTERQUERY')
+ self.__addMenuItem(dataMenu, _("Execute Query (F9)"),
_('Execute query using current mask.'),'requestEXECQUERY')
+
+ helpMenu = wxMenu()
+ self.__addMenuItem(helpMenu, _("&About..."), _('Display info about GNUe
Forms.'),'requestABOUT')
+
+ 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 );
+
if not form._features['GUI:TOOLBAR:SUPPRESS']:
!
! self.menu_sb_space += 2
! #
! # 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
! # I dont know if this is horribly wrong or design
! #
! if sys.platform == 'win32':
! mainToolBar = wxToolBar(self.mainWindow, -1)
! else:
! mainToolBar = wxToolBar(self.mainWindow,-1,
style=wxTB_HORIZONTAL|wxTB_DOCKABLE)
!
! mainToolBar.SetToolBitmapSize(wxSize(24,24))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestCOMMIT'],
wxImage(images_dir+gConfigForms('tb_commit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Save Changes"), _('Save all changes
to database.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEWRECORD'],
wxImage(images_dir+gConfigForms('tb_insert'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Insert Record"), _('Create a new
record for data input.'))
!
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestMARKFORDELETE'],
wxImage(images_dir+gConfigForms('tb_delete'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Delete Record"), _('Mark record for
removal at next commit.'))
! mainToolBar.AddSeparator()
!
mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestFIRSTRECORD'],
wxImage(images_dir+gConfigForms('tb_first'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("First Record"),_('Navigate to first
record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestPREVRECORD'],
wxImage(images_dir+gConfigForms('tb_previous'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Previous Record"),_('Navigate to
previous record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestNEXTRECORD'],
wxImage(images_dir+gConfigForms('tb_next'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Next Record"),_('Navigate to next
record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestLASTRECORD'],
wxImage(images_dir+gConfigForms('tb_last'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Last Record"),_('Navigate to last
record in memory.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['_promptForRecord_'],
wxImage(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(images_dir+gConfigForms('tb_query_prep'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Prepare Query"), _('Switch to input
query mask mode.'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestEXECQUERY'],
wxImage(images_dir+gConfigForms('tb_query'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Execute Query"), _('Execute query
using current mask.'))
! mainToolBar.AddSeparator()
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['requestROLLBACK'],
wxImage(images_dir+gConfigForms('tb_rollback'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Clear Form"), _('Clear Form'))
! mainToolBar.AddSimpleTool(self.__eventMenuMapping['_exit_'],
wxImage(images_dir+gConfigForms('tb_exit'),
wxBITMAP_TYPE_PNG).ConvertToBitmap(), _("Exit Form"), _('Exit Form'))
!
! self._mainToolBar = mainToolBar
! self.mainWindow.SetToolBar( mainToolBar );
self._mainToolBar.Realize()
+
width = int(self._form.width)
height = int(self._form.height)
***************
*** 357,363 ****
self.mainWindow.SetSize(formSize)
self.mainWindow.SetTitle(str(self._form.title))
self.mainWindow.panel = self._pageList[0]
! self.mainWindow.panel.SetSize(formSize)
self._pageList[0].Show(TRUE)
# Only one page at a time can be visible
--- 363,369 ----
self.mainWindow.SetSize(formSize)
self.mainWindow.SetTitle(str(self._form.title))
self.mainWindow.panel = self._pageList[0]
! self.mainWindow.panel.SetSize(self.mainWindow.GetClientSize())
self._pageList[0].Show(TRUE)
# Only one page at a time can be visible
***************
*** 667,676 ****
--- 673,692 ----
try:
if object.style == "dropdown" and \
not object._allowedValues == widget._origAllowedValues:
+ try:
+ # Not in wx 2.2.x
+ widget.Freeze()
+ except AttributeError
+ pass
widget._origAllowedValues = object._allowedValues
widget.Clear()
for value in object._allowedValuesDescr:
widget.Append(value)
+ try:
+ # Not in wx 2.2.x
+ widget.Thaw()
+ except AttributeError
+ pass
except AttributeError:
pass