[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/designer setup.py src/Designer.py src/base...
|
From: |
Jason Cater |
|
Subject: |
gnue/designer setup.py src/Designer.py src/base... |
|
Date: |
Fri, 20 Dec 2002 18:56:06 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/12/20 18:56:05
Modified files:
designer : setup.py
designer/src : Designer.py
designer/src/base: Instance.py TemplateChooser.py
TemplateParser.py
designer/src/base/tools: DataSourceEditor.py EventEditor.py
PropertyEditor.py SchemaViewer.py
TreeView.py TriggerEditor.py
designer/src/forms: Incubator.py Instance.py PropertyEditor.py
TemplateSupport.py TreeView.py
WizardRunner.py
designer/src/forms/LayoutEditor: LayoutEditor.py
designer/src/navigator: Instance.py LayoutEditor.py
TemplateSupport.py
designer/src/reports: Incubator.py Instance.py LayoutEditor.py
TemplateSupport.py TreeView.py
designer/src/reports/Standard: GroupEditor.py
designer/src/schema: Incubator.py Instance.py LayoutEditor.py
TableEditor.py TemplateSupport.py
TreeView.py
designer/src/schema/DiaEditor: VisualEditor.py
designer/src/schema/wizards: WriteSchema.py
Added files:
designer/src/base/uihelpers: __init__.py
Log message:
some restructuring of designer
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/setup.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.55&tr2=1.56&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/TemplateChooser.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/TemplateParser.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/DataSourceEditor.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/EventEditor.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/PropertyEditor.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/SchemaViewer.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/TreeView.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/tools/TriggerEditor.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/uihelpers/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Incubator.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/PropertyEditor.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/TemplateSupport.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/TreeView.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/WizardRunner.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/LayoutEditor/LayoutEditor.py.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/Instance.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/LayoutEditor.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/navigator/TemplateSupport.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Incubator.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Instance.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/LayoutEditor.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/TemplateSupport.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/TreeView.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Standard/GroupEditor.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/Incubator.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/Instance.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/LayoutEditor.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/TableEditor.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/TemplateSupport.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/TreeView.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/DiaEditor/VisualEditor.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/wizards/WriteSchema.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gnue/designer/setup.py
diff -c gnue/designer/setup.py:1.41 gnue/designer/setup.py:1.42
*** gnue/designer/setup.py:1.41 Fri Dec 20 18:36:47 2002
--- gnue/designer/setup.py Fri Dec 20 18:56:05 2002
***************
*** 268,277 ****
"gnue.designer.templates.schema"
],
package_dir = {"gnue.designer" : "src",
- "gnue.designer.templates" : "templates"
},
- # "gnue.designer.templates.forms" : "templates.forms",
- # "gnue.designer.templates.reports" :
"templates.reports"},
scripts = ["scripts/gnue-designer"]
)
--- 268,274 ----
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.55 gnue/designer/src/Designer.py:1.56
*** gnue/designer/src/Designer.py:1.55 Sat Dec 14 00:57:36 2002
--- gnue/designer/src/Designer.py Fri Dec 20 18:56:05 2002
***************
*** 63,72 ****
from gnue.common import GDebug
from gnue.common.FileUtils import dyn_import
from gnue.designer import VERSION, PACKAGE
! from ToolSupport import SupportedTools
! import TemplateParser, TemplateChooser, MRUManager
from gnue.forms.GFConfig import ConfigOptions
! from Config import ConfigOptions as DesignerConfigOptions
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
--- 63,72 ----
from gnue.common import GDebug
from gnue.common.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
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.75
gnue/designer/src/base/Instance.py:1.76
*** gnue/designer/src/base/Instance.py:1.75 Fri Dec 20 17:48:34 2002
--- gnue/designer/src/base/Instance.py Fri Dec 20 18:56:05 2002
***************
*** 31,47 ****
import sys, os, time, dircache
from wxPython.wx import *
from gnue.common import GDebug
! from MenuBar import MainMenuBar
from gnue.common import RuntimeSettings
from gnue.common.FileUtils import dyn_import
from gnue.common.events import EventController, Event
! from ToolFrame import ToolFrame
! from ToolPanel import ToolPanel
! from ToolDock import *
from gnue.designer import VERSION, PACKAGE
! from gnue.designer.Debugger import DebugSession
! import TemplateBase
! from TemplateParser import WizardRunner
TITLE=PACKAGE
--- 31,47 ----
import sys, os, time, dircache
from wxPython.wx import *
from gnue.common import GDebug
! from gnue.designer.base.MenuBar import MainMenuBar
from gnue.common import RuntimeSettings
from gnue.common.FileUtils import dyn_import
from gnue.common.events import EventController, Event
! from gnue.designer.base.ToolFrame import ToolFrame
! from gnue.designer.base.ToolPanel import ToolPanel
! from gnue.designer.base.ToolDock import *
from gnue.designer import VERSION, PACKAGE
! from gnue.designer.base.Debugger import DebugSession
! from gnue.designer.base import TemplateBase
! from gnue.designer.base.TemplateParser import WizardRunner
TITLE=PACKAGE
Index: gnue/designer/src/base/TemplateChooser.py
diff -c gnue/designer/src/base/TemplateChooser.py:1.12
gnue/designer/src/base/TemplateChooser.py:1.13
*** gnue/designer/src/base/TemplateChooser.py:1.12 Wed Jul 3 11:13:52 2002
--- gnue/designer/src/base/TemplateChooser.py Fri Dec 20 18:56:05 2002
***************
*** 28,36 ****
from wxPython.wx import *
from gnue.common import GDebug
! from gnue.designer import TemplateBase
from gnue.designer.templates import GetAvailablePackages,
GetAvailableTemplates
- import TemplateBase
class TemplateChooser:
def __init__(self, parent):
--- 28,35 ----
from wxPython.wx import *
from gnue.common import GDebug
! from gnue.designer.base import TemplateBase
from gnue.designer.templates import GetAvailablePackages,
GetAvailableTemplates
class TemplateChooser:
def __init__(self, parent):
Index: gnue/designer/src/base/TemplateParser.py
diff -c gnue/designer/src/base/TemplateParser.py:1.24
gnue/designer/src/base/TemplateParser.py:1.25
*** gnue/designer/src/base/TemplateParser.py:1.24 Sun Dec 1 17:53:04 2002
--- gnue/designer/src/base/TemplateParser.py Fri Dec 20 18:56:05 2002
***************
*** 27,33 ****
# NOTES:
from wxPython.wx import *
! from gnue.designer import TemplateBase
from gnue.common.FileUtils import dyn_import
from gnue.common import TextUtils
from gnue.common.events import Event
--- 27,33 ----
# NOTES:
from wxPython.wx import *
! from gnue.designer.base import TemplateBase
from gnue.common.FileUtils import dyn_import
from gnue.common import TextUtils
from gnue.common.events import Event
Index: gnue/designer/src/base/tools/DataSourceEditor.py
diff -c gnue/designer/src/base/tools/DataSourceEditor.py:1.28
gnue/designer/src/base/tools/DataSourceEditor.py:1.29
*** gnue/designer/src/base/tools/DataSourceEditor.py:1.28 Tue Dec 17
18:42:23 2002
--- gnue/designer/src/base/tools/DataSourceEditor.py Fri Dec 20 18:56:05 2002
***************
*** 31,37 ****
from wxPython.wx import *
from gnue.common import GDebug, GDataSource, GConfig
from gnue.common import RuntimeSettings, events
! from ToolPanel import ToolPanel
class DataSourceEditor(ToolPanel):
--- 31,37 ----
from wxPython.wx import *
from gnue.common import GDebug, GDataSource, GConfig
from gnue.common import RuntimeSettings, events
! from gnue.designer.base.ToolPanel import ToolPanel
class DataSourceEditor(ToolPanel):
Index: gnue/designer/src/base/tools/EventEditor.py
diff -c gnue/designer/src/base/tools/EventEditor.py:1.8
gnue/designer/src/base/tools/EventEditor.py:1.9
*** gnue/designer/src/base/tools/EventEditor.py:1.8 Tue Dec 17 18:42:23 2002
--- gnue/designer/src/base/tools/EventEditor.py Fri Dec 20 18:56:05 2002
***************
*** 33,40 ****
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from ToolPanel import *
! from GridCellEditors import CharCellEditor
class EventEditor (ToolPanel):
--- 33,40 ----
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from gnue.designer.base.ToolPanel import *
! from gnue.designer.base.uihelpers.GridCellEditors import CharCellEditor
class EventEditor (ToolPanel):
Index: gnue/designer/src/base/tools/PropertyEditor.py
diff -c gnue/designer/src/base/tools/PropertyEditor.py:1.35
gnue/designer/src/base/tools/PropertyEditor.py:1.36
*** gnue/designer/src/base/tools/PropertyEditor.py:1.35 Sun Dec 15 17:22:41 2002
--- gnue/designer/src/base/tools/PropertyEditor.py Fri Dec 20 18:56:05 2002
***************
*** 31,38 ****
from wxPython.wx import *
from wxPython.grid import *
from gnue.common import GDebug, GTypecast
! from ToolPanel import *
! from GridCellEditors import *
class PropertyEditor (ToolPanel):
--- 31,38 ----
from wxPython.wx import *
from wxPython.grid import *
from gnue.common import GDebug, GTypecast
! from gnue.designer.base.ToolPanel import *
! from gnue.designer.base.uihelpers.GridCellEditors import *
class PropertyEditor (ToolPanel):
Index: gnue/designer/src/base/tools/SchemaViewer.py
diff -c gnue/designer/src/base/tools/SchemaViewer.py:1.9
gnue/designer/src/base/tools/SchemaViewer.py:1.10
*** gnue/designer/src/base/tools/SchemaViewer.py:1.9 Mon Nov 25 00:41:42 2002
--- gnue/designer/src/base/tools/SchemaViewer.py Fri Dec 20 18:56:05 2002
***************
*** 31,37 ****
from wxPython.wx import *
from gnue.common import GDebug, GDataSource
from gnue.common import RuntimeSettings, events
! from ToolPanel import *
class SchemaViewer(ToolPanel):
--- 31,37 ----
from wxPython.wx import *
from gnue.common import GDebug, GDataSource
from gnue.common import RuntimeSettings, events
! from gnue.designer.base.ToolPanel import *
class SchemaViewer(ToolPanel):
Index: gnue/designer/src/base/tools/TreeView.py
diff -c gnue/designer/src/base/tools/TreeView.py:1.32
gnue/designer/src/base/tools/TreeView.py:1.33
*** gnue/designer/src/base/tools/TreeView.py:1.32 Tue Dec 17 17:39:38 2002
--- gnue/designer/src/base/tools/TreeView.py Fri Dec 20 18:56:05 2002
***************
*** 36,44 ****
from wxPython.wx import *
from gnue.common import GDebug, GTrigger
from gnue.forms import GFForm, GFObjects, GFLibrary
! from PopupMenu import ObjectMenu
! from Icons import treeIconMap, treeIconList
! from ToolPanel import *
class TreeView (ToolPanel):
--- 36,44 ----
from wxPython.wx import *
from gnue.common import GDebug, GTrigger
from gnue.forms import GFForm, GFObjects, GFLibrary
! from gnue.designer.base.PopupMenu import ObjectMenu
! from gnue.designer.base.Icons import treeIconMap, treeIconList
! from gnue.designer.base.ToolPanel import *
class TreeView (ToolPanel):
Index: gnue/designer/src/base/tools/TriggerEditor.py
diff -c gnue/designer/src/base/tools/TriggerEditor.py:1.27
gnue/designer/src/base/tools/TriggerEditor.py:1.28
*** gnue/designer/src/base/tools/TriggerEditor.py:1.27 Tue Dec 17 18:42:23 2002
--- gnue/designer/src/base/tools/TriggerEditor.py Fri Dec 20 18:56:05 2002
***************
*** 29,35 ****
from wxPython.wx import *
from gnue.common import GDebug, GParserHelpers, GTrigger
! from ToolPanel import *
import keyword
--- 29,35 ----
from wxPython.wx import *
from gnue.common import GDebug, GParserHelpers, GTrigger
! from gnue.designer.base.ToolPanel import *
import keyword
Index: gnue/designer/src/forms/Incubator.py
diff -c gnue/designer/src/forms/Incubator.py:1.8
gnue/designer/src/forms/Incubator.py:1.9
*** gnue/designer/src/forms/Incubator.py:1.8 Fri Dec 6 19:55:25 2002
--- gnue/designer/src/forms/Incubator.py Fri Dec 20 18:56:05 2002
***************
*** 29,35 ****
from gnue.common import GDebug, GParserHelpers
from gnue.forms import GFParser, GFForm
! from gnue.designer.Incubator import *
def createObject(instance, form, tag, type=None, parent=None,
parentHint=None, attributes={}, select=1):
--- 29,35 ----
from gnue.common import GDebug, GParserHelpers
from gnue.forms import GFParser, GFForm
! from gnue.designer.base.Incubator import *
def createObject(instance, form, tag, type=None, parent=None,
parentHint=None, attributes={}, select=1):
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.24
gnue/designer/src/forms/Instance.py:1.25
*** gnue/designer/src/forms/Instance.py:1.24 Sun Dec 15 17:22:41 2002
--- gnue/designer/src/forms/Instance.py Fri Dec 20 18:56:05 2002
***************
*** 30,37 ****
from wxPython.wx import *
from gnue.designer.forms import properties as formProperties
! from gnue.designer.Instance import BaseInstance
! from gnue.designer import PopupMenu
import Incubator
import wizards
from WizardRunner import WizardRunner
--- 30,37 ----
from wxPython.wx import *
from gnue.designer.forms import properties as formProperties
! from gnue.designer.base.Instance import BaseInstance
! from gnue.designer.base import PopupMenu
import Incubator
import wizards
from WizardRunner import WizardRunner
***************
*** 40,51 ****
from LayoutEditor import LayoutEditor
from TreeView import TreeView
from PropertyEditor import PropertyEditor
! from gnue.designer.EventEditor import EventEditor
! from gnue.designer.TriggerEditor import TriggerEditor
! from gnue.designer.DataSourceEditor import DataSourceEditor
! from gnue.designer.SchemaViewer import SchemaViewer
! from gnue.designer.PopupMenu import ObjectMenu
from gnue.forms import GFInstance
from gnue.forms import GFForm, GFParser, GFObjects, GFLibrary
--- 40,51 ----
from LayoutEditor import LayoutEditor
from TreeView import TreeView
from PropertyEditor import PropertyEditor
! from gnue.designer.base.tools.EventEditor import EventEditor
! from gnue.designer.base.tools.TriggerEditor import TriggerEditor
! from gnue.designer.base.tools.DataSourceEditor import DataSourceEditor
! from gnue.designer.base.tools.SchemaViewer import SchemaViewer
! from gnue.designer.base.PopupMenu import ObjectMenu
from gnue.forms import GFInstance
from gnue.forms import GFForm, GFParser, GFObjects, GFLibrary
Index: gnue/designer/src/forms/LayoutEditor/LayoutEditor.py
diff -c gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.54
gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.55
*** gnue/designer/src/forms/LayoutEditor/LayoutEditor.py:1.54 Mon Dec 16
16:21:26 2002
--- gnue/designer/src/forms/LayoutEditor/LayoutEditor.py Fri Dec 20
18:56:05 2002
***************
*** 31,40 ****
from gnue.common import GDebug
from gnue.forms import GFObjects
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
! from gnue.designer.PopupMenu import PageMenu
from gnue.designer.forms import Incubator
! from gnue.designer.TemplateParser import TemplateParser
! from gnue.designer.ToolPanel import *
from gnue.common.events import Event
# My support files
--- 31,40 ----
from gnue.common import GDebug
from gnue.forms import GFObjects
from gnue.forms.uidrivers.wx import UIdriver as UIwxpython
! from gnue.designer.base.PopupMenu import PageMenu
from gnue.designer.forms import Incubator
! from gnue.designer.base.TemplateParser import TemplateParser
! from gnue.designer.base.ToolPanel import *
from gnue.common.events import Event
# My support files
Index: gnue/designer/src/forms/PropertyEditor.py
diff -c gnue/designer/src/forms/PropertyEditor.py:1.4
gnue/designer/src/forms/PropertyEditor.py:1.5
*** gnue/designer/src/forms/PropertyEditor.py:1.4 Mon Dec 16 16:21:26 2002
--- gnue/designer/src/forms/PropertyEditor.py Fri Dec 20 18:56:05 2002
***************
*** 31,39 ****
import sys, os, string
from wxPython.wx import *
from gnue.common import GDebug, GTypecast
! from gnue.designer.PropertyEditor import PropertyEditor as BasePropertyEditor
! from gnue.designer.PropertyEditor import InspectorPanel as BaseInspectorPanel
! from gnue.designer.ToolPanel import *
class PropertyEditor (BasePropertyEditor):
def reset(self):
--- 31,39 ----
import sys, os, string
from wxPython.wx import *
from gnue.common import GDebug, GTypecast
! from gnue.designer.base.tools.PropertyEditor import PropertyEditor as
BasePropertyEditor
! from gnue.designer.base.tools.PropertyEditor import InspectorPanel as
BaseInspectorPanel
! from gnue.designer.base.ToolPanel import *
class PropertyEditor (BasePropertyEditor):
def reset(self):
Index: gnue/designer/src/forms/TemplateSupport.py
diff -c gnue/designer/src/forms/TemplateSupport.py:1.3
gnue/designer/src/forms/TemplateSupport.py:1.4
*** gnue/designer/src/forms/TemplateSupport.py:1.3 Mon Jul 22 19:04:59 2002
--- gnue/designer/src/forms/TemplateSupport.py Fri Dec 20 18:56:05 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.designer.TemplateBase import *
import Incubator
from gnue.forms.GFForm import GFForm
--- 27,33 ----
# NOTES:
#
! from gnue.designer.base.TemplateBase import *
import Incubator
from gnue.forms.GFForm import GFForm
Index: gnue/designer/src/forms/TreeView.py
diff -c gnue/designer/src/forms/TreeView.py:1.6
gnue/designer/src/forms/TreeView.py:1.7
*** gnue/designer/src/forms/TreeView.py:1.6 Mon Nov 25 09:22:36 2002
--- gnue/designer/src/forms/TreeView.py Fri Dec 20 18:56:05 2002
***************
*** 34,42 ****
from wxPython.wx import *
from gnue.common import GDebug, GTrigger, GDataSource
from gnue.forms import GFForm, GFObjects, GFLibrary
! from gnue.designer.PopupMenu import ObjectMenu
! from gnue.designer.Icons import treeIconMap, treeIconList
! from gnue.designer.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
--- 34,42 ----
from wxPython.wx import *
from gnue.common import GDebug, GTrigger, GDataSource
from gnue.forms import GFForm, GFObjects, GFLibrary
! from gnue.designer.base.PopupMenu import ObjectMenu
! from gnue.designer.base.Icons import treeIconMap, treeIconList
! from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
Index: gnue/designer/src/forms/WizardRunner.py
diff -c gnue/designer/src/forms/WizardRunner.py:1.3
gnue/designer/src/forms/WizardRunner.py:1.4
*** gnue/designer/src/forms/WizardRunner.py:1.3 Mon Oct 7 22:24:26 2002
--- gnue/designer/src/forms/WizardRunner.py Fri Dec 20 18:56:05 2002
***************
*** 28,34 ****
# Adds Prepositioning Template support to the base WizardRunner
#
! from gnue.designer.TemplateParser import WizardRunner as BaseWizardRunner
import TemplateSupport
from gnue.common.events import Event
--- 28,34 ----
# Adds Prepositioning Template support to the base WizardRunner
#
! from gnue.designer.base.TemplateParser import WizardRunner as BaseWizardRunner
import TemplateSupport
from gnue.common.events import Event
Index: gnue/designer/src/navigator/Instance.py
diff -c gnue/designer/src/navigator/Instance.py:1.8
gnue/designer/src/navigator/Instance.py:1.9
*** gnue/designer/src/navigator/Instance.py:1.8 Fri Dec 20 03:13:39 2002
--- gnue/designer/src/navigator/Instance.py Fri Dec 20 18:56:05 2002
***************
*** 28,34 ****
#
from gnue.designer.navigator import properties as navProperties
! from gnue.designer.Instance import BaseInstance
# Tool support...
from LayoutEditor import LayoutEditor
--- 28,34 ----
#
from gnue.designer.navigator import properties as navProperties
! from gnue.designer.base.Instance import BaseInstance
# Tool support...
from LayoutEditor import LayoutEditor
Index: gnue/designer/src/navigator/LayoutEditor.py
diff -c gnue/designer/src/navigator/LayoutEditor.py:1.6
gnue/designer/src/navigator/LayoutEditor.py:1.7
*** gnue/designer/src/navigator/LayoutEditor.py:1.6 Mon Nov 25 00:41:42 2002
--- gnue/designer/src/navigator/LayoutEditor.py Fri Dec 20 18:56:05 2002
***************
*** 30,36 ****
from wxPython.wx import *
from gnue.common import GDebug
from gnue.common import RuntimeSettings
! from gnue.designer.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
--- 30,36 ----
from wxPython.wx import *
from gnue.common import GDebug
from gnue.common import RuntimeSettings
! from gnue.designer.base.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
Index: gnue/designer/src/navigator/TemplateSupport.py
diff -c gnue/designer/src/navigator/TemplateSupport.py:1.1
gnue/designer/src/navigator/TemplateSupport.py:1.2
*** gnue/designer/src/navigator/TemplateSupport.py:1.1 Fri Jun 28 00:03:38 2002
--- gnue/designer/src/navigator/TemplateSupport.py Fri Dec 20 18:56:05 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.designer.TemplateBase import *
import Incubator
# TODO
--- 27,33 ----
# NOTES:
#
! from gnue.designer.base.TemplateBase import *
import Incubator
# TODO
Index: gnue/designer/src/reports/Incubator.py
diff -c gnue/designer/src/reports/Incubator.py:1.4
gnue/designer/src/reports/Incubator.py:1.5
*** gnue/designer/src/reports/Incubator.py:1.4 Fri Dec 20 03:47:25 2002
--- gnue/designer/src/reports/Incubator.py Fri Dec 20 18:56:05 2002
***************
*** 29,35 ****
from gnue.common import GDebug, GParserHelpers
from gnue.reports import GRParser, GRReport, GRLayout
! from gnue.designer.Incubator import *
def createObject(instance, report, tag, type=None, parent=None,
parentHint=None, attributes={}, select=1):
--- 29,35 ----
from gnue.common import GDebug, GParserHelpers
from gnue.reports import GRParser, GRReport, GRLayout
! from gnue.designer.base.Incubator import *
def createObject(instance, report, tag, type=None, parent=None,
parentHint=None, attributes={}, select=1):
***************
*** 41,49 ****
try:
name = attributes['name']
except KeyError:
! if tag.find(':'):
! name = tag[tag.find(':')+1:]
! else:
name = instance.getNextGenericName(tag)
try:
--- 41,49 ----
try:
name = attributes['name']
except KeyError:
! if tag.find(':'):
! name = tag[tag.find(':')+1:]
! else:
name = instance.getNextGenericName(tag)
try:
***************
*** 52,107 ****
attrs = elements[tag]['Attributes']
else:
attrs = {}
! except KeyError:
! if tag.find(':'):
! objclass = GRLayout.GRPassThru
! attrs = attributes
else:
GDebug.printMesg(1, "Attempted to create a '%s', "
! "but I don't know what to do!" % tag)
return
! if tag == 'trigger':
! if not attributes.has_key('type'):
! attributes['type'] = 'NAMED'
! if attributes['type'] == 'NAMED':
! parent = report
! else:
! parent = parent or parentHint
!
! o = objclass(parent or parentHint)
! # Add any GContent
! try:
! GParserHelpers.GContent(o, attributes['_content_'])
! except KeyError:
! pass
!
! # Pull default values for any attributes not supplied
! for attr in attrs.keys():
! if not attributes.has_key(attr):
! if attrs[attr].has_key('Default'):
! attributes[attr] = attrs[attr]['Typecast'](attrs[attr]['Default'])
!
! for attr in attributes.keys():
! if attrs.has_key(attr):
! o.__dict__[attr] = attributes[attr]
! elif attr.find(':')+1:
! # Hackery for reports namespace support
! o.__dict__[attr.replace(':','__')] = attributes[attr]
!
! if isinstance(o, GRLayout.GRPassThru):
o._xmltag = tag[tag.find(':')+1:]
! o._listedAttributes = attributes.keys()
# TODO: GNUe:Reports:Standard ?
! o._xmlnamespace = report.findChildOfType('GRLayout')._xmlchildnamespace
! #'GNUe:Reports:SimpleTabulation'
o.name = name
instance.nameMappings[o.name] = o
! o._buildObject()
! instance.dispatchEvent('ObjectCreated',object=o, originator=__name__)
if select:
instance.dispatchEvent('ObjectSelected',object=object,
originator=__name__)
return o
--- 52,107 ----
attrs = elements[tag]['Attributes']
else:
attrs = {}
! except KeyError:
! if tag.find(':'):
! objclass = GRLayout.GRPassThru
! attrs = attributes
else:
GDebug.printMesg(1, "Attempted to create a '%s', "
! "but I don't know what to do!" % tag)
return
! if tag == 'trigger':
! if not attributes.has_key('type'):
! attributes['type'] = 'NAMED'
! if attributes['type'] == 'NAMED':
! parent = report
! else:
! parent = parent or parentHint
!
! o = objclass(parent or parentHint)
! # Add any GContent
! try:
! GParserHelpers.GContent(o, attributes['_content_'])
! except KeyError:
! pass
!
! # Pull default values for any attributes not supplied
! for attr in attrs.keys():
! if not attributes.has_key(attr):
! if attrs[attr].has_key('Default'):
! attributes[attr] = attrs[attr]['Typecast'](attrs[attr]['Default'])
!
! for attr in attributes.keys():
! if attrs.has_key(attr):
! o.__dict__[attr] = attributes[attr]
! elif attr.find(':')+1:
! # Hackery for reports namespace support
! o.__dict__[attr.replace(':','__')] = attributes[attr]
!
! if isinstance(o, GRLayout.GRPassThru):
o._xmltag = tag[tag.find(':')+1:]
! o._listedAttributes = attributes.keys()
# TODO: GNUe:Reports:Standard ?
! o._xmlnamespace = report.findChildOfType('GRLayout')._xmlchildnamespace
! #'GNUe:Reports:SimpleTabulation'
o.name = name
instance.nameMappings[o.name] = o
! o._buildObject()
! instance.dispatchEvent('ObjectCreated',object=o, originator=__name__)
if select:
instance.dispatchEvent('ObjectSelected',object=object,
originator=__name__)
return o
***************
*** 117,130 ****
def deleteObject(instance, report, object, newCurrentObject=None, firstRun=1):
! if firstRun:
! newCurrentObject = parent = object._parent
!
! for child in object._children:
! if not child._type == '_content_':
! deleteObject(instance, form, child, firstRun=0)
!
! instance.dispatchEvent('ObjectDeleted',object=object, originator=__name__)
if firstRun:
o = parent
--- 117,130 ----
def deleteObject(instance, report, object, newCurrentObject=None, firstRun=1):
! if firstRun:
! newCurrentObject = parent = object._parent
!
! for child in object._children:
! if not child._type == '_content_':
! deleteObject(instance, form, child, firstRun=0)
!
! instance.dispatchEvent('ObjectDeleted',object=object, originator=__name__)
if firstRun:
o = parent
***************
*** 133,139 ****
o = o._parent
if newCurrentObject:
! instance.dispatchEvent('ObjectSelected',object=object,
originator=__name__)
--- 133,139 ----
o = o._parent
if newCurrentObject:
! instance.dispatchEvent('ObjectSelected',object=object,
originator=__name__)
Index: gnue/designer/src/reports/Instance.py
diff -c gnue/designer/src/reports/Instance.py:1.8
gnue/designer/src/reports/Instance.py:1.9
*** gnue/designer/src/reports/Instance.py:1.8 Fri Dec 20 18:25:49 2002
--- gnue/designer/src/reports/Instance.py Fri Dec 20 18:56:05 2002
***************
*** 28,45 ****
#
from gnue.designer.reports import properties as reportsProperties
! from gnue.designer.Instance import BaseInstance
import Incubator
import wizards
# Tool support...
from LayoutEditor import LayoutEditor
from TreeView import TreeView
! from gnue.designer.PropertyEditor import PropertyEditor
! from gnue.designer.DataSourceEditor import DataSourceEditor
! from gnue.designer.SchemaViewer import SchemaViewer
! from gnue.designer.TriggerEditor import TriggerEditor
! from gnue.designer.EventEditor import EventEditor
from gnue.reports import GRReport, GRParser, GRLayout, GRSources, GRParameters
--- 28,45 ----
#
from gnue.designer.reports import properties as reportsProperties
! from gnue.designer.base.Instance import BaseInstance
import Incubator
import wizards
# Tool support...
from LayoutEditor import LayoutEditor
from TreeView import TreeView
! from gnue.designer.base.tools.PropertyEditor import PropertyEditor
! from gnue.designer.base.tools.DataSourceEditor import DataSourceEditor
! from gnue.designer.base.tools.SchemaViewer import SchemaViewer
! from gnue.designer.base.tools.TriggerEditor import TriggerEditor
! from gnue.designer.base.tools.EventEditor import EventEditor
from gnue.reports import GRReport, GRParser, GRLayout, GRSources, GRParameters
Index: gnue/designer/src/reports/LayoutEditor.py
diff -c gnue/designer/src/reports/LayoutEditor.py:1.2
gnue/designer/src/reports/LayoutEditor.py:1.3
*** gnue/designer/src/reports/LayoutEditor.py:1.2 Mon Nov 25 00:41:42 2002
--- gnue/designer/src/reports/LayoutEditor.py Fri Dec 20 18:56:05 2002
***************
*** 28,34 ****
#
from wxPython.wx import *
! from gnue.designer.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
--- 28,34 ----
#
from wxPython.wx import *
! from gnue.designer.base.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
Index: gnue/designer/src/reports/Standard/GroupEditor.py
diff -c gnue/designer/src/reports/Standard/GroupEditor.py:1.1
gnue/designer/src/reports/Standard/GroupEditor.py:1.2
*** gnue/designer/src/reports/Standard/GroupEditor.py:1.1 Fri Dec 20
18:25:49 2002
--- gnue/designer/src/reports/Standard/GroupEditor.py Fri Dec 20 18:56:05 2002
***************
*** 33,40 ****
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from gnue.designer.GridCellEditors import *
! from gnue.designer.ToolPanel import *
Columns = [ ('name','Name'),
('type','Data Type'),
--- 33,40 ----
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from gnue.designer.base.uihelpers.GridCellEditors import *
! from gnue.designer.base.ToolPanel import *
Columns = [ ('name','Name'),
('type','Data Type'),
Index: gnue/designer/src/reports/TemplateSupport.py
diff -c gnue/designer/src/reports/TemplateSupport.py:1.5
gnue/designer/src/reports/TemplateSupport.py:1.6
*** gnue/designer/src/reports/TemplateSupport.py:1.5 Fri Dec 20 03:47:25 2002
--- gnue/designer/src/reports/TemplateSupport.py Fri Dec 20 18:56:05 2002
***************
*** 27,37 ****
# NOTES:
#
! from gnue.designer.TemplateBase import *
import Incubator
from gnue.reports.GRReport import GRReport
!
!
def createRootObject(instance):
return GRReport.GRReport()
--- 27,37 ----
# NOTES:
#
! from gnue.designer.base.TemplateBase import *
import Incubator
from gnue.reports.GRReport import GRReport
!
!
def createRootObject(instance):
return GRReport.GRReport()
Index: gnue/designer/src/reports/TreeView.py
diff -c gnue/designer/src/reports/TreeView.py:1.3
gnue/designer/src/reports/TreeView.py:1.4
*** gnue/designer/src/reports/TreeView.py:1.3 Tue Dec 17 17:39:12 2002
--- gnue/designer/src/reports/TreeView.py Fri Dec 20 18:56:05 2002
***************
*** 31,39 ****
from wxPython.wx import *
from gnue.common import GDebug
from gnue.reports import GRReport, GRLayout, GRSources, GRParameters,
GRSortOptions
! from gnue.designer.PopupMenu import ObjectMenu
! from gnue.designer.Icons import treeIconMap, treeIconList
! from gnue.designer.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
def __init__(self, instance, root, parent):
--- 31,39 ----
from wxPython.wx import *
from gnue.common import GDebug
from gnue.reports import GRReport, GRLayout, GRSources, GRParameters,
GRSortOptions
! from gnue.designer.base.PopupMenu import ObjectMenu
! from gnue.designer.base.Icons import treeIconMap, treeIconList
! from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
def __init__(self, instance, root, parent):
Index: gnue/designer/src/schema/DiaEditor/VisualEditor.py
diff -c gnue/designer/src/schema/DiaEditor/VisualEditor.py:1.6
gnue/designer/src/schema/DiaEditor/VisualEditor.py:1.7
*** gnue/designer/src/schema/DiaEditor/VisualEditor.py:1.6 Wed Dec 18
17:49:47 2002
--- gnue/designer/src/schema/DiaEditor/VisualEditor.py Fri Dec 20 18:56:05 2002
***************
*** 31,37 ****
from VisualTable import *
from gnue.common.schema.Objects import *
from gnue.designer.schema.Incubator import *
! from gnue.designer.ToolPanel import *
class VisualEditor (ToolPanel):
--- 31,37 ----
from VisualTable import *
from gnue.common.schema.Objects import *
from gnue.designer.schema.Incubator import *
! from gnue.designer.base.ToolPanel import *
class VisualEditor (ToolPanel):
Index: gnue/designer/src/schema/Incubator.py
diff -c gnue/designer/src/schema/Incubator.py:1.5
gnue/designer/src/schema/Incubator.py:1.6
*** gnue/designer/src/schema/Incubator.py:1.5 Wed Dec 18 17:49:47 2002
--- gnue/designer/src/schema/Incubator.py Fri Dec 20 18:56:05 2002
***************
*** 29,35 ****
from gnue.common import GDebug
from gnue.common.schema import GSParser, Objects
! from gnue.designer.Incubator import *
def createObject(instance, schema, tag, type=None, parent=None,
parentHint=None, attributes={}):
--- 29,35 ----
from gnue.common import GDebug
from gnue.common.schema import GSParser, Objects
! from gnue.designer.base.Incubator import *
def createObject(instance, schema, tag, type=None, parent=None,
parentHint=None, attributes={}):
Index: gnue/designer/src/schema/Instance.py
diff -c gnue/designer/src/schema/Instance.py:1.16
gnue/designer/src/schema/Instance.py:1.17
*** gnue/designer/src/schema/Instance.py:1.16 Thu Dec 19 15:43:51 2002
--- gnue/designer/src/schema/Instance.py Fri Dec 20 18:56:05 2002
***************
*** 28,34 ****
#
from gnue.designer.schema import properties as schemaProperties
! from gnue.designer.Instance import BaseInstance
from gnue.common.schema import GSParser, Objects
import Incubator
import wizards
--- 28,34 ----
#
from gnue.designer.schema import properties as schemaProperties
! from gnue.designer.base.Instance import BaseInstance
from gnue.common.schema import GSParser, Objects
import Incubator
import wizards
***************
*** 37,45 ****
from LayoutEditor import LayoutEditor
from TreeView import TreeView
from TableEditor import TableEditor
! from gnue.designer.PropertyEditor import PropertyEditor
! from gnue.designer.DataSourceEditor import DataSourceEditor
! from gnue.designer.SchemaViewer import SchemaViewer
from gnue.designer.schema.DiaEditor.VisualEditor import VisualEditor
--- 37,45 ----
from LayoutEditor import LayoutEditor
from TreeView import TreeView
from TableEditor import TableEditor
! from gnue.designer.base.tools.PropertyEditor import PropertyEditor
! from gnue.designer.base.tools.DataSourceEditor import DataSourceEditor
! from gnue.designer.base.tools.SchemaViewer import SchemaViewer
from gnue.designer.schema.DiaEditor.VisualEditor import VisualEditor
Index: gnue/designer/src/schema/LayoutEditor.py
diff -c gnue/designer/src/schema/LayoutEditor.py:1.2
gnue/designer/src/schema/LayoutEditor.py:1.3
*** gnue/designer/src/schema/LayoutEditor.py:1.2 Mon Nov 25 00:41:42 2002
--- gnue/designer/src/schema/LayoutEditor.py Fri Dec 20 18:56:05 2002
***************
*** 28,34 ****
#
from wxPython.wx import *
! from gnue.designer.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
--- 28,34 ----
#
from wxPython.wx import *
! from gnue.designer.base.ToolPanel import ToolPanel
class LayoutEditor (ToolPanel):
Index: gnue/designer/src/schema/TableEditor.py
diff -c gnue/designer/src/schema/TableEditor.py:1.4
gnue/designer/src/schema/TableEditor.py:1.5
*** gnue/designer/src/schema/TableEditor.py:1.4 Fri Dec 20 18:25:50 2002
--- gnue/designer/src/schema/TableEditor.py Fri Dec 20 18:56:05 2002
***************
*** 33,40 ****
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from gnue.designer.ToolPanel import *
! from gnue.designer.GridCellEditors import *
Columns = [ ('name','Name'),
('type','Data Type'),
--- 33,40 ----
from gnue.common import GDebug, GTypecast
from gnue.common.GTrigger import GTrigger
from gnue.common.GParserHelpers import GContent
! from gnue.designer.base.ToolPanel import *
! from gnue.designer.base.uihelpers.GridCellEditors import *
Columns = [ ('name','Name'),
('type','Data Type'),
Index: gnue/designer/src/schema/TemplateSupport.py
diff -c gnue/designer/src/schema/TemplateSupport.py:1.2
gnue/designer/src/schema/TemplateSupport.py:1.3
*** gnue/designer/src/schema/TemplateSupport.py:1.2 Mon Sep 16 19:26:10 2002
--- gnue/designer/src/schema/TemplateSupport.py Fri Dec 20 18:56:05 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.designer.TemplateBase import *
from gnue.common.schema import Objects
import Incubator
--- 27,33 ----
# NOTES:
#
! from gnue.designer.base.TemplateBase import *
from gnue.common.schema import Objects
import Incubator
Index: gnue/designer/src/schema/TreeView.py
diff -c gnue/designer/src/schema/TreeView.py:1.4
gnue/designer/src/schema/TreeView.py:1.5
*** gnue/designer/src/schema/TreeView.py:1.4 Sun Dec 15 17:22:41 2002
--- gnue/designer/src/schema/TreeView.py Fri Dec 20 18:56:05 2002
***************
*** 30,37 ****
import sys, os
from wxPython.wx import *
from gnue.common import GDebug
! from gnue.designer.Icons import treeIconMap, treeIconList
! from gnue.designer.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
def __init__(self, instance, root, parent):
--- 30,37 ----
import sys, os
from wxPython.wx import *
from gnue.common import GDebug
! from gnue.designer.base.Icons import treeIconMap, treeIconList
! from gnue.designer.base.tools.TreeView import TreeView as BaseTreeView
class TreeView (BaseTreeView):
def __init__(self, instance, root, parent):
Index: gnue/designer/src/schema/wizards/WriteSchema.py
diff -c gnue/designer/src/schema/wizards/WriteSchema.py:1.1
gnue/designer/src/schema/wizards/WriteSchema.py:1.2
*** gnue/designer/src/schema/wizards/WriteSchema.py:1.1 Thu Oct 3 10:35:48 2002
--- gnue/designer/src/schema/wizards/WriteSchema.py Fri Dec 20 18:56:05 2002
***************
*** 25,31 ****
# Store Schema into a Database
#
! from gnue.designer.TemplateBase import *
from gnue.designer import VERSION
#from gnue.common
import string
--- 25,31 ----
# Store Schema into a Database
#
! from gnue.designer.base.TemplateBase import *
from gnue.designer import VERSION
#from gnue.common
import string
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/designer setup.py src/Designer.py src/base...,
Jason Cater <=