[gnue] r8335 - in trunk/gnue-designer/src: . base base/tools forms/PagePainter reports/Standard schema ui

[jcater]

Author: jcater
Date: 2006-04-02 11:01:55 -0500 (Sun, 02 Apr 2006)
New Revision: 8335

Added:
   trunk/gnue-designer/src/ui/
   trunk/gnue-designer/src/ui/wx/
Removed:
   trunk/gnue-designer/src/ui/kde/
   trunk/gnue-designer/src/ui/qt/
   trunk/gnue-designer/src/ui/wx/
   trunk/gnue-designer/src/uidrivers/
Modified:
   trunk/gnue-designer/src/Designer.py
   trunk/gnue-designer/src/base/ToolBase.py
   trunk/gnue-designer/src/base/tools/EventEditor.py
   trunk/gnue-designer/src/base/tools/TriggerEditor.py
   trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
   trunk/gnue-designer/src/reports/Standard/GroupEditor.py
   trunk/gnue-designer/src/schema/TableEditor.py
Log:
namespace cleanup

Modified: trunk/gnue-designer/src/Designer.py
===================================================================
--- trunk/gnue-designer/src/Designer.py 2006-04-01 06:31:13 UTC (rev 8334)
+++ trunk/gnue-designer/src/Designer.py 2006-04-02 16:01:55 UTC (rev 8335)
@@ -91,7 +91,7 @@
     print "Running"
 
     # TODO: make a startup/GConfig parameter, and/or do auto-detection
-    from gnue.designer.uidrivers.wx.Base import UIBase
+    from gnue.designer.ui.wx.Base import UIBase
 
     self.ui = UIBase(self)
 

Modified: trunk/gnue-designer/src/base/ToolBase.py
===================================================================
--- trunk/gnue-designer/src/base/ToolBase.py    2006-04-01 06:31:13 UTC (rev 
8334)
+++ trunk/gnue-designer/src/base/ToolBase.py    2006-04-02 16:01:55 UTC (rev 
8335)
@@ -30,7 +30,7 @@
 __all__ = ['ToolBase']
 
 import wx
-from gnue.designer.uidrivers.wx.uihelpers import NotebookCtrl
+from gnue.designer.ui.wx.uihelpers import NotebookCtrl
 from gnue.common.apps import RuntimeSettings
 from gnue.common import events
 

Modified: trunk/gnue-designer/src/base/tools/EventEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/EventEditor.py   2006-04-01 06:31:13 UTC 
(rev 8334)
+++ trunk/gnue-designer/src/base/tools/EventEditor.py   2006-04-02 16:01:55 UTC 
(rev 8335)
@@ -38,7 +38,7 @@
 from gnue.common.logic.GTrigger import GTrigger
 from gnue.common.definitions.GParserHelpers import GContent
 from gnue.designer.base.ToolBase import ToolNotebook
-from gnue.designer.uidrivers.wx.uihelpers.GridCellEditors import CharCellEditor
+from gnue.designer.ui.wx.uihelpers.GridCellEditors import CharCellEditor
 
 class EventEditor (ToolNotebook):
 

Modified: trunk/gnue-designer/src/base/tools/TriggerEditor.py
===================================================================
--- trunk/gnue-designer/src/base/tools/TriggerEditor.py 2006-04-01 06:31:13 UTC 
(rev 8334)
+++ trunk/gnue-designer/src/base/tools/TriggerEditor.py 2006-04-02 16:01:55 UTC 
(rev 8335)
@@ -24,7 +24,7 @@
 from gnue.common.definitions import GParserHelpers
 from gnue.common.logic import GTrigger
 from gnue.designer.base.EditorBase import EditorBase
-from gnue.designer.uidrivers.wx.uihelpers.PythonEditor import PythonSTC
+from gnue.designer.ui.wx.uihelpers.PythonEditor import PythonSTC
 
 import wx
 import wx.stc
@@ -112,7 +112,7 @@
 # Scintilla control for python source code
 # ===========================================================================
 # TODO: Add support for our JavaScript triggers
-# TODO: Move to uidrivers/wx?
+# TODO: Move to ui/wx?
 class PythonEditorControl(PythonSTC):
   def __init__(self, parent, *args, **parms):
     PythonSTC.__init__(self, parent, *args, **parms)

Modified: trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-01 
06:31:13 UTC (rev 8334)
+++ trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-04-02 
16:01:55 UTC (rev 8335)
@@ -53,7 +53,7 @@
 
   def init(self, object):
 
-    canvas = self.canvas = PainterCanvas(self)
+    canvas = self.canvas = PagePainterCanvas(self)
     self.document.app.ui.autoSizer(self, canvas)
 
     self.object = object
@@ -81,7 +81,7 @@
 
     # Make the scale slightly larger, so that input widgets
     # are bigger than text labels.
-    xscale += 4
+    #xscale += 4
     yscale += 4
     canvas.set_grid_scale(xscale, yscale)
 
@@ -136,9 +136,9 @@
 
 import cPickle
 
-from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.canvas import 
DocumentCanvas
-from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.widget import 
DocumentWidget
-from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.colors import 
colorIndex
+from gnue.designer.ui.wx.uihelpers.documentcanvas.canvas import DocumentCanvas
+from gnue.designer.ui.wx.uihelpers.documentcanvas.widget import DocumentWidget
+from gnue.designer.ui.wx.uihelpers.documentcanvas.colors import colorIndex
 
 #--------------------------------------------------------------------------
 # form widgets
@@ -267,7 +267,7 @@
 #==========================================================================
 # Canvas implementation
 #==========================================================================
-class PainterCanvas(DocumentCanvas):
+class PagePainterCanvas(DocumentCanvas):
 
     def __init__(self, *args, **parms):
         DocumentCanvas.__init__(self, *args, **parms)

Modified: trunk/gnue-designer/src/reports/Standard/GroupEditor.py
===================================================================
--- trunk/gnue-designer/src/reports/Standard/GroupEditor.py     2006-04-01 
06:31:13 UTC (rev 8334)
+++ trunk/gnue-designer/src/reports/Standard/GroupEditor.py     2006-04-02 
16:01:55 UTC (rev 8335)
@@ -34,7 +34,7 @@
 from gnue.common.formatting import GTypecast
 from gnue.common.logic.GTrigger import GTrigger
 from gnue.common.definitions.GParserHelpers import GContent
-from gnue.designer.uidrivers.wx.uihelpers.GridCellEditors.GridCellEditors 
import *
+from gnue.designer.ui.wx.uihelpers.GridCellEditors.GridCellEditors import *
 from gnue.designer.base.ToolBase import *
 
 Columns = [  ('name','Name'),

Modified: trunk/gnue-designer/src/schema/TableEditor.py
===================================================================
--- trunk/gnue-designer/src/schema/TableEditor.py       2006-04-01 06:31:13 UTC 
(rev 8334)
+++ trunk/gnue-designer/src/schema/TableEditor.py       2006-04-02 16:01:55 UTC 
(rev 8335)
@@ -35,7 +35,7 @@
 from gnue.common.logic.GTrigger import GTrigger
 from gnue.common.definitions.GParserHelpers import GContent
 from gnue.designer.base.ToolBase import *
-from gnue.designer.uidrivers.wx.uihelpers.GridCellEditors import *
+from gnue.designer.ui.wx.uihelpers.GridCellEditors import *
 
 Columns = [  ('name','Name'),
              ('type','Data Type'),

Copied: trunk/gnue-designer/src/ui (from rev 8331, 
trunk/gnue-designer/src/uidrivers)

Copied: trunk/gnue-designer/src/ui/wx (from rev 8334, 
trunk/gnue-designer/src/uidrivers/wx)