[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue designer/src/Instance.py designer/src/Menu...
|
From: |
Jason Cater |
|
Subject: |
gnue designer/src/Instance.py designer/src/Menu... |
|
Date: |
Wed, 07 Aug 2002 19:29:18 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/08/07 19:29:18
Modified files:
designer/src : Instance.py MenuBar.py
designer/src/forms: WizardRunner.py
designer/src/forms/LayoutEditor: GridPane.py LayoutEditor.py
LayoutEditorTools.py
designer/src/forms/wizards: AddDropDown.py
common/etc : sample.report-filters.conf
common/src : GParser.py
Log message:
re-implemented toolbars to have them emulate the Menubar events; i.e.,
toolbar entries are nothing more than a link to a menu entry; more work on the
AddDropDown wizard; misc funky fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/MenuBar.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/WizardRunner.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/GridPane.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/wizards/AddDropDown.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.report-filters.conf.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GParser.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
Patches:
Index: gnue/common/etc/sample.report-filters.conf
diff -c gnue/common/etc/sample.report-filters.conf:1.10
gnue/common/etc/sample.report-filters.conf:1.11
*** gnue/common/etc/sample.report-filters.conf:1.10 Tue May 14 20:27:39 2002
--- gnue/common/etc/sample.report-filters.conf Wed Aug 7 19:29:18 2002
***************
*** 21,26 ****
--- 21,34 ----
mimetype = text/html
+ [simple:ps]
+ description = Postscript output (generated using html2ps)
+ engine = sablotron
+ template = html.xsl
+ mimetype = text/postscript
+ postprocessor1 = html2ps
+
+
[simple:csv]
description = Comma Separated Values text format.
engine = sablotron
Index: gnue/common/src/GParser.py
diff -c gnue/common/src/GParser.py:1.43 gnue/common/src/GParser.py:1.44
*** gnue/common/src/GParser.py:1.43 Wed Jul 31 10:25:56 2002
--- gnue/common/src/GParser.py Wed Aug 7 19:29:18 2002
***************
*** 85,90 ****
--- 85,94 ----
# Set up some namespace-related stuff for the parsers
parser.setFeature(xml.sax.handler.feature_namespaces, 1)
+
+ # Allow for parameter external entities
+ ## Does not work with expat!!! ##
+ ##parser.setFeature(xml.sax.handler.feature_external_pes, 1)
# Create a stack for the parsing routine
object = None
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.61 gnue/designer/src/Instance.py:1.62
*** gnue/designer/src/Instance.py:1.61 Mon Jul 22 19:04:59 2002
--- gnue/designer/src/Instance.py Wed Aug 7 19:29:18 2002
***************
*** 159,177 ****
self.rootObject.walk(self.__inventory)
! # Create our tools
!
self.__objectListeners = []
self.visualEditorWindow = self
self.visualEditor = self.createVisualEditor()
self.__objectListeners.append(self.visualEditor)
-
- # Create the supplemental tools
- self.createTools()
- self._menubar.buildMenu()
self._app.addInstance(self)
--- 159,176 ----
self.rootObject.walk(self.__inventory)
! # Create the supplemental tools
self.__objectListeners = []
+ self.createTools()
+ self._menubar.buildMenu()
+
+ # Create our tools
self.visualEditorWindow = self
self.visualEditor = self.createVisualEditor()
self.__objectListeners.append(self.visualEditor)
self._app.addInstance(self)
Index: gnue/designer/src/MenuBar.py
diff -c gnue/designer/src/MenuBar.py:1.29 gnue/designer/src/MenuBar.py:1.30
*** gnue/designer/src/MenuBar.py:1.29 Mon Jul 22 19:04:59 2002
--- gnue/designer/src/MenuBar.py Wed Aug 7 19:29:18 2002
***************
*** 79,85 ****
ID_PASTE = wxNewId()
ID_PASTE_SPECIAL = wxNewId()
ID_DELETE = wxNewId()
!
# Project menu
ID_NEW_PROJECT = wxNewId()
ID_OPEN_PROJECT = wxNewId()
--- 79,85 ----
ID_PASTE = wxNewId()
ID_PASTE_SPECIAL = wxNewId()
ID_DELETE = wxNewId()
!
# Project menu
ID_NEW_PROJECT = wxNewId()
ID_OPEN_PROJECT = wxNewId()
***************
*** 137,143 ****
frame._fileNewMap[id] = tool.properties.module
self._fileNew.Append(id, '&%s' % tool.properties.nickname,
_('Create a new %s') % string.lower(tool.properties.nickname))
! self.__addMenuEvent('File|New|%s' % tool, id, frame.OnNew)
self._fileNew.AppendSeparator()
--- 137,143 ----
frame._fileNewMap[id] = tool.properties.module
self._fileNew.Append(id, '&%s' % tool.properties.nickname,
_('Create a new %s') % string.lower(tool.properties.nickname))
! self.__addMenuEvent('File|New|%s' % tool.properties.nickname, id,
frame.OnNew)
self._fileNew.AppendSeparator()
***************
*** 266,277 ****
def __addMenuEvent(self, location, wxId, method):
! self._eventMappings[location] = method
EVT_MENU(self._frame, wxId, method)
def simulateMenuEvent(self, location):
! self._eventMappings[location](None)
--- 266,285 ----
def __addMenuEvent(self, location, wxId, method):
! self._eventMappings[location] = (method, wxId)
EVT_MENU(self._frame, wxId, method)
+ def getEventHelp (self, location):
+ try:
+ wxId = self._eventMappings[location][1]
+ return self.GetHelpString(wxId)
+ except KeyError:
+ return None
+
def simulateMenuEvent(self, location):
! method, id = self._eventMappings[location]
! method(wxEvent(id))
Index: gnue/designer/src/forms/LayoutEditor/GridPane.py
diff -c gnue/designer/src/forms/LayoutEditor/GridPane.py:1.2
gnue/designer/src/forms/LayoutEditor/GridPane.py:1.3
*** gnue/designer/src/forms/LayoutEditor/GridPane.py:1.2 Sat May 4
12:45:08 2002
--- gnue/designer/src/forms/LayoutEditor/GridPane.py Wed Aug 7 19:29:18 2002
***************
*** 40,45 ****
--- 40,49 ----
self.__showGrids = 1
self.__instance = instance
EVT_PAINT(self, self.OnPaint)
+
+ # TODO: Have the sash events resize the form
+ self.SetSashVisible(wxSASH_RIGHT,1)
+ self.SetSashVisible(wxSASH_BOTTOM,1)
def OnPaint(self, event):
if self.__showGrids:
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.28
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.29
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.28 Mon Jul 22
19:04:59 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py Wed Aug 7
19:29:18 2002
***************
*** 76,81 ****
--- 76,83 ----
self.mode = 'move'
self.__x = 0
self.__y = 0
+ self.__ox = 0
+ self.__oy = 0
instance.rootObject.walk (self.inventoryObject)
try:
***************
*** 522,527 ****
--- 524,530 ----
def startPrePositioningTemplate(self, template):
self.mode = 'positioning'
+ self.panel.SetCursor(wxCROSS_CURSOR)
self.__template = template
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.7
gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.8
*** gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py:1.7 Sat Apr
27 16:30:42 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditorTools.py Wed Aug 7
19:29:18 2002
***************
*** 1,6 ****
#
- # Copyright 2001 Free Software Foundation
- #
# This file is part of GNU Enterprise.
#
# GNU Enterprise is free software; you can redistribute it
--- 1,4 ----
***************
*** 18,23 ****
--- 16,23 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
+ # Copyright 2001-2002 Free Software Foundation
+ #
# FILE:
# LayoutEditor.py
#
***************
*** 32,37 ****
--- 32,45 ----
iconlocation = GConfig.getInstalledBase('designer_images','common_images') +
'/'
+ ToolbarMapping = 'File|New|Form,tb_new.png;' \
+ + 'File|Save,tb_save.png;' \
+ + ';' \
+ + 'Tools|Insert|Unbound Entry,deslay_entrytext.png;' \
+ + 'Tools|Insert|Drop Down Entry,deslay_entrydrop.png'
+
+ # + 'File|Open,tb_open.png;' \
+
class LayoutEditorTools(wxToolBar):
***************
*** 42,73 ****
self.mapping = {}
self.SetToolBitmapSize(wxSize(32,32))
-
- for type in ( ('label','label'),('box','box'),('button','button'),
- ('scrollbar','scrollbar'),('entrytext','text entry'),
- ('entrynum','numeric entry'),
- ('entrydate','date/time entry'),
- ('entrydrop','dropdown-style entry'),
- ('entrycheck','checkbox-style entry') ):
-
- handle, descr = type
-
- id = wxNewId()
- self.mapping[id] = type
- self.mapping[handle] = id
-
- self.AddTool(id,
- wxImage(os.path.join(iconlocation,'deslay_%s.png'%handle),
- wxBITMAP_TYPE_PNG).ConvertToBitmap(),
- isToggle=1,
- shortHelpString="Create a new %s" % descr,
- longHelpString="Create a new %s" % descr)
! self.SetToolClientData(id, type)
! EVT_TOOL(self, id, self.OnButtonSelected)
! wxToolBar.Realize(self)
def resetTool(self, mode):
if self.mapping.has_key(mode):
--- 50,83 ----
self.mapping = {}
self.SetToolBitmapSize(wxSize(32,32))
! for type in string.split(ToolbarMapping,';'):
! if not len(type):
! self.AddSeparator()
! else:
! handle, image = string.split(type,',',1)
! help = self.editor._instance._menubar.getEventHelp(handle)
!
! if not help:
! print "Warning: No event tied to %s" % handle
! help = ""
!
! id = wxNewId()
! self.mapping[id] = handle
! self.mapping[handle] = id
!
! self.AddTool(id,
! wxImage(os.path.join(iconlocation,image),
! wxBITMAP_TYPE_PNG).ConvertToBitmap(),
! ## isToggle=1,
! shortHelpString=help,
! longHelpString=help)
!
! self.SetToolClientData(id, handle)
! EVT_TOOL(self, id, self.OnButtonSelected)
! wxToolBar.Realize(self)
def resetTool(self, mode):
if self.mapping.has_key(mode):
***************
*** 75,89 ****
def OnButtonSelected(self, event):
! handle, descr = self.mapping[event.GetId()]
! if self.editor.mode == handle:
! self.editor.mode = 'move'
! else:
! self.resetTool(self.editor.mode)
! self.editor.mode = handle
! self.editor.frame.SetStatusText('Click on the gridded Layout '
! 'Editor to create a new %s.' % descr)
--- 85,100 ----
def OnButtonSelected(self, event):
! handle = self.mapping[event.GetId()]
! self.editor._instance._menubar.simulateMenuEvent(handle)
! ## if self.editor.mode == handle:
! ## self.editor.mode = 'move'
! ## else:
! ## self.resetTool(self.editor.mode)
! ## self.editor.mode = handle
! ## self.editor.frame.SetStatusText('Click on the gridded Layout '
! ## 'Editor to create a new %s.' % descr)
Index: gnue/designer/src/forms/WizardRunner.py
diff -c gnue/designer/src/forms/WizardRunner.py:1.1
gnue/designer/src/forms/WizardRunner.py:1.2
*** gnue/designer/src/forms/WizardRunner.py:1.1 Mon Jul 22 19:04:59 2002
--- gnue/designer/src/forms/WizardRunner.py Wed Aug 7 19:29:18 2002
***************
*** 22,30 ****
# form/WizardRunner.py
#
# DESCRIPTION:
! # Creates a "Form" instance
#
# NOTES:
#
from gnue.designer.TemplateParser import WizardRunner as BaseWizardRunner
--- 22,31 ----
# form/WizardRunner.py
#
# DESCRIPTION:
! # Runs a form "wizard"
#
# NOTES:
+ # Adds Prepositioning Template support to the base WizardRunner
#
from gnue.designer.TemplateParser import WizardRunner as BaseWizardRunner
Index: gnue/designer/src/forms/wizards/AddDropDown.py
diff -c gnue/designer/src/forms/wizards/AddDropDown.py:1.4
gnue/designer/src/forms/wizards/AddDropDown.py:1.5
*** gnue/designer/src/forms/wizards/AddDropDown.py:1.4 Thu Jul 25 01:36:08 2002
--- gnue/designer/src/forms/wizards/AddDropDown.py Wed Aug 7 19:29:18 2002
***************
*** 62,68 ****
self.y = y
self.width = 10
self.height = 1
!
###############
--- 62,68 ----
self.y = y
self.width = 10
self.height = 1
! self.__getExistingDatasources()
###############
***************
*** 72,80 ****
def GetStep(self, stepCode):
if stepCode == '1':
! if self.variables['datasource'] == sourcesOfData[0]:
stepCode = '1:new'
! elif self.variables['datasource'] == sourcesOfData[1]:
stepCode = '1:reuse'
else:
stepCode = '1:fixed'
--- 72,80 ----
def GetStep(self, stepCode):
if stepCode == '1':
! if self.variables['datasource'] == 0:
stepCode = '1:new'
! elif self.variables['datasource'] == 1:
stepCode = '1:reuse'
else:
stepCode = '1:fixed'
***************
*** 88,100 ****
self.variables['connection'] == self.__firstConnection
return { 'title': 'Add Dropdown Entry',
! 'content': (WizardText('To create your dropdown, I need to
know some basic information. \n'
! 'First, what field will store the
dropdown\'s value?'),
WizardInput('name', label='Field name:',
required=1,
size=40),
WizardText('Where will this dropdown pull its
data?'),
WizardInput('datasource', label='Source:',
required=1,
! maxSelections=-1, orderable=1,
set=((0,'Create a new datasource'),
(1,'Use an existing
datasource'),
(2,'Specify a static list of
valid choices' )))
--- 88,100 ----
self.variables['connection'] == self.__firstConnection
return { 'title': 'Add Dropdown Entry',
! 'content': (WizardText('To create your dropdown, I need to
know some\nbasic information. '
! 'First, what field will \nstore the
dropdown\'s value?'),
WizardInput('name', label='Field name:',
required=1,
size=40),
WizardText('Where will this dropdown pull its
data?'),
WizardInput('datasource', label='Source:',
required=1,
! maxSelections=1,
set=((0,'Create a new datasource'),
(1,'Use an existing
datasource'),
(2,'Specify a static list of
valid choices' )))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue designer/src/Instance.py designer/src/Menu...,
Jason Cater <=