Changeset 4081

Timestamp:

05/12/2008 06:47:58 AM (2 months ago)

Author:

ed

Message:

incremental commit. Nothing earth-shattering yet, but began fleshing out support for components and plugins.

Files:

• branches/ed-ide/Studio.py (modified) (6 diffs)
• branches/ed-ide/components/ClassDesigner/__init__.py (modified) (1 diff)
• branches/ed-ide/components/TextEditor/__init__.py (modified) (1 diff)

branches/ed-ide/Studio.py

@@ -9 +9 @@
-from dabo.dLocalize import _
-import dabo.dEvents as dEvents
+import components
-from components.ClassDesigner import ClassDesigner
-from components.CxnEditor import CxnEditor
@@ -39 +40 @@
-    def onEditFile(self, evt):
-        if not self._context:
-            print "WASSIP with dat?"
-            return
-        nd = self._context["node"]
@@ -47 +47 @@
-
-
+class StudioToolBar(dabo.ui.dToolBar):
+    """Overrides the _appendInsertButton() method, so that we get actual Dabo
+    dBitmapButton or dToggleButton controls instead of the default wx.ToolBarItem
+    buttons that are difficult to work with.
+    """
+    def _appendInsertButton(self, pos, caption, pic, bindfunc, toggle, tip, help, *args, **kwargs):
+        buttonClass = {True: dabo.ui.dToggleButton, False: dabo.ui.dBitmapButton}[toggle]
+        if not toggle:
+            kwargs["AutoSize"] = True
+        ctl = buttonClass(self, Caption=caption, Picture=pic, ToolTipText=tip, *args, **kwargs)
+        # Don't show the caption if there is an image
+        def _dyncap(obj):
+            if obj.Picture:
+                return ""
+            else:
+                return obj._caption
+        ctl.DynamicCaption = (_dyncap, ctl)
+        return self.insertControl(pos, ctl, bindfunc=bindfunc)
-
-
+
+
-    def initProperties(self):
-        self.Caption = _("Dabo Developer Studio")
@@ -55 +74 @@
-
-    def afterInit(self):
-dabo.ui.setAfter(self.Splitter, "SashPercent", 30)
-pnl1 = self.Panel1
-pnl1.Sizer.Orientation = "v"
-pnl1
-pnl1.Sizer
-pnl1
+treePnl = self.projectTreePanel = self.addPanel(Caption=_("Projects"), Docked=True, 
+       DockSide="Left", ShowPinButton=True)
+sz = self.projectTreePanel.Sizer = dabo.ui.dSizer("v")
+treePnl
+sz
+treePnl
-        self.tree.controller = self
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -72 +132 @@
-        pg.openFile(pth)
-        self.pgfEditors.SelectedPage = pg
+        self.CurrentToolBar = "TextEditor"
-
-
@@ -85 +146 @@
-
-
+    def _getCurrentToolBar(self):
+        return self._currentToolBar
+
+    def _setCurrentToolBar(self, val):
+        if self._constructed():
+            if val == self._currentToolBar:
+                return
+            if val not in self._toolSets:
+                dabo.errorLog.write(_("Invalid toolbar specified: '%s'") % val)
+                
+                print self._toolSets.keys()
+                return
+            # Hide all visible buttons
+            for btn in self.toolbar.Children[::-1]:
+                self.toolbar.remove(btn, False)
+            self._currentToolBar = val
+            # Show the new button set
+            for btn in self._toolSets[self._currentToolBar]:
+                try:
+                    self.toolbar.appendItem(btn)
+                except AttributeError:
+                    # A control, not a tool item
+                    btn.Visible = True
+        else:
+            self._properties["CurrentToolBar"] = val
+
+
+    CurrentToolBar = property(_getCurrentToolBar, _setCurrentToolBar, None,
+            _("Name of the current toolbar to display. Changing this will change the buttons that are visible in the editing area.  (str)"))
+
+
+
-def main():
-    app = dabo.dApp()
+    app.BasePrefKey = "DeveloperStudio"
-    app.MainFormClass = StudioForm
-    app.start()

branches/ed-ide/components/ClassDesigner/__init__.py

@@ -2 +2 @@
-# -*- coding: utf-8 -*-
-
-# from ClassDesignerPropSheet import PropSheet
-# from ClassDesignerPropSheet import PropertyGrid
-# from ClassDesignerComponents import LayoutSaverMixin
-# from ClassDesignerComponents import LayoutPanel
-# from ClassDesignerComponents import LayoutSpacerPanel
-# from ClassDesignerComponents import LayoutSizerMixin
-# from ClassDesignerComponents import LayoutSizer
-# from ClassDesignerComponents import LayoutBorderSizer
-# from ClassDesignerComponents import LayoutGridSizer
-# from ClassDesignerComponents import LayoutBasePanel
-# from ClassDesignerComponents import NoSizerBasePanel
-# from ClassDesignerTreeSheet import TreeSheet
-# from ClassDesignerObjectPropertySheet import ObjectPropertySheet
-# from ClassDesignerCustomPropertyDialog import ClassDesignerCustomPropertyDialog
-# from ClassDesignerControlMixin import ClassDesignerControlMixin
-# from ClassDesignerFormMixin import ClassDesignerFormMixin
-# from ClassDesignerEditor import EditorControl
-# from ClassDesignerEditor import EditorForm
-# from ClassDesignerPemForm import PemForm
-# from ClassDesignerMethodSheet import MethodSheet
-# from ClassDesignerSizerPalette import ContentBoxSizerPanel
-# from ClassDesignerSizerPalette import ContentGridSizerPanel
-# from ClassDesignerSizerPalette import BoxSizerSelfPanel
-# from ClassDesignerSizerPalette import GridSizerSelfPanel
-# from ClassDesignerSizerPalette import SizerInfoFrame
-# from ClassDesignerSizerPalette import SizerContentFrame
-# from ClassDesignerSizerPalette import SizerSelfFrame
-# from ClassDesignerSizerPalette import AbstractSizerPanel
-# from ClassDesignerSizerPalette import SizerContentPanel
-# from ClassDesignerSizerPalette import SizerSelfPanel
-# from ClassDesignerSizerPalette import SizerPaletteForm
-from ClassDesigner import ClassDesigner
-from ClassDesignerExceptions import PropertyUpdateException
+
+
+def register(master):
+    print "Class Designer is registered"
+#   toolbar
+#   editor class
+#   extensions
+    

branches/ed-ide/components/TextEditor/__init__.py

@@ -2 +2 @@
-# -*- coding: utf-8 -*-
-
+import dabo
+import dabo.dEvents as dEvents
+from dabo.dLocalize import _
+import TextEditor
-from TextEditor import EditorPage as TextEditorPage
+
+masterForm = None
+
+def register(master):
+    global masterForm
+    masterForm = master
+    tb = master.toolbar
+
+    funcBtn = tb.appendButton(_("Functions"), 
+            dabo.ui.bitmapFromData(TextEditor.funcButtonData()),
+            toggle=False,
+            OnMouseLeftDown=onFuncButton)
+    bmkBtn = tb.appendButton(_("Bookmarks"), 
+            dabo.ui.bitmapFromData(TextEditor.bmkButtonData()),
+            toggle=False,
+            OnMouseLeftDown=onBmkButton)
+    printBtn = tb.appendButton(_("Print"), 
+            "print",
+            toggle=False,
+            OnHit=onPrint)
+    lexSelector = dabo.ui.dDropdownList(tb, ValueMode="String",
+        Choices = dabo.ui.dEditor.getAvailableLanguages(),
+        OnHit = onLexSelect)
+    tb.appendControl(lexSelector)
+
+    master.setToolBarGroup("TextEditor", [funcBtn, bmkBtn, printBtn, lexSelector])
+
+
+def onFuncButton(evt):
+    masterForm.Caption = "FUNC BUTT"
+def onBmkButton(evt):
+    masterForm.Caption = "BMK BUTT"
+def onPrint(evt):
+    masterForm.Caption = "PRINT BUTT"
+def onLexSelect(evt):
+    masterForm.Caption = evt.EventObject.Value
+
+    def updateLex(self):
+            if not self.lexSelector.Choices:
+                self.lexSelector.Choices = self.CurrentEditor.getAvailableLanguages()