gnue/gnuef/designer/src Instance.py LayoutEdito...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/15 14:58:30

Modified files:
        gnuef/designer/src: Instance.py 
Added files:
        gnuef/designer/src: LayoutEditor.py PropertyEditor.py 
                            TreeView.py TriggerEditor.py 
Removed files:
        gnuef/designer/src: LayoutHandler.py 

Log message:
        Restructured source files into more modular approach.  Started work on 
property editor.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/LayoutEditor.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/PropertyEditor.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/TreeView.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/TriggerEditor.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/gnuef/designer/src/Instance.py
diff -u gnue/gnuef/designer/src/Instance.py:1.3 
gnue/gnuef/designer/src/Instance.py:1.4
--- gnue/gnuef/designer/src/Instance.py:1.3     Fri Jun 15 11:49:05 2001
+++ gnue/gnuef/designer/src/Instance.py Fri Jun 15 14:58:30 2001
@@ -34,8 +34,10 @@
 from Debugger import DebugSession
 from GFDesigner import *
 from MenuBar import *
-from LayoutHandler import *
+from LayoutEditor import *
 from TreeView import *
+from PropertyEditor import * 
+from TriggerEditor import *
 
 class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
@@ -82,33 +84,20 @@
     self.tree = TreeView(self, self._form, hsplitter)
 
     # Create layout panel/preview
-    self.layoutHandler = LayoutHandler(self, vsplitter)
+    self.layoutEditor = LayoutEditor(self, vsplitter)
 
     # This is a temp placeholder
-    self.editor = wxTextCtrl(hsplitter, -1, style = wxTE_MULTILINE)
+    self.propertyEditor = PropertyEditor(hsplitter, self, self._form)
 
-
-    self._form._treeItem = self.tree.AddRoot("Form")
-    self._form._treeItemFormProperties = \
-        self.tree.AppendItem(self._form._treeItem, "Properties")
-    self._form._treeItemImportedLibraries = \
-        self.tree.AppendItem(self._form._treeItem, "Imported Libraries")
-    self._form._treeItemDataSources = \
-        self.tree.AppendItem(self._form._treeItem, "Data Sources")
-    self._form._treeItemNamedTriggers = \
-        self.tree.AppendItem(self._form._treeItem, "Shared Triggers")
-    self._form._treeItemPageLayout = \
-        self.tree.AppendItem(self._form._treeItem, "Page Layout")
-
     self._form.walk(self.inventoryLoadedItems)
 
     self._currentPage = self._pages[0]
-    hsplitter.SplitHorizontally (self.tree, self.editor)
-    vsplitter.SplitVertically(hsplitter, self.layoutHandler)
-    vsplitter.SetSashPosition (180, true)
+    hsplitter.SplitHorizontally (self.tree, self.propertyEditor)
+    vsplitter.SplitVertically(hsplitter, self.layoutEditor)
+    vsplitter.SetSashPosition (220, true)
     self.vsplitter = vsplitter
-    self.layoutHandler.drawPage(self._currentPage)
-    hsplitter.SetSashPosition (360, true)
+    self.layoutEditor.drawPage(self._currentPage)
+    hsplitter.SetSashPosition (320, true)
     self.tree.Expand(self._form._treeItem)
     self.Refresh()    
 
@@ -117,43 +106,22 @@
 
   def inventoryLoadedItems (self, object): 
 
-    if object != self._form: 
-      
+    if object != self._form:
       if hasattr(object, 'name') and \
          (object.name == None or (
           object.name[:3] == "__<" and \
           object.name[-3:] == ">__")): 
         object.name = self.getNextGenericName(object.getObjectType()[2:])
 
-      if isinstance(object, GFObjects.GFOptions) and \
-         object._parent == self._form: 
-        object._treeItem = self._form._treeItemFormProperties
-      else: 
-        parentTreeItem = object._parent._treeItem
-        if isinstance(object, GFTrigger.GFTrigger) and \
-           object.type == 'NAMED': 
-          parentTreeItem = self._form._treeItemNamedTriggers
-        elif isinstance(object, GFTrigger.GFTrigger):
-          parentTreeItem = object._parent._treeItemTrigger
-        elif isinstance(object, GFObjects.GFDataSource): 
-          parentTreeItem = self._form._treeItemDataSources
-        elif isinstance(object, GFObjects.GFPage) and \
-             object._parent == self._form: 
-          self._pages.append(object)
-          parentTreeItem = self._form._treeItemPageLayout
-        object._treeItem = self.tree.AppendItem(parentTreeItem, 
-            "%s" % object.getDescription())
-        self.tree.SetPyData(object._treeItem, object)
-
-    if isinstance (object, GFTrigger.GFTriggerAware): 
-      object._treeItemTrigger = \
-        self.tree.AppendItem(object._treeItem, "Events")
-      self.tree.SetPyData(object._treeItemTrigger, object)
+    if isinstance(object, GFObjects.GFPage) and \
+        object._parent == self._form:
+      self._pages.append(object)
 
 
   def setCurrentObject (self, object, handler):
-    self.layoutHandler.setCurrentObject(object, handler)
     self.tree.setCurrentObject(object, handler)
+    self.propertyEditor.setCurrentObject(object, handler)
+    self.layoutEditor.setCurrentObject(object, handler)
 
   def getNextGenericName (self, type): 
     while 1: 
@@ -253,3 +221,6 @@
     DebugSession(self)
 
 
+class ToolFrame (wxFrame): 
+  def __init__(self, app, title): 
+    wxFrame.__init__(self, app, -1, title)