X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09f3d4e679f5742c54fb062ede846b77606a9c5b..9d7de3c2b84dc40d969d5f993247df02c18b3d3f:/wxPython/tools/XRCed/xrced.py diff --git a/wxPython/tools/XRCed/xrced.py b/wxPython/tools/XRCed/xrced.py index 6d19390d8b..5540a3d921 100644 --- a/wxPython/tools/XRCed/xrced.py +++ b/wxPython/tools/XRCed/xrced.py @@ -2,6 +2,7 @@ # Purpose: XRC editor, main module # Author: Roman Rolinsky # Created: 20.08.2001 +# RCS-ID: $Id$ from wxPython.wx import * from wxPython.xrc import * @@ -14,10 +15,17 @@ import tempfile import images # String constants -htmlHeader = '\n' + +faceColour = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_3DFACE) +# Background colour problem on wxGTK +if wxGetOsVersion()[1] == 1: + bgcolor = (faceColour.Red()-1, faceColour.Green()-1, faceColour.Blue()-1) +else: + bgcolor = (faceColour.Red(), faceColour.Green(), faceColour.Blue()) +htmlHeader = '\n' % bgcolor htmlFooter = '\n' progname = 'XRCed' -version = '0.0.3' +version = '0.0.6' # Local modules from xxx import * @@ -48,69 +56,229 @@ def SetMenu(m, list): else: # separator m.AppendSeparator() -# Properties panel -class Panel(wxHtmlWindow): - def __init__(self, parent, id): - wxHtmlWindow.__init__(self, parent, id) - self.SetBorders(5) - self.SetFonts('', '', [8, 10, 12, 14, 16, 19, 24]) - EVT_CHECKBOX(self, xxxObject.ID_CHECK_PARAMS, self.OnCheckParams) - EVT_CHECKBOX(self, xxxChildContainer.ID_CHECK_PARAMS, self.OnCheckParams) - self.modified = false - +################################################################################ + +# Properties panel containing notebook +class Panel(wxNotebook): + def __init__(self, parent, id = -1): + wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM) + sys.modules['params'].panel = self + self.page1 = HtmlPage(self) + self.AddPage(self.page1, 'Properties') + self.page2 = None + # Cache for already used panels + self.styleCache = {} + def SetData(self, xxx): + # First page + self.page1.SetPageData(xxx) + # Replace/remove style page + curPage = self.GetSelection() + if self.page2: + # If style page for a same class, don't need to recreate + if xxx and self.page2.cacheId == xxx.treeObject().__class__: + self.page2.SetData(xxx.treeObject()) + return + # Else remove and then add if needed + self.RemovePage(1) + if not self.styleCache.has_key(self.page2.cacheId): + self.styleCache[self.page2.cacheId] = self.page2 + self.Freeze() + if xxx and xxx.treeObject().hasStyle: + cacheId = xxx.treeObject().__class__ + if self.styleCache.has_key(cacheId): + self.page2 = self.styleCache[cacheId] + self.page2.SetData(xxx.treeObject()) + else: + self.page2 = StylePage(self, xxx.treeObject()) + self.AddPage(self.page2, 'Style') + else: + self.page2 = None + # Keep page selected + if self.page2 and curPage == 1: + self.SetSelection(curPage) + self.Thaw() def Clear(self): - self.SetPage(htmlHeader + 'select a tree item on the left' + htmlFooter) - + self.page1.Clear() + if self.page2: + self.RemovePage(1) + self.page2.Destroy() + self.page2 = None + # If some parameter on some page has changed + def IsModified(self): + return self.page1.IsModified() or self.page2 and self.page2.IsModified() + def SetModified(self, value): + self.page1.SetModified(value) + if self.page2: + self.page2.SetModified(value) + +################################################################################ + +# General class for notebook pages +class ParamPage: + def __init__(self): + # Register event handlers + for id in paramIDs.values(): + EVT_CHECKBOX(self, id, self.OnCheckParams) def OnCheckParams(self, evt): selected = tree.GetSelection() xxx = tree.GetPyData(selected) - if xxx.hasChild and evt.GetId() != xxxChildContainer.ID_CHECK_PARAMS: - xxx = xxx.child + winName = evt.GetEventObject().GetName() + sizerParam = false + if winName[0] == '_': + param = winName[7:] + sizerParam = true + else: + if xxx.hasChild: xxx = xxx.child + param = winName[6:] # Set current object - param = evt.GetEventObject().GetName()[6:] - if xxx.hasChild: - w = GetRegistered('_'+param) + if sizerParam: + w = self.FindWindowByName('_data_' + param) else: - w = GetRegistered(param) - elem = xxx.element + w = self.FindWindowByName('data_' + param) + objElem = xxx.element if evt.IsChecked(): # Ad new text node in order of allParams - w.SetValue('') - textElem = tree.dom.createElement(param) - textNode = tree.dom.createTextNode('') - textElem.appendChild(textNode) + w.SetValue('') # set empty (default) value + w.SetModified() # mark as changed + elem = tree.dom.createElement(param) + xxx.params[param] = xxxParam(elem) # Find place to put new element: first present element after param found = false - for p in xxx.allParams[xxx.allParams.index(param) + 1:]: + paramStyles = xxx.allParams + xxx.styles + for p in paramStyles[paramStyles.index(param) + 1:]: # Content params don't have same type if xxx.params.has_key(p) and p != 'content': found = true break if found: - nextTextElem = xxx.params[p].parentNode - elem.insertBefore(textElem, nextTextElem) + nextTextElem = xxx.params[p].node + objElem.insertBefore(elem, nextTextElem) else: - elem.appendChild(textElem) - xxx.params[param] = textNode + objElem.appendChild(elem) else: - # Remove parameter element and following text node - textElem = xxx.params[param].parentNode - newline = textElem.nextSibling - if newline and newline.nodeType == minidom.Node.TEXT_NODE: - elem.removeChild(newline) - elem.removeChild(textElem) + # Remove parameter + xxx.params[param].remove() del xxx.params[param] w.SetValue('') + # Set modified flas + self.SetModified(true) w.Enable(evt.IsChecked()) - # Set modified flas - self.SetModified(true) - # If some parameter was changed + +################################################################################ + +# Properties panel notebook page +class HtmlPage(wxHtmlWindow, ParamPage): + def __init__(self, parent, id = -1): + wxHtmlWindow.__init__(self, parent, id) + ParamPage.__init__(self) + self.SetBorders(5) + if wxGetOsVersion()[1] == 1: + self.SetFonts('', '', [8, 10, 12, 14, 16, 19, 24]) + else: + self.SetFonts("", "", [7, 8, 10, 12, 16, 22, 30]) + self.modified = false + # Previous type + self.xxxClass = self.xxxChildClass = None + def Clear(self): + self.SetPage(htmlHeader + 'select a tree item on the left' + htmlFooter) + def SetPageData(self, xxx): + if not xxx: + self.SetPage(htmlHeader + 'this item has no properties' + htmlFooter) + return + self.Freeze() # doesn't seem to help + # Don't change interface if same class + compare = false + if self.xxxClass and self.xxxClass == xxx.__class__: + compare = true # a little weird code + if xxx.hasChild: + if self.xxxChildClass != xxx.child.__class__: + compare = false + if not compare: # not same + self.SetPage(htmlHeader + xxx.generateHtml() + htmlFooter) + self.xxxClass = xxx.__class__ + if xxx.hasChild: self.xxxChildClass = xxx.child.__class__ + self.SetValues(xxx) + if xxx.hasChild: + self.SetValues(xxx.child) + self.Thaw() + def SetValues(self, xxx): + # Set values, checkboxes to false, disable defaults + if xxx.hasChild: prefix = '_' + else: prefix = '' + if xxx.hasName: + self.FindWindowByName('data_name').SetValue(xxx.name) + for param in xxx.allParams: + try: + value = xxx.params[param].value() + self.FindWindowByName(prefix + 'data_' + param).SetValue(value) + if not param in xxx.required: + self.FindWindowByName(prefix + 'check_' + param).SetValue(true) + except KeyError: + self.FindWindowByName(prefix + 'data_' + param).Enable(false) + # If some parameter has changed def IsModified(self): return self.modified def SetModified(self, value): self.modified = value +################################################################################ + +# Style notebook page +class StylePage(wxPanel, ParamPage): + def __init__(self, parent, xxx): + wxPanel.__init__(self, parent, -1) + ParamPage.__init__(self) + self.cacheId = xxx.__class__ + if wxGetOsVersion()[1] == 1: + self.SetFont(wxFont(12, wxDEFAULT, wxNORMAL, wxNORMAL)) + else: + self.SetFont(wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL)) + topSizer = wxBoxSizer(wxVERTICAL) + sizer = wxFlexGridSizer(len(xxx.styles), 2, 1, 1) + self.controls = {} # save python objects + for param in xxx.styles: + present = param in xxx.params.keys() + check = wxCheckBox(self, paramIDs[param], + param + ':', name = 'check_' + param) + check.SetValue(present) + control = paramDict[param](self, name = 'data_' + param) + if present: + control.SetValue(xxx.params[param].value()) + else: + control.SetValue('') + control.Enable(present) + sizer.AddMany([ (check, 0, wxALIGN_CENTER_VERTICAL), + (control, 0, wxALIGN_CENTER_VERTICAL) ]) + self.controls[param] = control + topSizer.Add(sizer, 1, wxALL, 5) + self.SetAutoLayout(true) + self.SetSizer(topSizer) + + self.modified = false + + # Set data for a cahced page + def SetData(self, xxx): + for param in xxx.styles: + present = param in xxx.params.keys() + check = self.FindWindowByName('check_' + param) + check.SetValue(present) + control = self.controls[param] + if present: + control.SetValue(xxx.params[param].value()) + else: + control.SetValue('') + control.Enable(present) + self.modified = false + + # If some parameter has changed + def IsModified(self): + return self.modified + def SetModified(self, value): + self.modified = value + +################################################################################ + class HightLightBox: def __init__(self, pos, size): w = testWin.panel @@ -136,6 +304,8 @@ class HightLightBox: map(wxWindow.Destroy, self.lines) testWin.highLight = None +################################################################################ + class MemoryFile: def __init__(self, name): self.name = name @@ -151,10 +321,13 @@ class MemoryFile: class XML_Tree(wxTreeCtrl): def __init__(self, parent, id): - wxTreeCtrl.__init__(self, parent, id) + wxTreeCtrl.__init__(self, parent, id, + style=wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT) self.SetBackgroundColour(wxColour(224, 248, 224)) EVT_TREE_SEL_CHANGED(self, self.GetId(), self.OnSelChanged) + # One works on Linux, another on Windows EVT_TREE_ITEM_ACTIVATED(self, self.GetId(), self.OnItemActivated) + EVT_LEFT_DCLICK(self, self.OnDClick) EVT_RIGHT_DOWN(self, self.OnRightDown) self.needUpdate = false self.pendingHighLight = None @@ -162,17 +335,20 @@ class XML_Tree(wxTreeCtrl): self.dom = None # Create image list il = wxImageList(16, 16, true) - xxxPanel.image = il.AddIcon( wxIconFromXPMData(images.getTreePanelData()) ) - xxxDialog.image = il.AddIcon( wxIconFromXPMData(images.getTreeDialogData()) ) - xxxFrame.image = il.AddIcon( wxIconFromXPMData(images.getTreeFrameData()) ) - xxxMenuBar.image = il.AddIcon( wxIconFromXPMData(images.getTreeMenuBarData()) ) - xxxMenu.image = il.AddIcon( wxIconFromXPMData(images.getTreeMenuData()) ) - xxxSizer.imageH = il.AddIcon( wxIconFromXPMData(images.getTreeSizerHData()) ) - xxxSizer.imageV = il.AddIcon( wxIconFromXPMData(images.getTreeSizerVData()) ) - xxxStaticBoxSizer.imageH = il.AddIcon( wxIconFromXPMData(images.getTreeStaticBoxSizerHData()) ) - xxxStaticBoxSizer.imageV = il.AddIcon( wxIconFromXPMData(images.getTreeStaticBoxSizerVData()) ) - xxxGridSizer.image = il.AddIcon( wxIconFromXPMData(images.getTreeSizerGridData()) ) - xxxFlexGridSizer.image = il.AddIcon( wxIconFromXPMData(images.getTreeSizerFlexGridData()) ) + self.rootImage = il.AddIcon(wxIconFromXPMData(images.getTreeRootData())) + xxxObject.image = il.AddIcon(wxIconFromXPMData(images.getTreeDefaultData())) + xxxPanel.image = il.AddIcon(wxIconFromXPMData(images.getTreePanelData())) + xxxDialog.image = il.AddIcon(wxIconFromXPMData(images.getTreeDialogData())) + xxxFrame.image = il.AddIcon(wxIconFromXPMData(images.getTreeFrameData())) + xxxMenuBar.image = il.AddIcon(wxIconFromXPMData(images.getTreeMenuBarData())) + xxxToolBar.image = il.AddIcon(wxIconFromXPMData(images.getTreeToolBarData())) + xxxMenu.image = il.AddIcon(wxIconFromXPMData(images.getTreeMenuData())) + xxxSizer.imageH = il.AddIcon(wxIconFromXPMData(images.getTreeSizerHData())) + xxxSizer.imageV = il.AddIcon(wxIconFromXPMData(images.getTreeSizerVData())) + xxxStaticBoxSizer.imageH = il.AddIcon(wxIconFromXPMData(images.getTreeStaticBoxSizerHData())) + xxxStaticBoxSizer.imageV = il.AddIcon(wxIconFromXPMData(images.getTreeStaticBoxSizerVData())) + xxxGridSizer.image = il.AddIcon(wxIconFromXPMData(images.getTreeSizerGridData())) + xxxFlexGridSizer.image = il.AddIcon(wxIconFromXPMData(images.getTreeSizerFlexGridData())) self.il = il self.SetImageList(il) @@ -182,7 +358,7 @@ class XML_Tree(wxTreeCtrl): wxTreeCtrl.Unselect(self) def GetSelection(self): return self.selection - + def ExpandAll(self, item): if self.ItemHasChildren(item): self.Expand(item) @@ -211,7 +387,10 @@ class XML_Tree(wxTreeCtrl): # 'object' tag. xxxParent is parent xxx object def AddNode(self, itemParent, xxxParent, node): # Set item data to current node - xxx = MakeXXXFromDOM(xxxParent, node) + try: + xxx = MakeXXXFromDOM(xxxParent, node) + except: + return treeObj = xxx.treeObject() # Append tree item item = self.AppendItem(itemParent, treeObj.treeName(), @@ -226,7 +405,7 @@ class XML_Tree(wxTreeCtrl): elif n.nodeType != minidom.Node.ELEMENT_NODE: treeObj.element.removeChild(n) n.unlink() - + # Remove leaf of tree, return it's data object def RemoveLeaf(self, leaf): @@ -300,51 +479,12 @@ class XML_Tree(wxTreeCtrl): item = evt.GetItem() self.selection = item # !!! fix xxx = self.GetPyData(item) - html = htmlHeader - # List of parameters tuples (parameter, isDefined) - if not xxx: # root item - html += 'this item has no properties' + htmlFooter - panel.SetPage(html) - if testWin and testWin.highLight: - testWin.highLight.Remove() + # Update panel + panel.SetData(xxx) + # Remove highlight? + if not xxx and testWin and testWin.highLight: + testWin.highLight.Remove() return - # Normal nodes - ClearRegister() # empty register - html += xxx.generateHtml() - html += htmlFooter - panel.SetPage(html) - # Set values, checkboxes to false, disable defaults - if xxx.hasChild: prefix = '_' - else: prefix = '' - for param in xxx.allParams: - if xxx.params.has_key(param): - if param == 'content': - value = [] - for text in xxx.params[param]: - value.append(str(text.data)) # convert from unicode - else: - value = xxx.params[param].data - GetRegistered(prefix + param).SetValue(value) - if not param in xxx.required: - panel.FindWindowByName('check_' + param).SetValue(true) - else: - GetRegistered(prefix + param).Enable(false) - # Same for the child of sizeritem - if xxx.hasChild: - xxx = xxx.child - for param in xxx.allParams: - if xxx.params.has_key(param): - if param == 'content': - value = [] - for text in xxx.params[param]: - value.append(str(text.data)) # convert from unicode - else: - value = xxx.params[param].data - GetRegistered(param).SetValue(value) - if not param in xxx.required: - panel.FindWindowByName('check_' + param).SetValue(true) - else: - GetRegistered(param).Enable(false) # Clear flag panel.SetModified(false) # Hightlighting is done in OnIdle @@ -363,7 +503,7 @@ class XML_Tree(wxTreeCtrl): not in ['wxDialog', 'wxPanel', 'wxFrame']: return # Top-level does not have highlight - if item == testWin.item: + if item == testWin.item or item == tree.GetRootItem(): if testWin.highLight: testWin.highLight.Remove() return # If a control from another window is selected, remove highlight @@ -390,8 +530,8 @@ class XML_Tree(wxTreeCtrl): except AttributeError: testWin.highLight = HightLightBox(pos, size) testWin.highLight.item = item - - # Double-click + + # Double-click on Linux def OnItemActivated(self, evt): item = evt.GetItem() xxx = self.GetPyData(item) @@ -399,7 +539,21 @@ class XML_Tree(wxTreeCtrl): if panel.IsModified(): self.Apply(xxx, item) # apply changes self.CreateTestWin(item) - + + # Double-click on Windows + def OnDClick(self, evt): + id, flags = self.HitTest(evt.GetPosition()) + if flags in [wxTREE_HITTEST_ONITEMBUTTON, wxTREE_HITTEST_ONITEMLABEL]: + # !!! can't create a wxTreeItemId from int + item = self.selection # assume item already selected + xxx = self.GetPyData(item) + if not xxx: return # if root selected, do nothing + if panel.IsModified(): + self.Apply(xxx, item) # apply changes + self.CreateTestWin(item) + else: + evt.Skip() + # (re)create test window def CreateTestWin(self, node): global testWin @@ -494,7 +648,7 @@ class XML_Tree(wxTreeCtrl): testWin.highLight = None if highLight and not tree.pendingHighLight: self.HighLight(highLight) - + def OnCloseTestWin(self, evt): global testWin, testWinPos testWinPos = testWin.GetPosition() @@ -514,13 +668,16 @@ class XML_Tree(wxTreeCtrl): # Pull-down def OnRightDown(self, evt): # Setup menu - pullDownMenu.menu = wxMenu() + menu = wxMenu() + item = self.GetSelection() - if not item.IsOk(): - pullDownMenu.menu.Append(pullDownMenu.ID_EXPAND, 'Expand', 'Expand tree') + if not item.IsOk(): + menu.Append(pullDownMenu.ID_EXPAND, 'Expand', 'Expand tree') else: self.ctrl = evt.ControlDown() # save Ctrl state - m = wxMenu() # create menu + self.shift = evt.ShiftDown() # and Shift too + m = wxMenu() # create menu + needInsert = false if item != self.GetRootItem(): needInsert = self.NeedInsert(item) if item == self.GetRootItem() or \ self.GetItemParent(item) == self.GetRootItem() and needInsert: @@ -528,12 +685,15 @@ class XML_Tree(wxTreeCtrl): m.Append(pullDownMenu.ID_NEW_DIALOG, 'Dialog', 'Create dialog') m.Append(pullDownMenu.ID_NEW_FRAME, 'Frame', 'Create frame') m.AppendSeparator() - m.Append(pullDownMenu.ID_NEW_MENU_BAR, 'MenuBar', 'Create menu bar') + m.Append(pullDownMenu.ID_NEW_TOOL_BAR, 'ToolBar', 'Create toolbar') + m.Append(pullDownMenu.ID_NEW_MENU_BAR, 'MenuBar', 'Create menubar') m.Append(pullDownMenu.ID_NEW_MENU, 'Menu', 'Create menu') else: xxx = self.GetPyData(item) if xxx.__class__ == xxxMenuBar: m.Append(pullDownMenu.ID_NEW_MENU, 'Menu', 'Create menu') + elif xxx.__class__ in [xxxToolBar, xxxTool]: + SetMenu(m, pullDownMenu.toolBarControls) elif xxx.__class__ in [xxxMenu, xxxMenuItem]: SetMenu(m, pullDownMenu.menuControls) else: @@ -542,34 +702,37 @@ class XML_Tree(wxTreeCtrl): xxx.parent and xxx.parent.isSizer): m.Enable(pullDownMenu.ID_NEW_SPACER, false) # Select correct label for create menu - if item == self.GetRootItem(): - pullDownMenu.menu.AppendMenu(wxNewId(), 'Create', m, 'Create top-level object') + if not needInsert: + if self.shift: + menu.AppendMenu(wxNewId(), 'Insert Child', m, + 'Create child object as the first child') + else: + menu.AppendMenu(wxNewId(), 'Append Child', m, + 'Create child object as the last child') else: - if not needInsert: - pullDownMenu.menu.AppendMenu(wxNewId(), 'Create child', m, - 'Create child object') + if self.shift: + menu.AppendMenu(wxNewId(), 'Create Sibling', m, + 'Create sibling before selected object') else: - pullDownMenu.menu.AppendMenu(wxNewId(), 'Create Sibling', m, - 'Create sibling of selected object') - pullDownMenu.menu.AppendSeparator() - pullDownMenu.menu.Append(wxID_CUT, 'Cut', 'Cut to the clipboard') - pullDownMenu.menu.Append(wxID_COPY, 'Copy', 'Copy to the clipboard') - pullDownMenu.menu.Append(wxID_PASTE, 'Paste', 'Paste from the clipboard') - pullDownMenu.menu.Append(pullDownMenu.ID_DELETE, - 'Delete', 'Delete object') + menu.AppendMenu(wxNewId(), 'Create Sibling', m, + 'Create sibling after selected object') + menu.AppendSeparator() + menu.Append(wxID_CUT, 'Cut', 'Cut to the clipboard') + menu.Append(wxID_COPY, 'Copy', 'Copy to the clipboard') + menu.Append(wxID_PASTE, 'Paste', 'Paste from the clipboard') + menu.Append(pullDownMenu.ID_DELETE, + 'Delete', 'Delete object') if item.IsOk() and self.ItemHasChildren(item): - pullDownMenu.menu.AppendSeparator() - pullDownMenu.menu.Append(pullDownMenu.ID_EXPAND, 'Expand', 'Expand subtree') - self.PopupMenu(pullDownMenu.menu, evt.GetPosition()) - pullDownMenu.menu.Destroy() - pullDownMenu.menu = None - + menu.AppendSeparator() + menu.Append(pullDownMenu.ID_EXPAND, 'Expand', 'Expand subtree') + self.PopupMenu(menu, evt.GetPosition()) + menu.Destroy() # Clear tree def Clear(self): self.DeleteAllItems() # Add minimal structure - root = self.AddRoot('XML tree') + root = self.AddRoot('XML tree', self.rootImage) self.Unselect() if self.dom: self.dom.unlink() self.dom = minidom.Document() @@ -577,7 +740,7 @@ class XML_Tree(wxTreeCtrl): # Create main node self.mainNode = self.dom.createElement('resource') self.dom.appendChild(self.mainNode) - + # Apply changes def Apply(self, xxx, item): if not xxx: return @@ -585,34 +748,21 @@ class XML_Tree(wxTreeCtrl): if xxx.undo: xxx.undo.unlink() xxx.undo = xxx.element.cloneNode(false) if xxx.hasName: - name = GetRegistered('name').GetValue() + name = panel.page1.FindWindowByName('data_name').GetValue() if xxx.name != name: xxx.name = name xxx.element.setAttribute('name', name) self.SetItemText(item, xxx.treeName()) if xxx.hasChild: prefix = '_' else: prefix = '' - for param, data in xxx.params.items(): - value = GetRegistered(prefix + param).GetValue() - if param == 'content': - # If number if items is not the same, recreate children - if len(value) != len(data): - elem = xxx.element.getElementsByTagName('content')[0] - for n in elem.childNodes: - elem.removeChild(n) - data = [] - for str in value: - itemElem = tree.dom.createElement('item') - itemText = tree.dom.createTextNode(str) - itemElem.appendChild(itemText) - elem.appendChild(itemElem) - data.append(itemText) - xxx.params[param] = data - else: - for i in range(len(value)): - data[i].data = value[i] + for param, paramObj in xxx.params.items(): + paramWin = panel.FindWindowByName(prefix + 'data_' + param) + if not paramWin.modified: continue + value = paramWin.GetValue() + if param in xxx.specials: + xxx.setSpecial(param, value) else: - data.data = value + paramObj.update(value) if xxx.hasChild: self.Apply(xxx.child, item) else: @@ -622,10 +772,70 @@ class XML_Tree(wxTreeCtrl): # Set global modified state frame.modified = true +class PullDownMenu: + ID_NEW_PANEL = wxNewId() + ID_NEW_DIALOG = wxNewId() + ID_NEW_FRAME = wxNewId() + ID_NEW_TOOL_BAR = wxNewId() + ID_NEW_TOOL = wxNewId() + ID_NEW_MENU_BAR = wxNewId() + ID_NEW_MENU = wxNewId() + + ID_NEW_STATIC_TEXT = wxNewId() + ID_NEW_TEXT_CTRL = wxNewId() + + ID_NEW_BUTTON = wxNewId() + ID_NEW_BITMAP_BUTTON = wxNewId() + ID_NEW_RADIO_BUTTON = wxNewId() + ID_NEW_SPIN_BUTTON = wxNewId() + + ID_NEW_STATIC_BOX = wxNewId() + ID_NEW_CHECK_BOX = wxNewId() + ID_NEW_RADIO_BOX = wxNewId() + ID_NEW_COMBO_BOX = wxNewId() + ID_NEW_LIST_BOX = wxNewId() + + ID_NEW_STATIC_LINE = wxNewId() + ID_NEW_STATIC_BITMAP = wxNewId() + ID_NEW_CHOICE = wxNewId() + ID_NEW_SLIDER = wxNewId() + ID_NEW_GAUGE = wxNewId() + ID_NEW_SCROLL_BAR = wxNewId() + ID_NEW_TREE_CTRL = wxNewId() + ID_NEW_LIST_CTRL = wxNewId() + ID_NEW_CHECK_LIST = wxNewId() + ID_NEW_NOTEBOOK = wxNewId() + ID_NEW_HTML_WINDOW = wxNewId() + ID_NEW_CALENDAR = wxNewId() + + ID_NEW_BOX_SIZER = wxNewId() + ID_NEW_STATIC_BOX_SIZER = wxNewId() + ID_NEW_GRID_SIZER = wxNewId() + ID_NEW_FLEX_GRID_SIZER = wxNewId() + ID_NEW_SPACER = wxNewId() + ID_NEW_TOOL_BAR = wxNewId() + ID_NEW_TOOL = wxNewId() + ID_NEW_MENU = wxNewId() + ID_NEW_MENU_ITEM = wxNewId() + ID_NEW_SEPARATOR = wxNewId() + ID_NEW_LAST = wxNewId() + ID_EXPAND = wxNewId() + + def __init__(self, parent): + self.ID_DELETE = parent.ID_DELETE + EVT_MENU_RANGE(parent, self.ID_NEW_PANEL, + self.ID_NEW_LAST, parent.OnCreate) + EVT_MENU(parent, self.ID_EXPAND, parent.OnExpand) + # We connect to tree, but process in frame + EVT_MENU_HIGHLIGHT_ALL(tree, parent.OnPullDownHighlight) + +################################################################################ + class Frame(wxFrame): def __init__(self, size): wxFrame.__init__(self, None, -1, '', size=size) self.CreateStatusBar() + self.SetIcon(wxIconFromXPMData(images.getIconData())) # Make menus menuBar = wxMenuBar() @@ -638,7 +848,7 @@ class Frame(wxFrame): menu.AppendSeparator() menu.Append(wxID_EXIT, '&Quit\tCtrl-Q', 'Exit application') menuBar.Append(menu, '&File') - + menu = wxMenu() menu.Append(wxID_UNDO, '&Undo\tCtrl-Z', 'Undo') menu.Append(wxID_REDO, '&Redo\tCtrl-R', 'Redo') @@ -649,7 +859,7 @@ class Frame(wxFrame): self.ID_DELETE = wxNewId() menu.Append(self.ID_DELETE, '&Delete\tCtrl-D', 'Delete object') menuBar.Append(menu, '&Edit') - + menu = wxMenu() self.ID_REFRESH = wxNewId() menu.Append(self.ID_REFRESH, '&Refresh\tCtrl-R', 'Refresh view') @@ -658,7 +868,7 @@ class Frame(wxFrame): 'Toggle auto-refresh mode', true) menu.Check(self.ID_AUTO_REFRESH, conf.autoRefresh) menuBar.Append(menu, '&View') - + menu = wxMenu() menu.Append(wxID_ABOUT, 'About...', 'About XCRed') if debug: @@ -671,8 +881,8 @@ class Frame(wxFrame): self.SetMenuBar(menuBar) # Create toolbar - tb = self.CreateToolBar()#wxTB_DOCKABLE | wxTB_FLAT) - tb.SetToolBitmapSize((24,23)) + tb = self.CreateToolBar(wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT) + tb.SetToolBitmapSize((24, 23)) tb.AddSimpleTool(wxID_NEW, images.getNewBitmap(), 'New', 'New file') tb.AddSimpleTool(wxID_OPEN, images.getOpenBitmap(), 'Open', 'Open file') tb.AddSimpleTool(wxID_SAVE, images.getSaveBitmap(), 'Save', 'Save file') @@ -686,8 +896,8 @@ class Frame(wxFrame): tb.AddSimpleTool(self.ID_AUTO_REFRESH, images.getAutoRefreshBitmap(), 'Auto-refresh', 'Toggle auto-refresh mode', true) tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh) - self.tb = tb tb.Realize() + self.tb = tb # File EVT_MENU(self, wxID_NEW, self.OnNew) @@ -715,92 +925,38 @@ class Frame(wxFrame): EVT_UPDATE_UI(self, self.ID_DELETE, self.OnUpdateUI) # Build interface - splitter = wxSplitterWindow(self, -1) + sizer = wxBoxSizer(wxVERTICAL) + sizer.Add(wxStaticLine(self, -1), 0, wxEXPAND) + splitter = wxSplitterWindow(self, -1, style=wxSP_3DSASH) + self.splitter = splitter + splitter.SetMinimumPaneSize(100) # Create tree global tree tree = XML_Tree(splitter, -1) sys.modules['xxx'].tree = tree # Create panel for parameters global panel - #panel = wxPanel(self, -1) - # Sizer for static box - #sizer = wxBoxSizer() - panel = Panel(splitter, -1) - sys.modules['params'].panel = panel - #sizer.Add(panel, 1, wxEXPAND) - #box = wxStaticBox(panel, -1, 'Parameters') - #boxSizer = wxStaticBoxSizer(box) - #boxSizer.Add(wxButton(panel, -1, 'BUTT ON')) - #sizer.Add(boxSizer, 1, wxEXPAND | wxALL, 10) - #panel.SetAutoLayout(true) - #panel.SetSizer(sizer) + panel = Panel(splitter) # Set plitter windows - splitter.SplitVertically(tree, panel, 200) - #topSizer = wxBoxSizer() - #topSizer.Add(splitter, 1, wxEXPAND) - #self.SetAutoLayout(true) - #self.SetSizer(topSizer) + splitter.SplitVertically(tree, panel, conf.sashPos) + sizer.Add(splitter, 1, wxEXPAND) + self.SetAutoLayout(true) + self.SetSizer(sizer) # Init pull-down menu data - class MenuData: pass global pullDownMenu - pullDownMenu = MenuData() - pullDownMenu.menu = None - pullDownMenu.ID_NEW_PANEL = wxNewId() - pullDownMenu.ID_NEW_DIALOG = wxNewId() - pullDownMenu.ID_NEW_FRAME = wxNewId() - pullDownMenu.ID_NEW_MENU_BAR = wxNewId() - pullDownMenu.ID_NEW_MENU = wxNewId() - - pullDownMenu.ID_NEW_STATIC_TEXT = wxNewId() - pullDownMenu.ID_NEW_TEXT_CTRL = wxNewId() - - pullDownMenu.ID_NEW_BUTTON = wxNewId() - pullDownMenu.ID_NEW_BITMAP_BUTTON = wxNewId() - pullDownMenu.ID_NEW_RADIO_BUTTON = wxNewId() - pullDownMenu.ID_NEW_SPIN_BUTTON = wxNewId() - - pullDownMenu.ID_NEW_STATIC_BOX = wxNewId() - pullDownMenu.ID_NEW_CHECK_BOX = wxNewId() - pullDownMenu.ID_NEW_RADIO_BOX = wxNewId() - pullDownMenu.ID_NEW_COMBO_BOX = wxNewId() - pullDownMenu.ID_NEW_LIST_BOX = wxNewId() - - pullDownMenu.ID_NEW_STATIC_LINE = wxNewId() - pullDownMenu.ID_NEW_CHOICE = wxNewId() - pullDownMenu.ID_NEW_SLIDER = wxNewId() - pullDownMenu.ID_NEW_GAUGE = wxNewId() - pullDownMenu.ID_NEW_SCROLL_BAR = wxNewId() - pullDownMenu.ID_NEW_TREE_CTRL = wxNewId() - pullDownMenu.ID_NEW_LIST_CTRL = wxNewId() - pullDownMenu.ID_NEW_CHECK_LIST = wxNewId() - pullDownMenu.ID_NEW_NOTEBOOK = wxNewId() - pullDownMenu.ID_NEW_HTML_WINDOW = wxNewId() - pullDownMenu.ID_NEW_CALENDAR = wxNewId() - - pullDownMenu.ID_NEW_BOX_SIZER = wxNewId() - pullDownMenu.ID_NEW_STATIC_BOX_SIZER = wxNewId() - pullDownMenu.ID_NEW_GRID_SIZER = wxNewId() - pullDownMenu.ID_NEW_FLEX_GRID_SIZER = wxNewId() - pullDownMenu.ID_NEW_SPACER = wxNewId() - pullDownMenu.ID_NEW_MENU = wxNewId() - pullDownMenu.ID_NEW_MENU_ITEM = wxNewId() - pullDownMenu.ID_NEW_SEPARATOR = wxNewId() - pullDownMenu.ID_NEW_LAST = wxNewId() - pullDownMenu.ID_DELETE = self.ID_DELETE - pullDownMenu.ID_EXPAND = wxNewId() - EVT_MENU_RANGE(self, pullDownMenu.ID_NEW_PANEL, - pullDownMenu.ID_NEW_LAST, self.OnCreate) - EVT_MENU(self, pullDownMenu.ID_EXPAND, self.OnExpand) - # We connect to tree, but process in frame - EVT_MENU_HIGHLIGHT_ALL(tree, self.OnPullDownHighlight) + pullDownMenu = PullDownMenu(self) # Mapping from IDs to element names self.createMap = { pullDownMenu.ID_NEW_PANEL: 'wxPanel', pullDownMenu.ID_NEW_DIALOG: 'wxDialog', pullDownMenu.ID_NEW_FRAME: 'wxFrame', + pullDownMenu.ID_NEW_TOOL_BAR: 'wxToolBar', + pullDownMenu.ID_NEW_TOOL: 'tool', pullDownMenu.ID_NEW_MENU_BAR: 'wxMenuBar', pullDownMenu.ID_NEW_MENU: 'wxMenu', + pullDownMenu.ID_NEW_MENU_ITEM: 'wxMenuItem', + pullDownMenu.ID_NEW_SEPARATOR: 'separator', pullDownMenu.ID_NEW_STATIC_TEXT: 'wxStaticText', pullDownMenu.ID_NEW_TEXT_CTRL: 'wxTextCtrl', @@ -809,14 +965,15 @@ class Frame(wxFrame): pullDownMenu.ID_NEW_BITMAP_BUTTON: 'wxBitmapButton', pullDownMenu.ID_NEW_RADIO_BUTTON: 'wxRadioButton', pullDownMenu.ID_NEW_SPIN_BUTTON: 'wxSpinButton', - + pullDownMenu.ID_NEW_STATIC_BOX: 'wxStaticBox', pullDownMenu.ID_NEW_CHECK_BOX: 'wxCheckBox', pullDownMenu.ID_NEW_RADIO_BOX: 'wxRadioBox', pullDownMenu.ID_NEW_COMBO_BOX: 'wxComboBox', pullDownMenu.ID_NEW_LIST_BOX: 'wxListBox', - + pullDownMenu.ID_NEW_STATIC_LINE: 'wxStaticLine', + pullDownMenu.ID_NEW_STATIC_BITMAP: 'wxStaticBitmap', pullDownMenu.ID_NEW_CHOICE: 'wxChoice', pullDownMenu.ID_NEW_SLIDER: 'wxSlider', pullDownMenu.ID_NEW_GAUGE: 'wxGauge', @@ -827,15 +984,12 @@ class Frame(wxFrame): pullDownMenu.ID_NEW_NOTEBOOK: 'wxNotebook', pullDownMenu.ID_NEW_HTML_WINDOW: 'wxHtmlWindow', pullDownMenu.ID_NEW_CALENDAR: 'wxCalendar', - + pullDownMenu.ID_NEW_BOX_SIZER: 'wxBoxSizer', pullDownMenu.ID_NEW_STATIC_BOX_SIZER: 'wxStaticBoxSizer', pullDownMenu.ID_NEW_GRID_SIZER: 'wxGridSizer', pullDownMenu.ID_NEW_FLEX_GRID_SIZER: 'wxFlexGridSizer', pullDownMenu.ID_NEW_SPACER: 'spacer', - pullDownMenu.ID_NEW_MENU: 'wxMenu', - pullDownMenu.ID_NEW_MENU_ITEM: 'wxMenuItem', - pullDownMenu.ID_NEW_SEPARATOR: 'separator', } pullDownMenu.controls = [ ['control', 'Various controls', @@ -882,7 +1036,11 @@ class Frame(wxFrame): (pullDownMenu.ID_NEW_MENU_ITEM, 'MenuItem', 'Create menu item'), (pullDownMenu.ID_NEW_SEPARATOR, 'Separator', 'Create separator'), ] - + pullDownMenu.toolBarControls = [ + (pullDownMenu.ID_NEW_TOOL, 'Tool', 'Create tool'), + (pullDownMenu.ID_NEW_SEPARATOR, 'Separator', 'Create separator'), + ] + # Initialize self.Clear() @@ -905,7 +1063,7 @@ class Frame(wxFrame): self.Open(path) wxEndBusyCursor() self.SetStatusText('Ready') - dlg.Destroy() + dlg.Destroy() def OnSaveOrSaveAs(self, evt): if evt.GetId() == wxID_SAVEAS or not self.dataFile: @@ -914,9 +1072,12 @@ class Frame(wxFrame): dlg = wxFileDialog(self, 'Save As', os.path.dirname(self.dataFile), defaultName, '*.xrc', wxSAVE | wxOVERWRITE_PROMPT | wxCHANGE_DIR) - if dlg.ShowModal() == wxID_CANCEL: return - path = dlg.GetPath() - dlg.Destroy() + if dlg.ShowModal() == wxID_OK: + path = dlg.GetPath() + dlg.Destroy() + else: + dlg.Destroy() + return else: path = self.dataFile self.SetStatusText('Saving...') @@ -939,10 +1100,10 @@ class Frame(wxFrame): xxx = MakeXXXFromDOM(tree.GetPyData(parent).treeObject(), elem) item = tree.InsertItem( parent, prev, xxx.treeObject().className, data=wxTreeItemData(xxx) ) - + def OnRedo(self, evt): print '*** being implemented' - + def OnCut(self, evt): selected = tree.GetSelection() # Undo info @@ -985,7 +1146,7 @@ class Frame(wxFrame): appendChild = true selected = tree.GetItemParent(selected) # Expanded container (must have children) - elif tree.IsExpanded(selected) and tree.ItemHasChildren(selected): + elif tree.IsExpanded(selected) and tree.ItemHasChildren(selected): appendChild = false nextItem = tree.GetFirstChild(selected, 0)[0] parentLeaf = selected @@ -1111,9 +1272,9 @@ class Frame(wxFrame): self.tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh) def OnAbout(self, evt): - dlg = wxMessageDialog(self, '%s %s\n\nRoman Rolinsky ' % \ - (progname, version), - 'About %s' % progname, wxOK | wxCENTRE) + str = '%s %s\n\nRoman Rolinsky ' % \ + (progname, version) + dlg = wxMessageDialog(self, str, 'About ' + progname, wxOK | wxCENTRE) dlg.ShowModal() dlg.Destroy() @@ -1146,7 +1307,7 @@ class Frame(wxFrame): appendChild = true selected = tree.GetItemParent(selected) # Expanded container (must have children) - elif tree.IsExpanded(selected) and tree.ItemHasChildren(selected): + elif tree.IsExpanded(selected) and tree.ItemHasChildren(selected): appendChild = false nextItem = tree.GetFirstChild(selected, 0)[0] parentLeaf = selected @@ -1203,9 +1364,12 @@ class Frame(wxFrame): def OnPullDownHighlight(self, evt): menuId = evt.GetMenuId() - help = '' - if menuId != -1: help = pullDownMenu.GetHelpString(menuId) - self.SetStatusText(help) + if menuId != -1: + menu = evt.GetEventObject() + help = menu.GetHelpString(menuId) + self.SetStatusText(help) + else: + self.SetStatusText('') def OnUpdateUI(self, evt): if evt.GetId() in [wxID_CUT, wxID_COPY, self.ID_DELETE]: @@ -1213,7 +1377,9 @@ class Frame(wxFrame): tree.GetSelection() != tree.GetRootItem() evt.Enable(enable) elif evt.GetId() == wxID_PASTE: - enable = self.clipboard != None + enable = tree.GetSelection().IsOk() and \ + tree.GetSelection() != tree.GetRootItem() and \ + self.clipboard != None evt.Enable(enable) def OnIdle(self, evt): @@ -1225,12 +1391,16 @@ class Frame(wxFrame): tree.needUpdate = false elif tree.pendingHighLight: tree.HighLight(tree.pendingHighLight) - evt.Skip() + else: + evt.Skip() def OnCloseWindow(self, evt): if not self.AskSave(): return if testWin: testWin.Destroy() + # Destroy cached windows + for w in panel.styleCache.values(): w.Destroy() conf.width, conf.height = self.GetSize() + conf.sashPos = self.splitter.GetSashPosition() evt.Skip() def Clear(self): @@ -1258,9 +1428,11 @@ class Frame(wxFrame): self.SetTitle(progname + ': ' + os.path.basename(path)) except: wxLogError('Error reading file: ' + path) + raise def Save(self, path): try: + self.OnRefresh(wxCommandEvent()) memFile = MemoryFile(path) tree.dom.writexml(memFile) memFile.close() @@ -1268,6 +1440,7 @@ class Frame(wxFrame): panel.SetModified(false) except: wxLogError('Error writing file: ' + path) + raise def AskSave(self): if not (self.modified or panel.IsModified()): return true @@ -1286,6 +1459,8 @@ class Frame(wxFrame): return true return false +################################################################################ + class App(wxApp): def OnInit(self): self.SetAppName("xrced") @@ -1295,6 +1470,7 @@ class App(wxApp): conf = wxConfig(style=wxCONFIG_USE_LOCAL_FILE) conf.autoRefresh = conf.ReadInt('autorefresh', true) size = conf.ReadInt('width', 800), conf.ReadInt('height', 600) + conf.sashPos = conf.ReadInt('sashPos', 200) # Add handlers wxFileSystem_AddHandler(wxMemoryFSHandler()) wxInitAllImageHandlers() @@ -1302,7 +1478,7 @@ class App(wxApp): global frame frame = self.frame = Frame(size) self.frame.Show(true) - # Load resources from XRC file (!!! should be transformed to .py later) + # Load resources from XRC file (!!! should be transformed to .py later?) sys.modules['params'].frame = frame frame.res = wxXmlResource('') frame.res.Load(os.path.join(sys.path[0], 'xrced.xrc')) @@ -1314,6 +1490,7 @@ class App(wxApp): wc.WriteInt('autorefresh', conf.autoRefresh) wc.WriteInt('width', conf.width) wc.WriteInt('height', conf.height) + wc.WriteInt('sashPos', conf.sashPos) wc.Flush() def main():