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

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/15 11:49:05

Modified files:
        gnuef/designer/src: Instance.py LayoutHandler.py 

Log message:
        Selecting a tree item selects the preview item and vice-versa

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/Instance.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/designer/src/LayoutHandler.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.2 
gnue/gnuef/designer/src/Instance.py:1.3
--- gnue/gnuef/designer/src/Instance.py:1.2     Thu Jun 14 16:00:08 2001
+++ gnue/gnuef/designer/src/Instance.py Fri Jun 15 11:49:05 2001
@@ -24,6 +24,7 @@
 # DESCRIPTION:
 #
 # NOTES:
+#
 
 import sys, os, time
 from wxPython.wx import *
@@ -34,6 +35,7 @@
 from GFDesigner import *
 from MenuBar import *
 from LayoutHandler import *
+from TreeView import *
 
 class GFDInstance(GFInstance.GFInstance, wxFrame):
   def __init__(self, app, location=None): 
@@ -76,20 +78,15 @@
     hsplitter.SetMinimumPaneSize (100)
 
 
-    # Create tree
-    tID = wxNewId()
-    self.tree = wxTreeCtrl (hsplitter, tID, style=wxTR_HAS_BUTTONS |
-                                                 wxTR_EDIT_LABELS |
-                                        wxTR_HAS_VARIABLE_ROW_HEIGHT)
-
-    EVT_TREE_BEGIN_LABEL_EDIT(self.tree, tID, self.OnTreeLabelEdit)
-    EVT_TREE_END_LABEL_EDIT(self.tree, tID, self.OnTreeLabelEditEnd)
-    EVT_TREE_ITEM_ACTIVATED(self.tree, tID, self.OnTreeItemActivated)
+    # Create structural view (tree)
+    self.tree = TreeView(self, self._form, hsplitter)
 
-    self.editor = wxTextCtrl(hsplitter, -1, style = wxTE_MULTILINE)
-
+    # Create layout panel/preview
     self.layoutHandler = LayoutHandler(self, vsplitter)
 
+    # This is a temp placeholder
+    self.editor = wxTextCtrl(hsplitter, -1, style = wxTE_MULTILINE)
+
 
     self._form._treeItem = self.tree.AddRoot("Form")
     self._form._treeItemFormProperties = \
@@ -113,9 +110,8 @@
     self.layoutHandler.drawPage(self._currentPage)
     hsplitter.SetSashPosition (360, true)
     self.tree.Expand(self._form._treeItem)
-    self.Refresh()
+    self.Refresh()    
 
-
   def uiEventTrap(self, event): 
     pass
 
@@ -147,11 +143,17 @@
           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)
+
 
+  def setCurrentObject (self, object, handler):
+    self.layoutHandler.setCurrentObject(object, handler)
+    self.tree.setCurrentObject(object, handler)
 
   def getNextGenericName (self, type): 
     while 1: 
@@ -181,7 +183,7 @@
       if fileHandle != None: 
         fileHandle.close()
       if fileHandle2 != None: 
-        fileHandle.close()
+        fileHandle2.close()
 
     options = []
     imports = []
@@ -234,16 +236,6 @@
     fileHandle.write(self._form.dumpXML(treeDump=1))
     fileHandle.close()
     
-
-  def OnTreeLabelEdit(self, event): 
-    pass
-
-  def OnTreeLabelEditEnd(self, event): 
-    pass
-
-  def OnTreeItemActivated(self, event): 
-    pass
-
   def OnSave(self, event): 
     if not len(self._path): 
       self.OnSaveAs(event)
Index: gnue/gnuef/designer/src/LayoutHandler.py
diff -u gnue/gnuef/designer/src/LayoutHandler.py:1.3 
gnue/gnuef/designer/src/LayoutHandler.py:1.4
--- gnue/gnuef/designer/src/LayoutHandler.py:1.3        Fri Jun 15 07:47:06 2001
+++ gnue/gnuef/designer/src/LayoutHandler.py    Fri Jun 15 11:49:05 2001
@@ -45,6 +45,23 @@
     self.pageNameLabel = wxStaticText(self, -1, "Page: ", pos=wxPoint(10,20))
     self._pageList = []  # Needed by UIwxpython
 
+  def setCurrentObject (self, object, handler):
+    if object == None: 
+      for o in self._currentSelection.keys():
+        o.setSelected(0)
+      return
+    print "?%s" % (handler)
+    if handler != 'LayoutHandler': 
+      for o in self._currentSelection.keys():
+        o.setSelected(0)
+
+      object.walk(self.__setCurrentObject)
+
+  def __setCurrentObject(self,object): 
+    if hasattr(object, '_widgetHandler'): 
+      self._currentSelection[object._widgetHandler] = 1
+      object._widgetHandler.setSelected(1)
+
   def drawPage(self, page): 
     self._currentSelection = {}
 
@@ -141,13 +158,12 @@
       else: 
         print ("Selected")
         self._currentSelection[selection] = 1
+        self._instance.setCurrentObject(selection.object,'LayoutHandler')
         selection.setSelected(1)
  
  
   def OnLeftUp(self, event): 
     print "Left up"
-#    self.lines.append( (self.colour, self.thickness, self.curLine) ) 
-#    self.curLine = [] 
     self.panel.ReleaseMouse()