Changeset 3859

Timestamp:

01/12/08 05:26:07 (11 months ago)

Author:

ed

Message:

Some improvements to the old design. I'm committing these now, and re-writing some of the code to avoid a lot of the redrawing problems that caused problems in the current approach.

Files:

• trunk/ide/MenuBarPanel.py (modified) (4 diffs)
• trunk/ide/MenuDesignerComponents.py (modified) (11 diffs)
• trunk/ide/MenuDesignerForm.py (modified) (2 diffs)
• trunk/ide/MenuPanel.py (modified) (10 diffs)

trunk/ide/MenuBarPanel.py

@@ -30 +30 @@
-    
-    def appendMenu(self, caption, useMRU=False):
-self.Visibl
+Tru
-        self.Sizer.append(mn)
-
+#
-        self.fit()
-        self.Controller.updateLayout()
-        return mn
-    
-    
-    def _setNewMenu(self, mn):
-        mn.PanelVisible = True
-        dabo.ui.setAfterInterval(500, mn, "PanelVisible", False)
-        
-    
-    def insertMenu(self, pos, caption, useMRU=False):
@@ -52 +47 @@
-        
-    def menuClick(self, menu):
+        self.select(menu)
+
+
+    def select(self, menu):
-        self.Controller.Selection = menu
-        menu.PanelVisible = True
-
-
+
+   
-    def fit(self):
-        self.layout(resetMin=True)
@@ -214 +213 @@
-        self.appendMenu(_("View"), False)
-        self.appendMenu(_("Help"), False)
+        
+        for kid in self.Children:
+            kid.Visible = True
-        self.layout()
-        self.fitToSizer()
+
+        self.select(fm)
-        self.Form.unlockDisplay()
-
-
-
-
+
+
+
+
+
+
+
-
-
@@ -267 +274 @@
-    Menus = property(_getMenus, None, None,
-            _("List of all menus in this menubar  (list of MenuPanels)"))
-    
-    

trunk/ide/MenuDesignerComponents.py

@@ -5 +5 @@
-from dabo.dLocalize import _
-import dabo.dEvents as dEvents
+from dabo.ui import makeDynamicProperty
+from dabo.ui import makeProxyProperty
-
-
@@ -57 +59 @@
-    # Displayed name
-    _commonName = "Generic Item"
+    _kids = []
-    
-    def __init__(self, parent, *args, **kwargs):
-        self._caption = ""
-        self._MRU = False
+        self._selected = False
-        self._inUpdate = False
-        # The draw object representing the Caption
@@ -83 +87 @@
-        self.BorderColor = (222, 222, 222)
-        self.Height = 24
-BackColor = self.
+
-        self._selectedBackColor = (255, 255, 192)
-        self._unselectedForeColor = "black"
@@ -89 +93 @@
-        # This is the background draw object
-        self._background = self.drawRectangle(0, 0, -1, -1,
-
-
-
-
+
+
+
+
+
+
+
-        # This will allow the hot key text position to stay right-aligned.
-        self._hotKeyText.DynamicXpos = self.positionHotKeyText
@@ -107 +114 @@
-        self.Buffered = True
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # These two methods will display the item's HelpText
-    # in the form's Status Bar when the mouse is over them.
@@ -150 +174 @@
-            addlwd += self._captionHotKeySpacing
-        calc = capwd + hkwd + addlwd
+        
+        print "WID", self.Caption, calc
-        if curr < calc:
-            self.Width = calc
@@ -179 +205 @@
-        super(CaptionPanel, self).refresh()
-        self.setWidth()
+        print "PAR UP REF", self, self.Parent
-        self.Parent.update()
-        self.Parent.layout()
@@ -362 +389 @@
-    def _setSelected(self, val):
-        if self._constructed():
+            print "SETSEL", self.Caption, val
-            self._selected = val
-
-
-
-
-
-
-
-
-
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
+# 
-            self.Parent.refresh()
-
+# 
-        else:
-            self._properties["Selected"] = val
@@ -429 +457 @@
-        
-
+    _proxyDict = {}
+    Visible = makeProxyProperty(_proxyDict, "Visible", ("self", "_kids"))
-
-
@@ -466 +496 @@
-            # Remove it.
-            self.removeDrawnObject(self._bmp)
+            self._kids.remove(self._bmp)
-            self._bmp = None
-
+
+
+
+
-        wd = self._bmp.Width
-        # Move the text over to fit
@@ -520 +554 @@
-        self._line.DynamicPoints = self.setLineWidth
-        self._line.DynamicPenWidth = self.setLineThick
+        self._kids.append(self._line)
+        
-        
-    def onResize(self, evt):

trunk/ide/MenuDesignerForm.py

@@ -86 +86 @@
-    def initialLayout(self):
-#       print "INITLAY"
-# 
-# 
+
+
-        self.menubar.quickMenu()
-        self.layout()
@@ -195 +195 @@
-        
-    def select(self, obj):
-# 
-# 
+
+
-        if obj is self._selection:
-# 
+
-            return
-        self.lockDisplay()
-        if self._selection is not None:
-# 
+
-            self._selection.Selected = False
-        self._selection = obj
-        self.PropForm.select(obj)
-# 
+
-        obj.Selected = True
-# 
-# 
+
+
-
-        self.ensureVisible(obj)
-        dabo.ui.callAfterInterval(100, self._selectAfter)
-    def _selectAfter(self):
-
-
+
+
+
-        self.refresh()
-        self.unlockDisplay()

trunk/ide/MenuPanel.py

@@ -9 +9 @@
-from MenuDesignerComponents import CaptionBitmapPanel
-from MenuDesignerComponents import SeparatorPanel
+from dabo.ui import makeDynamicProperty
+from dabo.ui import makeProxyProperty
-
-
@@ -26 +28 @@
-                self._controller = None
-                super(_ItemPanel, self).__init__(*args, **kwargs)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            def processContextMenu(self, obj, evt):
-                self.Controller.processContextMenu(obj, evt)                    
@@ -38 +58 @@
-            Controller = property(_getController, _setController, None,
-                    _("Object to which this panel is associated  (MenuPanel)"))
+            
-
-        # Add the panel that will hold the menu items. It needs to
@@ -64 +85 @@
-        
-        
-
-
-
+# 
+# 
+# 
-
-
@@ -81 +102 @@
-            pos = len(self.itemList.Children)
-        if separator:
-
+, Visible=False
-        else:
-            itm = CaptionBitmapPanel(self.itemList, Caption=caption,
-self.Visibl
+Fals
-            itm._className = "MenuItemPanel"
-            itm._commonName = "Menu Item"
@@ -94 +115 @@
-                itm.Picture = picture
-        
+        itm.Visible = True
-        self.itemList.Height += itm.Height
-        self.itemList.Sizer.insert(pos, itm, "x")
@@ -223 +245 @@
-    
-    def _getChildren(self):
-
+
+
+
+
-
-
@@ -230 +255 @@
-
-    def _setPanelVisible(self, val):
-#       print "SETVIS", self.Caption, val
-        if val:
-            localPos = (self.Left, self.Bottom)
@@ -236 +260 @@
-            self.itemList.Position = formPos
-            self.Controller.onShowPanel(self)
+#       self.Visible = val
-        self.itemList.Visible = val
+
+#       itms = self._proxyDict.get("Visible", ())
+#       for xx in itms:
+#           if xx == "Children":
+#               for xkid in self.Children:
+#           elif xx == "self":
+#               print "SELF ITEMLIST", self.itemList.Visible
+#           else:
+#               obj = getattr(self, xx)
+#               print xx, obj.Visible
+        
+        self.itemList.update()
-        self.itemList.Parent.clear()
-        self.layout()
-
+#
-
-
@@ -247 +284 @@
-    PanelVisible = property(_getPanelVisible, _setPanelVisible, None,
-            _("Determines if the menu is currently 'open'  (bool)"))
-
-
-
+
+
+
+