[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/designer/src Designer.py base/Instance.py ...
|
From: |
Jason Cater |
|
Subject: |
gnue/designer/src Designer.py base/Instance.py ... |
|
Date: |
Fri, 13 Jun 2003 12:39:23 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Branch:
Changes by: Jason Cater <address@hidden> 03/06/13 12:39:22
Modified files:
designer/src : Designer.py
designer/src/base: Instance.py MenuBar.py ModuleSupport.py
designer/src/forms: Instance.py
designer/src/navigator: Instance.py
designer/src/reports: Instance.py
designer/src/reports/Standard: FilterSupport.py
designer/src/schema: Instance.py
Added files:
designer/src/base/docks: BasePane.py DockedPane.py Docker.py
FloatingPane.py SplitDock.py
__init__.py
Removed files:
designer/src/base: ToolDock.py ToolFrame.py
Log message:
* Moved the docking classes to docks/
* Renamed "Forms", "Reports", etc from "Tools" to "Modules" as "Tools"
also referred to stuff like Layout Editor, Shema Navigator, Property Editor,
etc. (poor jcater was getting confused)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.109&tr2=1.110&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/MenuBar.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/ModuleSupport.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/BasePane.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/DockedPane.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/Docker.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/FloatingPane.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/SplitDock.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/docks/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/Instance.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Instance.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Standard/FilterSupport.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/Instance.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
Patches:
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.70 gnue/designer/src/Designer.py:1.71
*** gnue/designer/src/Designer.py:1.70 Thu May 29 01:07:22 2003
--- gnue/designer/src/Designer.py Fri Jun 13 12:39:22 2003
***************
*** 64,70 ****
from gnue.common.apps import GDebug
from gnue.common.utils.FileUtils import dyn_import
from gnue.designer import VERSION, PACKAGE
! from base.ToolSupport import SupportedTools
from base import TemplateParser, TemplateChooser, MRUManager
from gnue.forms.GFConfig import ConfigOptions
from base.Config import ConfigOptions as DesignerConfigOptions
--- 64,70 ----
from gnue.common.apps import GDebug
from gnue.common.utils.FileUtils import dyn_import
from gnue.designer import VERSION, PACKAGE
! from base.ModuleSupport import SupportedModules
from base import TemplateParser, TemplateChooser, MRUManager
from gnue.forms.GFConfig import ConfigOptions
from base.Config import ConfigOptions as DesignerConfigOptions
***************
*** 277,283 ****
# TODO: extension wildcards (e.g., "All GNUe Form Files (*.gfd,*.gfl)").
# TODO: However, the code is left commented out in case some day it does.
! for tool in SupportedTools:
self.supportedToolObjects.append((tool.properties.nickname, tool))
--- 277,283 ----
# TODO: extension wildcards (e.g., "All GNUe Form Files (*.gfd,*.gfl)").
# TODO: However, the code is left commented out in case some day it does.
! for tool in SupportedModules:
self.supportedToolObjects.append((tool.properties.nickname, tool))
***************
*** 327,334 ****
# TODO: This should try to figure out what kind of file this is.
# TODO: We maintain a list of opening xml elements in the
! # TODO: (gnue.designer.SupportedTools).properties object.
! # TODO: [gnue.designer.SupportedTools is a list]
print "I do not know what to do with a .%s file!" % extension
return None
--- 327,334 ----
# TODO: This should try to figure out what kind of file this is.
# TODO: We maintain a list of opening xml elements in the
! # TODO: (gnue.designer.SupportedModules).properties object.
! # TODO: [gnue.designer.SupportedModules is a list]
print "I do not know what to do with a .%s file!" % extension
return None
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.109
gnue/designer/src/base/Instance.py:1.110
*** gnue/designer/src/base/Instance.py:1.109 Tue Jun 10 17:11:08 2003
--- gnue/designer/src/base/Instance.py Fri Jun 13 12:39:22 2003
***************
*** 38,53 ****
from gnue.common.events import EventController, Event
from gnue.designer.base.MenuBar import MenuBar
from gnue.designer.base.UndoManager import UndoManager
! from gnue.designer.base.ToolFrame import ToolFrame
from gnue.designer.base.ToolBase import ToolBase
! from gnue.designer.base.ToolDock import ToolDock
! from gnue.designer.base.ToolPanel import *
from gnue.designer.base.ObjectList import ObjectList
from gnue.designer.base import TemplateBase
from gnue.designer.base.TemplateParser import WizardRunner
from PrimaryToolBar import PrimaryToolBar
from gnue.designer import VERSION, PACKAGE
! from ToolSupport import SupportedTools
TITLE=PACKAGE
--- 38,54 ----
from gnue.common.events import EventController, Event
from gnue.designer.base.MenuBar import MenuBar
from gnue.designer.base.UndoManager import UndoManager
! from gnue.designer.base.docks.FloatingPane import FloatingPane
from gnue.designer.base.ToolBase import ToolBase
! from gnue.designer.base.docks.FloatingPane import FloatingPane
! from gnue.designer.base.docks.SplitDock import SplitDock
! from gnue.designer.base.docks.DockedPane import *
from gnue.designer.base.ObjectList import ObjectList
from gnue.designer.base import TemplateBase
from gnue.designer.base.TemplateParser import WizardRunner
from PrimaryToolBar import PrimaryToolBar
from gnue.designer import VERSION, PACKAGE
! from ModuleSupport import SupportedModules
TITLE=PACKAGE
***************
*** 82,88 ****
return
#
! def createInspectors(self):
pass
#
--- 83,89 ----
return
#
! def createTools(self):
pass
#
***************
*** 206,220 ****
self.rootObject.walk(self.__inventory)
! # Create the supplemental inspectors
! self._inspectorCache = []
# Set up the menu system
self._initMenu()
self.initMenu()
! self.createInspectors()
! self._initInspectors()
self.createWizards()
self.initToolBar()
--- 207,221 ----
self.rootObject.walk(self.__inventory)
! # Create the supplemental tools
! self._toolCache = []
# Set up the menu system
self._initMenu()
self.initMenu()
! self.createTools()
! self._initTools()
self.createWizards()
self.initToolBar()
***************
*** 296,302 ****
icon=None, hotkey=hotkey, help=help)
# Add supported tools to File|New
! for tool in SupportedTools:
self.menubar.addAction('File|New', '&%s' %
tool.properties.nickname,'RequestNew', 100,
help=_('Create a new %s') % string.lower(tool.properties.nickname),
eventdata={'type': tool.properties.module })
--- 297,303 ----
icon=None, hotkey=hotkey, help=help)
# Add supported tools to File|New
! for tool in SupportedModules:
self.menubar.addAction('File|New', '&%s' %
tool.properties.nickname,'RequestNew', 100,
help=_('Create a new %s') % string.lower(tool.properties.nickname),
eventdata={'type': tool.properties.module })
***************
*** 309,324 ****
self.registerEventListeners({'Connect:%s' % conn:self.__OnConnectTo})
! def _initInspectors(self):
self.__horizSplitter = wxSplitterWindow(self, -1, style=wxSP_3D)
! self.__leftDock = leftWin = ToolDock(self.__horizSplitter, self, 'left')
! self.__rightDock = rightWin = ToolDock(self.__horizSplitter, self,'right')
# Add each tool
! for id, title, baseclass, hotkey, group in self._inspectorCache:
! GDebug.printMesg(2,'Adding inspector %s [%s]' % (title,id))
pos = RuntimeSettings.get(self.runtime_section, 'Dock-%s' % id,
baseclass.default_dock)
--- 310,325 ----
self.registerEventListeners({'Connect:%s' % conn:self.__OnConnectTo})
! def _initTools(self):
self.__horizSplitter = wxSplitterWindow(self, -1, style=wxSP_3D)
! self.__leftDock = leftWin = SplitDock(self.__horizSplitter, self, 'left')
! self.__rightDock = rightWin = SplitDock(self.__horizSplitter,
self,'right')
# Add each tool
! for id, title, baseclass, hotkey, group in self._toolCache:
! GDebug.printMesg(2,'Adding tool %s [%s]' % (title,id))
pos = RuntimeSettings.get(self.runtime_section, 'Dock-%s' % id,
baseclass.default_dock)
***************
*** 335,341 ****
if pos not in ('left','right'): # i.e., 'frame' or something old
# Frame type
! window = ToolFrame(self, id, title, baseclass.uses_feedback_bar)
control = baseclass(self, self.rootObject, window)
window.control = control
window.dock = 'frame'
--- 336,342 ----
if pos not in ('left','right'): # i.e., 'frame' or something old
# Frame type
! window = FloatingPane(self, id, title, baseclass.uses_feedback_bar)
control = baseclass(self, self.rootObject, window)
window.control = control
window.dock = 'frame'
***************
*** 344,350 ****
frame.setStatusBar(frame.statusbar)
else:
# Docked type
! pane = DockedToolPane(self.__horizSplitter, self)
control = pane.AddTool(title, baseclass, self.rootObject, self)
if pos == 'left':
window = leftWin
--- 345,351 ----
frame.setStatusBar(frame.statusbar)
else:
# Docked type
! pane = DockedPane(self.__horizSplitter, self)
control = pane.AddTool(title, baseclass, self.rootObject, self)
if pos == 'left':
window = leftWin
***************
*** 374,381 ****
leftWin.restoreSettings(self.runtime_section)
! def addInspector(self, id, title, baseclass, hotkey=None, menuGroup=499):
! self._inspectorCache.append( (id, title, baseclass, hotkey, menuGroup) )
# Return, or create, an ObjectList based on the xml tag
--- 375,382 ----
leftWin.restoreSettings(self.runtime_section)
! def addTool(self, id, title, baseclass, hotkey=None, menuGroup=499):
! self._toolCache.append( (id, title, baseclass, hotkey, menuGroup) )
# Return, or create, an ObjectList based on the xml tag
Index: gnue/designer/src/base/MenuBar.py
diff -c gnue/designer/src/base/MenuBar.py:1.48
gnue/designer/src/base/MenuBar.py:1.49
*** gnue/designer/src/base/MenuBar.py:1.48 Mon Jun 9 20:40:13 2003
--- gnue/designer/src/base/MenuBar.py Fri Jun 13 12:39:22 2003
***************
*** 29,35 ****
from wxPython.wx import *
from gnue.common.apps import GDebug
import MRUManager
! from ToolSupport import SupportedTools
#
#
--- 29,35 ----
from wxPython.wx import *
from gnue.common.apps import GDebug
import MRUManager
! from ModuleSupport import SupportedModules
#
#
Index: gnue/designer/src/base/ModuleSupport.py
diff -c gnue/designer/src/base/ModuleSupport.py:1.11
gnue/designer/src/base/ModuleSupport.py:1.12
*** gnue/designer/src/base/ModuleSupport.py:1.11 Fri Apr 4 21:40:37 2003
--- gnue/designer/src/base/ModuleSupport.py Fri Jun 13 12:39:22 2003
***************
*** 19,25 ****
# - Suite 330, Boston, MA 02111-1307, USA.
#
# FILE:
! # ToolSupport.py
#
# DESCRIPTION:
#
--- 19,25 ----
# - Suite 330, Boston, MA 02111-1307, USA.
#
# FILE:
! # ModuleSupport.py
#
# DESCRIPTION:
#
***************
*** 30,49 ****
from gnue.common.apps import GDebug as _GDebug
from gnue.common.utils.FileUtils import dyn_import
! SupportedTools = []
! UnsupportedTools = []
! Tools = ( 'forms',
'reports',
## 'navigator',
'schema'
)
! for tool in Tools:
try:
! SupportedTools.append(dyn_import("gnue.designer.%s" % tool))
! _GDebug.printMesg(1,'Loaded Designer support for %s' % tool)
except ImportError, mesg:
! UnsupportedTools.append(tool)
! _GDebug.printMesg(1,'Cannot load Designer support for %s' % tool)
_GDebug.printMesg(2,' Error: %s' % mesg)
--- 30,49 ----
from gnue.common.apps import GDebug as _GDebug
from gnue.common.utils.FileUtils import dyn_import
! SupportedModules = []
! UnsupportedModules = []
! Modules = ( 'forms',
'reports',
## 'navigator',
'schema'
)
! for module in Modules:
try:
! SupportedModules.append(dyn_import("gnue.designer.%s" % module))
! _GDebug.printMesg(1,'Loaded Designer support for %s' % module)
except ImportError, mesg:
! UnsupportedModules.append(module)
! _GDebug.printMesg(1,'Cannot load Designer support for %s' % module)
_GDebug.printMesg(2,' Error: %s' % mesg)
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.50
gnue/designer/src/forms/Instance.py:1.51
*** gnue/designer/src/forms/Instance.py:1.50 Wed Jun 11 14:17:27 2003
--- gnue/designer/src/forms/Instance.py Fri Jun 13 12:39:22 2003
***************
*** 201,226 ****
object._popupMenu = ObjectMenu(self, object)
! def createInspectors(self):
! self.addInspector('visualEditor', _('Layout Editor'), LayoutEditor,
hotkey='F11', menuGroup=301)
! self.addInspector('propertyEditor', _('Property Inspector'),
PropertyEditor,
hotkey='F10', menuGroup=301)
! self.addInspector('treeEditor', _('Object Navigator'), TreeView,
hotkey='F8', menuGroup=311)
! self.addInspector('schemaNavigator',_('Schema Navigator'),
SchemaNavigator,
menuGroup=301)
! self.addInspector('datasourceEditor',_('Data Source Editor'),
DataSourceEditor,
hotkey='F9', menuGroup=311)
! self.addInspector('blockEditor', _('Block Editor'), BlockEditor,
hotkey='F5', menuGroup=311)
! #self.addInspector('fieldEditor', _('Field Editor'), FieldEditor,
# hotkey='F6', menuGroup=201)
! self.addInspector('eventEditor', _('Trigger Mappings'), EventEditor,
hotkey='F7', menuGroup=321)
! self.addInspector('triggerEditor', _('Code Editor'), TriggerEditor,
hotkey='F12', menuGroup=321)
def createWizards(self):
--- 201,226 ----
object._popupMenu = ObjectMenu(self, object)
! def createTools(self):
! self.addTool('visualEditor', _('Layout Editor'), LayoutEditor,
hotkey='F11', menuGroup=301)
! self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor,
hotkey='F10', menuGroup=301)
! self.addTool('treeEditor', _('Object Navigator'), TreeView,
hotkey='F8', menuGroup=311)
! self.addTool('schemaNavigator',_('Schema Navigator'), SchemaNavigator,
menuGroup=301)
! self.addTool('datasourceEditor',_('Data Source Editor'), DataSourceEditor,
hotkey='F9', menuGroup=311)
! self.addTool('blockEditor', _('Block Editor'), BlockEditor,
hotkey='F5', menuGroup=311)
! #self.addTool('fieldEditor', _('Field Editor'), FieldEditor,
# hotkey='F6', menuGroup=201)
! self.addTool('eventEditor', _('Trigger Mappings'), EventEditor,
hotkey='F7', menuGroup=321)
! self.addTool('triggerEditor', _('Code Editor'), TriggerEditor,
hotkey='F12', menuGroup=321)
def createWizards(self):
Index: gnue/designer/src/navigator/Instance.py
diff -c gnue/designer/src/navigator/Instance.py:1.13
gnue/designer/src/navigator/Instance.py:1.14
*** gnue/designer/src/navigator/Instance.py:1.13 Mon Jun 9 20:40:14 2003
--- gnue/designer/src/navigator/Instance.py Fri Jun 13 12:39:22 2003
***************
*** 73,85 ****
return LayoutEditor(self, self.rootObject, self)
! def createInspectors(self):
pass
! ## self.addInspector('propertyEditor','Property Inspector', PropertyEditor)
! ## self.addInspectorol('treeEditor','Object Navigator', TreeView)
! ## self.addInspector('triggerEditor','Event Editor', TriggerEditor)
! ## self.addInspector('datasourceEditor','Data Source Editor',
DataSourceEditor)
! ## self.addInspector('schemaViewer','Schema Navigator', SchemaViewer)
def createWizards(self):
self.loadWizards(wizards)
--- 73,85 ----
return LayoutEditor(self, self.rootObject, self)
! def createTools(self):
pass
! ## self.addTool('propertyEditor','Property Inspector', PropertyEditor)
! ## self.addToolol('treeEditor','Object Navigator', TreeView)
! ## self.addTool('triggerEditor','Event Editor', TriggerEditor)
! ## self.addTool('datasourceEditor','Data Source Editor', DataSourceEditor)
! ## self.addTool('schemaViewer','Schema Navigator', SchemaViewer)
def createWizards(self):
self.loadWizards(wizards)
Index: gnue/designer/src/reports/Instance.py
diff -c gnue/designer/src/reports/Instance.py:1.17
gnue/designer/src/reports/Instance.py:1.18
*** gnue/designer/src/reports/Instance.py:1.17 Mon Jun 9 20:40:14 2003
--- gnue/designer/src/reports/Instance.py Fri Jun 13 12:39:22 2003
***************
*** 128,147 ****
pass
! def createInspectors(self):
! self.addInspector('propertyEditor', _('Property Inspector'),
PropertyEditor, 'F10', 301)
! self.addInspector('treeEditor', _('Object Navigator'), TreeView,
'F8', 301)
! self.addInspector('schemaViewer', _('Schema Navigator'), SchemaViewer,
301)
! self.addInspector('datasourceEditor',_('Data Source Editor'),
DataSourceEditor, 311)
! #self.addInspectorol('groupEditor', _('Group Editor'), GroupEditor,
'F5', 311)
! #self.addInspector('fieldEditor', _('Field Editor'), FieldEditor, 'F6',
311)
! self.addInspector('eventEditor', _('Trigger Inspector'), EventEditor,
'F7', 321)
! self.addInspector('triggerEditor', _('Code Editor'), TriggerEditor,
'F12', 321)
# Add filter-specific tools
! self.filter.addInspectors()
def createWizards(self):
--- 128,147 ----
pass
! def createTools(self):
! self.addTool('propertyEditor', _('Property Inspector'), PropertyEditor,
'F10', 301)
! self.addTool('treeEditor', _('Object Navigator'), TreeView, 'F8', 301)
! self.addTool('schemaViewer', _('Schema Navigator'), SchemaViewer, 301)
! self.addTool('datasourceEditor',_('Data Source Editor'),
DataSourceEditor, 311)
! #self.addToolol('groupEditor', _('Group Editor'), GroupEditor, 'F5',
311)
! #self.addTool('fieldEditor', _('Field Editor'), FieldEditor, 'F6', 311)
! self.addTool('eventEditor', _('Trigger Inspector'), EventEditor, 'F7',
321)
! self.addTool('triggerEditor', _('Code Editor'), TriggerEditor, 'F12',
321)
# Add filter-specific tools
! self.filter.addTools()
def createWizards(self):
Index: gnue/designer/src/reports/Standard/FilterSupport.py
diff -c gnue/designer/src/reports/Standard/FilterSupport.py:1.6
gnue/designer/src/reports/Standard/FilterSupport.py:1.7
*** gnue/designer/src/reports/Standard/FilterSupport.py:1.6 Mon Jun 9
20:40:14 2003
--- gnue/designer/src/reports/Standard/FilterSupport.py Fri Jun 13 12:39:22 2003
***************
*** 48,56 ****
_BaseFilterSupport.initAsNew(self)
! def addInspectors(self):
! self.instance.addInspectorSeparator()
! self.instance.addInspector('groupEditor', _('Group Editor'),
GroupEditor, 'F5')
def onCreateObject(self, event):
--- 48,56 ----
_BaseFilterSupport.initAsNew(self)
! def addTools(self):
! self.instance.addToolSeparator()
! self.instance.addTool('groupEditor', _('Group Editor'), GroupEditor,
'F5')
def onCreateObject(self, event):
Index: gnue/designer/src/schema/Instance.py
diff -c gnue/designer/src/schema/Instance.py:1.22
gnue/designer/src/schema/Instance.py:1.23
*** gnue/designer/src/schema/Instance.py:1.22 Mon Jun 9 20:40:14 2003
--- gnue/designer/src/schema/Instance.py Fri Jun 13 12:39:22 2003
***************
*** 80,91 ****
table._fieldList.append(object)
table._fieldMap[object.name.lower()] = object
! def createInspectors(self):
! self.addInspector(_('treeEditor'), _('Object Navigator'), TreeView)
! self.addInspector(_('propertyEditor'), _('Property Inspector'),
PropertyEditor)
! self.addInspector(_('schemaViewer'), _('Schema Navigator'), SchemaViewer)
! self.addInspector(_('tableEditor'), _('Table/Field Editor'), TableEditor)
! self.addInspector(_('visualEditor'), _('Visual Editor'), VisualEditor)
def createWizards(self):
self.loadWizards(wizards)
--- 80,91 ----
table._fieldList.append(object)
table._fieldMap[object.name.lower()] = object
! def createTools(self):
! self.addTool(_('treeEditor'), _('Object Navigator'), TreeView)
! self.addTool(_('propertyEditor'), _('Property Inspector'), PropertyEditor)
! self.addTool(_('schemaViewer'), _('Schema Navigator'), SchemaViewer)
! self.addTool(_('tableEditor'), _('Table/Field Editor'), TableEditor)
! self.addTool(_('visualEditor'), _('Visual Editor'), VisualEditor)
def createWizards(self):
self.loadWizards(wizards)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/designer/src Designer.py base/Instance.py ...,
Jason Cater <=