Changeset 4063

Show
Ignore:
Timestamp:
05/04/08 11:37:34 (3 months ago)
Author:
ed
Message:

Fixed up some of the issues created by the more modular design.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/ed-ide/components/ClassDesigner/ClassDesignerFormMixin.py

    r4061 r4063  
    1414import ClassDesignerMenu 
    1515from DragHandle import DragHandle 
    16 from wizards.QuickLayoutWizard import QuickLayoutWizard 
     16from QuickLayoutWizard import QuickLayoutWizard 
    1717from ClassDesignerComponents import LayoutPanel 
    1818from ClassDesignerComponents import LayoutBasePanel 

  • branches/ed-ide/components/ClassDesigner/ClassDesignerTreeSheet.py

    r4061 r4063  
    1313from DragHandle import DragHandle 
    1414import ClassDesignerMenu 
    15 from MenuBarPanel import MenuBarPanel 
    16 from MenuPanel import MenuPanel 
    17 from MenuDesignerComponents import SeparatorPanel 
     15# from MenuBarPanel import MenuBarPanel 
     16# from MenuPanel import MenuPanel 
     17# from MenuDesignerComponents import SeparatorPanel 
    1818dui = dabo.ui 
    1919from dabo.ui import makeProxyProperty 
    …… 
    362362                childNode.Object = itm 
    363363 
    364             if not isinstance(itm, (SeparatorPanel, MenuPanel, MenuBarPanel)): 
     364            if not isinstance(itm, (SeparatorPanel, )):        #MenuPanel, MenuBarPanel)): 
    365365                if hasattr(itm, "Sizer") and itm.Sizer: 
    366366                    if isinstance(itm, dui.dialogs.WizardPage): 

  • branches/ed-ide/components/MenuDesigner/MenuDesignerForm.py

    r4061 r4063  
    77import dabo.dEvents as dEvents 
    88import dabo.lib.xmltodict as xtd 
    9 from ClassDesignerExceptions import PropertyUpdateException 
     9from ..ClassDesigner import PropertyUpdateException 
    1010from MenuBarPanel import MenuBarPanel 
    1111from MenuPanel import MenuPanel 

  • branches/ed-ide/components/MenuDesigner/MenuDesignerPropForm.py

    r4061 r4063  
    33from dabo.dLocalize import _ 
    44import dabo.dEvents as dEvents 
    5 from ClassDesignerPropSheet import PropSheet 
    6 from ClassDesignerTreeSheet import TreeSheet 
     5from ..ClassDesigner.ClassDesignerPropSheet import PropSheet 
     6from ..ClassDesigner.ClassDesignerTreeSheet import TreeSheet 
    77 
    88if __name__ == "__main__": 

  • branches/ed-ide/components/ReportDesigner/ReportDesigner.py

    r4061 r4063  
    55dabo.ui.loadUI("wx") 
    66import dabo.dEvents as dEvents 
    7 from dabo.dReportWriter import dReportWriter 
    8 from dabo.lib.reportWriter import * 
     7try: 
     8    from dabo.dReportWriter import dReportWriter 
     9    from dabo.lib.reportWriter import * 
     10except ImportError, e: 
     11    import inspect 
     12    if "Studio.py" not in inspect.stack()[-1][1]: 
     13        # Not being run as part of the Studio app 
     14        raise ImportError, e 
    915from dabo.dLocalize import _ 
    1016from dabo.ui import dKeys 
    11 import ClassDesignerPropSheet 
     17from ..ClassDesigner import ClassDesignerPropSheet 
    1218 
    1319 

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

    r4061 r4063  
    6262        self.p = None 
    6363        self.outputText = "" 
    64         self._outputSashExtra = self.Application.getUserSetting("editorform.outputSashExtra", 100) 
     64        self._outputSashExtra = self.Application.getUserSetting("texteditorform.outputSashExtra", 100) 
    6565 
    6666 
    …… 
    111111        if self.splitter.SashPosition > 0: 
    112112            self._outputSashExtra = self.Height - self.splitter.SashPosition 
    113         self.Application.setUserSetting("editorform.outputSashExtra", self._outputSashExtra) 
     113        self.Application.setUserSetting("texteditorform.outputSashExtra", self._outputSashExtra) 
    114114         
    115115     
    …… 
    295295             
    296296 
    297 class EditorForm(dabo.ui.dForm): 
     297class TextEditorForm(dabo.ui.dForm): 
    298298    def __init__(self, *args, **kwargs): 
    299         super(EditorForm, self).__init__(*args, **kwargs) 
     299        super(TextEditorForm, self).__init__(*args, **kwargs) 
    300300         
    301301         
    …… 
    307307        pnl.Sizer = dabo.ui.dSizer("v") 
    308308        self._lastPath = self.Application.getUserSetting("lastPath", os.getcwd()) 
    309         super(EditorForm, self).afterInit() 
     309        super(TextEditorForm, self).afterInit() 
    310310        self.Caption = _("Dabo Editor") 
    311311        self.funcButton = dabo.ui.dImage(pnl, ScaleMode="Clip", Size=(22,22)) 
    …… 
    691691        self.pgfEditor.closeEditor(ed, False) 
    692692        # Create a new editor form 
    693         frm = EditorForm() 
     693        frm = TextEditorForm() 
    694694        frm.onFileNew(None) 
    695695        frm.openFile(fname) 
    …… 
    726726        if we bound the MRU action to an instance method, it 
    727727        would barf. So we make this a classmethod, and pass  
    728         the call to the first EditorForm instance we can find. 
     728        the call to the first TextEditorForm instance we can find. 
    729729        """ 
    730730        pth = " ".join(evt.prompt.split(" ")[1:]) 
    731         # Find the topmost form that is an EditorForm 
     731        # Find the topmost form that is an TextEditorForm 
    732732        app = dabo.dAppRef 
    733733        try: 
    734734            app.ActiveForm.openFile(pth) 
    735735        except: 
    736             # Call the first available EditorForm 
     736            # Call the first available TextEditorForm 
    737737            edf = [frm for frm in app.uiForms 
    738                     if isinstance(frm, EditorForm)][0] 
     738                    if isinstance(frm, TextEditorForm)][0] 
    739739            edf.openFile(pth) 
    740740    onMRUSelection = classmethod(onMRUSelection) 
    …… 
    10431043    app.setup() 
    10441044 
    1045     frm = app.MainForm = EditorForm() 
     1045    frm = app.MainForm = TextEditorForm() 
    10461046    frm.onFileNew(None) 
    10471047    for file in files: