self.name = name
self.buffer = ''
def write(self, data):
- self.buffer += data.encode()
+ if g.currentEncoding:
+ self.buffer += data.encode(g.currentEncoding)
+ else:
+ self.buffer += data.encode()
def close(self):
wxMemoryFSHandler_AddFile(self.name, self.buffer)
GENERIC_DIR_CTRL = wxNewId()
SPIN_CTRL = wxNewId()
UNKNOWN = wxNewId()
+ WIZARD = wxNewId()
+ WIZARD_PAGE = wxNewId()
+ WIZARD_PAGE_SIMPLE = wxNewId()
+ STATUS_BAR = wxNewId()
BOX_SIZER = wxNewId()
STATIC_BOX_SIZER = wxNewId()
GRID_SIZER = wxNewId()
FLEX_GRID_SIZER = wxNewId()
GRID_BAG_SIZER = wxNewId()
+ STD_DIALOG_BUTTON_SIZER = wxNewId()
SPACER = wxNewId()
+
TOOL_BAR = wxNewId()
TOOL = wxNewId()
MENU = wxNewId()
ID_EXPAND = wxNewId()
ID_COLLAPSE = wxNewId()
ID_PASTE_SIBLING = wxNewId()
+ ID_TOOL_PASTE = wxNewId()
ID_SUBCLASS = wxNewId()
def __init__(self, parent):
ID_NEW.PANEL: 'wxPanel',
ID_NEW.DIALOG: 'wxDialog',
ID_NEW.FRAME: 'wxFrame',
+ ID_NEW.WIZARD: 'wxWizard',
+ ID_NEW.WIZARD_PAGE: 'wxWizardPage',
+ ID_NEW.WIZARD_PAGE_SIMPLE: 'wxWizardPageSimple',
ID_NEW.TOOL_BAR: 'wxToolBar',
ID_NEW.TOOL: 'tool',
ID_NEW.MENU_BAR: 'wxMenuBar',
ID_NEW.GRID_SIZER: 'wxGridSizer',
ID_NEW.FLEX_GRID_SIZER: 'wxFlexGridSizer',
ID_NEW.GRID_BAG_SIZER: 'wxGridBagSizer',
+ ID_NEW.STD_DIALOG_BUTTON_SIZER: 'wxStdDialogButtonSizer',
ID_NEW.SPACER: 'spacer',
ID_NEW.UNKNOWN: 'unknown',
}
(ID_NEW.PANEL, 'Panel', 'Create panel'),
(ID_NEW.DIALOG, 'Dialog', 'Create dialog'),
(ID_NEW.FRAME, 'Frame', 'Create frame'),
+ (ID_NEW.WIZARD, 'Wizard', 'Create wizard'),
None,
(ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
(ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar'),
(ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),
(ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
(ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
+# (ID_NEW.WIZARD_PAGE, 'WizardPage', 'Create wizard page'),
+ (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
]
self.sizers = [
(ID_NEW.BOX_SIZER, 'BoxSizer', 'Create box sizer'),
'Create flexgrid sizer'),
(ID_NEW.GRID_BAG_SIZER, 'GridBagSizer',
'Create gridbag sizer'),
+# (ID_NEW.STD_DIALOG_BUTTON_SIZER, 'StdDialogButtonSizer',
+# 'Create standard button sizer'),
(ID_NEW.SPACER, 'Spacer', 'Create spacer'),
]
self.controls = [
(ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),
(ID_NEW.SPLITTER_WINDOW, 'SplitterWindow', 'Create splitter window'),
(ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
+# (ID_NEW.WIZARD_PAGE, 'Wizard Page', 'Create wizard page'),
+ (ID_NEW.WIZARD_PAGE_SIMPLE, 'WizardPageSimple', 'Create simple wizard page'),
],
['sizer', 'Sizers',
(ID_NEW.BOX_SIZER, 'BoxSizer', 'Create box sizer'),
(ID_NEW.GRID_BAG_SIZER, 'GridBagSizer',
'Create gridbag sizer'),
(ID_NEW.SPACER, 'Spacer', 'Create spacer'),
+ (ID_NEW.STD_DIALOG_BUTTON_SIZER, 'StdDialogButtonSizer',
+ 'Create standard button sizer'),
]
]
self.menuControls = [
def Remove(self):
map(wxWindow.Destroy, self.lines)
g.testWin.highLight = None
+ def Refresh(self):
+ map(wxWindow.Refresh, self.lines)
################################################################################
# Find position
for i in range(notebook.GetPageCount()):
if notebook.GetPage(i) == obj:
- if notebook.GetSelection() != i: notebook.SetSelection(i)
+ if notebook.GetSelection() != i:
+ notebook.SetSelection(i)
+ # Remove highlight - otherwise highlight window won't be visible
+ if g.testWin.highLight:
+ g.testWin.highLight.Remove()
break
# Find first ancestor which is a wxWindow (not a sizer)
winParent = itemParent
while self.GetPyData(winParent).isSizer:
winParent = self.GetItemParent(winParent)
- parentPos = self.FindNodePos(winParent)
+ # Notebook children are layed out in a little strange way
+ if self.GetPyData(itemParent).treeObject().__class__ == xxxNotebook:
+ parentPos = wxPoint(0,0)
+ else:
+ parentPos = self.FindNodePos(winParent)
# Position (-1,-1) is really (0,0)
pos = obj.GetPosition()
if pos == (-1,-1): pos = (0,0)
return child
def OnSelChanged(self, evt):
+ self.ChangeSelection(evt.GetItem())
+
+ def ChangeSelection(self, item):
# Apply changes
# !!! problem with wxGTK - GetOldItem is Ok if nothing selected
#oldItem = evt.GetOldItem()
status = 'Changes were applied'
g.frame.SetStatusText(status)
# Generate view
- self.selection = evt.GetItem()
+ self.selection = item
if not self.selection.IsOk():
self.selection = None
return
g.testWin.highLight.Replace(pos, size)
else:
g.testWin.highLight = HighLightBox(pos, size)
+ g.testWin.highLight.Refresh()
g.testWin.highLight.item = item
def ShowTestWindow(self, item):
self.Apply(xxx, item) # apply changes
treeObj = xxx.treeObject()
if treeObj.className not in ['wxFrame', 'wxPanel', 'wxDialog',
- 'wxMenuBar', 'wxToolBar']:
+ 'wxMenuBar', 'wxToolBar', 'wxWizard',
+ 'wxWizardPageSimple']:
wxLogMessage('No view for this element (yet)')
return
# Show item in bold
else:
name = xxx.name
elem.setAttribute('name', STD_NAME)
+ # Replace wizard page class temporarily
+ if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
+ oldCl = elem.getAttribute('class')
+ elem.setAttribute('class', 'wxPanel')
parent = elem.parentNode
next = elem.nextSibling
parent.replaceChild(self.dummyNode, elem)
elem.removeAttribute('name')
else:
elem.setAttribute('name', xxx.name)
+ if xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
+ elem.setAttribute('class', oldCl)
memFile.close() # write to wxMemoryFS
xmlFlags = wxXRC_NO_SUBCLASSING
# Use translations if encoding is not specified
- if g.currentEncoding == 'ascii':
+ if not g.currentEncoding:
xmlFlags != wxXRC_USE_LOCALE
res = wxXmlResource('', xmlFlags)
res.Load('memory:xxx.xrc')
testWin.panel = testWin
testWin.CreateStatusBar()
testWin.SetClientSize(testWin.GetBestSize())
- testWin.panel = testWin
testWin.SetPosition(pos)
testWin.Show(True)
elif xxx.__class__ == xxxPanel:
# Dialog's default code does not produce EVT_CLOSE
EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin)
EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin)
+ elif xxx.__class__ == xxxWizard:
+ wiz = wxPreWizard()
+ res.LoadOnObject(wiz, None, STD_NAME, 'wxWizard')
+ # Find first page (don't know better way)
+ firstPage = None
+ for w in wiz.GetChildren():
+ if isinstance(w, wxWizardPage):
+ firstPage = w
+ break
+ if not firstPage:
+ wxLogError('Wizard is empty')
+ else:
+ # Wizard should be modal
+ self.SetItemBold(item)
+ wiz.RunWizard(w)
+ self.SetItemBold(item, False)
+ wiz.Destroy()
+ elif xxx.__class__ in [xxxWizardPage, xxxWizardPageSimple]:
+ # Create new frame
+ if not testWin:
+ testWin = g.testWin = wxFrame(g.frame, -1, 'Wizard page: ' + name,
+ pos=pos, name=STD_NAME)
+ testWin.panel = wxPrePanel()
+ res.LoadOnObject(testWin.panel, testWin, STD_NAME, 'wxPanel')
+ testWin.SetClientSize(testWin.GetBestSize())
+ testWin.Show(True)
elif xxx.__class__ == xxxMenuBar:
testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name,
pos=pos, name=STD_NAME)
testWin.toolBar = res.LoadToolBar(testWin, STD_NAME)
testWin.SetToolBar(testWin.toolBar)
testWin.Show(True)
- testWin.item = item
- EVT_CLOSE(testWin, self.OnCloseTestWin)
- testWin.highLight = None
- if highLight and not self.pendingHighLight:
- self.HighLight(highLight)
+ if testWin:
+ testWin.item = item
+ EVT_CLOSE(testWin, self.OnCloseTestWin)
+ testWin.highLight = None
+ if highLight and not self.pendingHighLight:
+ self.HighLight(highLight)
except:
if g.testWin:
self.SetItemBold(item, False)
wxMemoryFSHandler_RemoveFile('xxx.xrc')
wxEndBusyCursor()
- def OnCloseTestWin(self, evt):
+ def CloseTestWindow(self):
+ if not g.testWin: return
self.SetItemBold(g.testWin.item, False)
+ g.frame.tb.ToggleTool(g.frame.ID_TOOL_LOCATE, False)
g.testWinPos = g.testWin.GetPosition()
g.testWin.Destroy()
g.testWin = None
+ def OnCloseTestWin(self, evt):
+ self.CloseTestWindow()
+
# Return item index in parent
def ItemIndex(self, item):
n = 0 # index of sibling
projects / wxWidgets.git / blobdiff