gnue/designer/src LayoutEditor.py TreeView.py I...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/07/28 21:12:14

Modified files:
        designer/src   : LayoutEditor.py TreeView.py 
Added files:
        designer/src   : Icons.py 

Log message:
        When double-clicking an object (either in tree view or layout editor), 
properties editor pops up; removed icon code from TreeView and put in own file 
as PopupMenu may soon use icons

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/TreeView.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.18 
gnue/designer/src/LayoutEditor.py:1.19
--- gnue/designer/src/LayoutEditor.py:1.18      Sat Jul 28 20:19:35 2001
+++ gnue/designer/src/LayoutEditor.py   Sat Jul 28 21:12:14 2001
@@ -301,6 +301,7 @@
           for widget in self._currentSelection.keys(): 
             widget.relativeMove(0,1)
 
+
 #
 #
 #
@@ -330,7 +331,7 @@
       self.setAllChildren(EVT_RIGHT_DOWN, widget, self.OnRightDown)
       self.setAllChildren(EVT_RIGHT_UP, widget, self.OnRightUp)
       self.setAllChildren(EVT_MOTION, widget, self.instance.OnMotion)
-
+      self.setAllChildren(EVT_LEFT_DCLICK, widget, self.OnEditProperties)
     self.setAllChildren(EVT_KEY_UP, self.highlightBox, self.instance.keyTrap)
     self.setAllChildren(EVT_SET_FOCUS, self.highlightBox, self.focusGainedTrap)
     self.setAllChildren(EVT_KILL_FOCUS, self.highlightBox, self.focusLostTrap)
@@ -415,6 +416,13 @@
     if event.Dragging() and event.LeftIsDown(): 
       pos = event.GetPositionTuple() 
       self.x, self.y = pos 
+
+
+  def OnEditProperties(self, event): 
+    self.instance._instance.propertyEditorWindow.Show(1)
+    self.instance._instance.propertyEditorWindow.Raise()
+    self.instance._instance.propertyEditorWindow.SetFocus()
+
  
   #
   # Resize the current widget.  dx and dy are incremental
Index: gnue/designer/src/TreeView.py
diff -u gnue/designer/src/TreeView.py:1.12 gnue/designer/src/TreeView.py:1.13
--- gnue/designer/src/TreeView.py:1.12  Sun Jul 22 22:09:35 2001
+++ gnue/designer/src/TreeView.py       Sat Jul 28 21:12:14 2001
@@ -32,6 +32,7 @@
 from gnue.forms import GFForm, GFInstance, GFParser, GFObjects, GFTrigger, 
GFLibrary, UIwxpython
 from GFDesigner import *
 from PopupMenu import ObjectMenu
+from Icons import treeIconMap, treeIconList
 
 class TreeView (wxTreeCtrl):
   def __init__(self, instance, form, parent): 
@@ -73,6 +74,7 @@
     form.walk(self.inventoryLoadedItems)
 
     EVT_RIGHT_UP(self, self.OnRightUp)
+    EVT_LEFT_DCLICK(self, self.OnEditProperties)
 
 
   def inventoryLoadedItems (self, object): 
@@ -190,23 +192,15 @@
     elif object != None: 
       self.PopupMenu(object._popupMenu, event.GetPosition())
       
+  def OnEditProperties(self, event): 
 
-
-
-treeIconMap = {}
-treeIconList = wxImageList(24,24,false)
- 
-if not os.environ.has_key('INSTALL_PREFIX'):
-  iconlocation = os.environ['INSTALL_PREFIX']
-else: 
-  iconlocation = '/usr/local/gnue/shared/images'
-
-for f in ('block','datasource','entry','import','pagewidget',
-          'page','trigger','properties'): 
-  if os.path.isfile('%s/destree_%s.xpm' % (iconlocation, f)):
-    treeIconMap[f] = treeIconList.AddIcon(
-        wxIcon('%s/destree_%s.xpm' % (iconlocation, f), wxBITMAP_TYPE_XPM))
-  else: 
-    treeIconMap[f] = treeIconList.AddIcon(wxNullIcon)
+    id, flags = self.HitTest(event.GetPosition())
+    object = self.GetPyData(id)
+    self.EnsureVisible(id)
+    self.SelectItem(id)
+    if not isinstance(object, ObjectMenu): 
+      self.instance.propertyEditorWindow.Show(1)
+      self.instance.propertyEditorWindow.Raise()
+      self.instance.propertyEditorWindow.SetFocus()