X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09f3d4e679f5742c54fb062ede846b77606a9c5b..2bcdcf7e2af3cbc41cbe6a849d664e26d28b98ca:/wxPython/tools/XRCed/params.py diff --git a/wxPython/tools/XRCed/params.py b/wxPython/tools/XRCed/params.py index 7f985230fd..4e0982abee 100644 --- a/wxPython/tools/XRCed/params.py +++ b/wxPython/tools/XRCed/params.py @@ -2,10 +2,12 @@ # Purpose: Classes for parameter introduction # Author: Roman Rolinsky # Created: 22.08.2001 +# RCS-ID: $Id$ from wxPython.wx import * from wxPython.xrc import * import string +import os.path # Object which is currently processed currentXXX = None @@ -13,46 +15,56 @@ def SetCurrentXXX(xxx): global currentXXX currentXXX = xxx -# Register objects in the view -registered = {} -def Register(param, obj): - registered[param] = obj -def GetRegistered(param): - return registered[param] -def ClearRegister(): - registered.clear() +genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER', + 'wxSUNKEN_BORDER', 'wxRAISED_BORDER', + 'wxSTATIC_BORDER', 'wxNO_BORDER', + 'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS', + 'wxNO_FULL_REPAINT_ON_RESIZE'] -genericStyles = ['wxSIMPLE_BORDER', 'wxSUNKEN_BORDER', 'wxRAISED_BORDER', - 'wxTAB_TRAVERSAL', 'wxWANTS_CHARS', 'wxVSCROLL', 'wxHSCROLL'] - -class ParamBinaryOr(wxPanel): - ID_TEXT_CTRL = wxNewId() - ID_BUTTON_CHOICES = wxNewId() - def __init__(self, parent, id, value, size, name, param): +# Class that can properly disable children +class PPanel(wxPanel): + def __init__(self, parent, id, name): wxPanel.__init__(self, parent, id, name=name) + self.modified = self.freeze = false + def Enable(self, value): + # Something strange is going on with enable so we make sure... + for w in self.GetChildren(): + w.Enable(value) + wxPanel.Enable(self, value) + def SetModified(self): + self.modified = true + panel.SetModified(true) + +class ParamBinaryOr(PPanel): + def __init__(self, parent, id, size, name): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + self.ID_BUTTON_CHOICES = wxNewId() self.SetBackgroundColour(panel.GetBackgroundColour()) - Register(param, self) sizer = wxBoxSizer() - self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, value, size=wxSize(200,-1)) - sizer.Add(self.text, 0, wxRIGHT, 10) + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) + sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 10) self.button = wxButton(self, self.ID_BUTTON_CHOICES, 'Edit...') - sizer.Add(self.button) + sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL) self.SetAutoLayout(true) self.SetSizer(sizer) sizer.Fit(self) EVT_BUTTON(self, self.ID_BUTTON_CHOICES, self.OnButtonChoices) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) def OnChange(self, evt): - panel.SetModified(true) + if self.freeze: return + self.SetModified() evt.Skip() def GetValue(self): return self.text.GetValue() def SetValue(self, value): + self.freeze = true self.text.SetValue(value) + self.freeze = false def OnButtonChoices(self, evt): - dlg = wxDialog(self, -1, 'Choices', size=wxSize(250,300)) + dlg = wxDialog(self, -1, 'Choices') topSizer = wxBoxSizer(wxVERTICAL) - listBox = wxCheckListBox(dlg, -1, choices=self.values) + listBox = wxCheckListBox(dlg, -1, choices=self.values, size=(250,200)) value = map(string.strip, string.split(self.text.GetValue(), '|')) if value == ['']: value = [] ignored = [] @@ -64,7 +76,7 @@ class ParamBinaryOr(wxPanel): if self.equal.has_key(i): listBox.Check(self.values.index(self.equal[i])) else: - print 'Unknown flag: %s: ignored.' % i + print 'WARNING: unknown flag: %s: ignored.' % i ignored.append(i) topSizer.Add(listBox, 1, wxEXPAND) sizer = wxBoxSizer() @@ -76,16 +88,18 @@ class ParamBinaryOr(wxPanel): topSizer.Add(sizer, 0, wxALL | wxEXPAND, 10) dlg.SetAutoLayout(true) dlg.SetSizer(topSizer) + topSizer.Fit(dlg) dlg.Center() - if dlg.ShowModal() != wxID_OK: return - value = [] - for i in range(listBox.Number()): - if listBox.IsChecked(i): - value.append(self.values[i]) - # Add ignored flags - value.extend(ignored) - self.SetValue(reduce(lambda a,b: a+'|'+b, value)) - panel.SetModified(true) + if dlg.ShowModal() == wxID_OK: + value = [] + for i in range(listBox.Number()): + if listBox.IsChecked(i): + value.append(self.values[i]) + # Add ignored flags + value.extend(ignored) + self.SetValue(reduce(lambda a,b: a+'|'+b, value)) + self.SetModified() + dlg.Destroy() class ParamFlag(ParamBinaryOr): values = ['wxTOP', 'wxBOTTOM', 'wxLEFT', 'wxRIGHT', 'wxALL', @@ -95,66 +109,222 @@ class ParamFlag(ParamBinaryOr): equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE', 'wxALIGN_CENTER_VERTICAL': 'wxALIGN_CENTRE_VERTICAL', 'wxALIGN_CENTER_HORIZONTAL': 'wxALIGN_CENTRE_HORIZONTAL'} - def __init__(self, parent, id, value, size, name, param): - ParamBinaryOr.__init__(self, parent, id, value, size, name, param) + def __init__(self, parent, id, size, name): + ParamBinaryOr.__init__(self, parent, id, size, name) class ParamStyle(ParamBinaryOr): equal = {'wxALIGN_CENTER': 'wxALIGN_CENTRE'} - def __init__(self, parent, id, value, size, name, param): - self.values = currentXXX.styles + genericStyles - ParamBinaryOr.__init__(self, parent, id, value, size, name, param) + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + self.values = currentXXX.winStyles + genericStyles + ParamBinaryOr.__init__(self, parent, id, size, name) -class ParamInt(wxPanel): - ID_SPIN_CTRL = wxNewId() - def __init__(self, parent, id, value, size, name, param): - wxPanel.__init__(self, parent, id, name=name) +class ParamNonGenericStyle(ParamBinaryOr): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + self.values = currentXXX.winStyles + ParamBinaryOr.__init__(self, parent, id, size, name) + +class ParamExStyle(ParamBinaryOr): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + if currentXXX: + self.values = currentXXX.exStyles # constant at the moment + else: + self.values = [] + ParamBinaryOr.__init__(self, parent, id, size, name) + +class ParamColour(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + self.ID_BUTTON = wxNewId() + self.SetBackgroundColour(panel.GetBackgroundColour()) sizer = wxBoxSizer() - self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, value, size=wxSize(50,-1)) + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(60,-1)) + sizer.Add(self.text, 0, wxRIGHT, 10) + self.button = wxPanel(self, self.ID_BUTTON, wxDefaultPosition, wxSize(40, -1)) + sizer.Add(self.button, 0, wxGROW) + self.SetAutoLayout(true) + self.SetSizer(sizer) + sizer.Fit(self) + self.textModified = false + EVT_PAINT(self.button, self.OnPaintButton) + EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) + EVT_LEFT_DOWN(self.button, self.OnLeftDown) + def GetValue(self): + return self.value + def SetValue(self, value): + self.freeze = true + if not value: value = '#FFFFFF' + self.value = value + self.text.SetValue(str(value)) # update text ctrl + colour = wxColour(int(value[1:3], 16), int(value[3:5], 16), int(value[5:7], 16)) + self.button.SetBackgroundColour(colour) + self.button.Refresh() + self.freeze = false + def OnChange(self, evt): + if self.freeze: return + self.SetModified() + self.textModified = true + evt.Skip() + def OnPaintButton(self, evt): + dc = wxPaintDC(self.button) + dc.SetBrush(wxTRANSPARENT_BRUSH) + if self.IsEnabled(): dc.SetPen(wxBLACK_PEN) + else: dc.SetPen(wxGREY_PEN) + size = self.button.GetSize() + dc.DrawRectangle(0, 0, size.x, size.y) + def OnLeftDown(self, evt): + dlg = wxColourDialog(self) + if dlg.ShowModal() == wxID_OK: + self.SetValue('#%02X%02X%02X' % dlg.GetColourData().GetColour().Get()) + self.SetModified() + self.textModified = false + dlg.Destroy() + +################################################################################ + +# Mapping from wx constants ro XML strings +fontFamiliesWx2Xml = {wxDEFAULT: 'default', wxDECORATIVE: 'decorative', + wxROMAN: 'roman', wxSCRIPT: 'script', wxSWISS: 'swiss', + wxMODERN: 'modern'} +fontStylesWx2Xml = {wxNORMAL: 'normal', wxSLANT: 'slant', wxITALIC: 'italic'} +fontWeightsWx2Xml = {wxNORMAL: 'normal', wxLIGHT: 'light', wxBOLD: 'bold'} +def ReverseMap(m): + rm = {} + for k,v in m.items(): rm[v] = k + return rm +fontFamiliesXml2wx = ReverseMap(fontFamiliesWx2Xml) +fontStylesXml2wx = ReverseMap(fontStylesWx2Xml) +fontWeightsXml2wx = ReverseMap(fontWeightsWx2Xml) + +class ParamFont(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + self.ID_BUTTON_SELECT = wxNewId() + self.SetBackgroundColour(panel.GetBackgroundColour()) + sizer = wxBoxSizer() + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) + sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 10) + self.button = wxButton(self, self.ID_BUTTON_SELECT, 'Select...') + sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL) + self.SetAutoLayout(true) + self.SetSizer(sizer) + sizer.Fit(self) + self.textModified = false + EVT_BUTTON(self, self.ID_BUTTON_SELECT, self.OnButtonSelect) + EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) + def OnChange(self, evt): + if self.freeze: return + self.SetModified() + self.textModified = true + evt.Skip() + def GetValue(self): + if self.textModified: # text has newer value + return eval(self.text.GetValue()) + return self.value + def SetValue(self, value): + self.freeze = true # disable other handlers + if not value: value = [''] * 7 + self.value = value + self.text.SetValue(str(value)) # update text ctrl + self.freeze = false + def OnButtonSelect(self, evt): + if self.textModified: # text has newer value + self.value = eval(self.text.GetValue()) + # Make initial font + try: size = int(self.value[0]) + except ValueError: size = 12 + try: family = fontFamiliesXml2wx[self.value[1]] + except KeyError: family = wxDEFAULT + try: style = fontStylesXml2wx[self.value[2]] + except KeyError: style = wxNORMAL + try: weight = fontWeightsXml2wx[self.value[3]] + except KeyError: weight = wxNORMAL + try: underlined = int(self.value[4]) + except ValueError: underlined = 0 + face = self.value[5] + mapper = wxFontMapper() + enc = wxFONTENCODING_DEFAULT + if not self.value[6]: enc = mapper.CharsetToEncoding(self.value[6]) + if enc == wxFONTENCODING_DEFAULT: enc = wxFONTENCODING_SYSTEM + font = wxFont(size, family, style, weight, underlined, face, enc) + data = wxFontData() + data.SetInitialFont(font) + dlg = wxFontDialog(self, data) + if dlg.ShowModal() == wxID_OK: + font = dlg.GetFontData().GetChosenFont() + value = [str(font.GetPointSize()), fontFamiliesWx2Xml[font.GetFamily()], + fontStylesWx2Xml[font.GetStyle()], + fontWeightsWx2Xml[font.GetWeight()], + str(font.GetUnderlined()), font.GetFaceName(), + wxFontMapper_GetEncodingName(font.GetEncoding())] + # Add ignored flags + self.SetValue(value) + self.SetModified() + self.textModified = false + dlg.Destroy() + +################################################################################ + +class ParamInt(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + PPanel.__init__(self, parent, id, name) + self.ID_SPIN_CTRL = wxNewId() + sizer = wxBoxSizer() + self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=wxSize(50,-1)) self.SetBackgroundColour(panel.GetBackgroundColour()) sizer.Add(self.spin) self.SetAutoLayout(true) self.SetSizer(sizer) sizer.Fit(self) - Register(param, self) EVT_SPINCTRL(self, self.ID_SPIN_CTRL, self.OnChange) def GetValue(self): return str(self.spin.GetValue()) def SetValue(self, value): + self.freeze = true if not value: value = 0 self.spin.SetValue(int(value)) + self.freeze = false def OnChange(self, evt): - panel.SetModified(true) + if self.freeze: return + self.SetModified() evt.Skip() -class ParamText(wxTextCtrl): - def __init__(self, parent, id, value, size, name, param): - wxTextCtrl.__init__(self, parent, id, value, size=wxSize(200,-1), name=name) - Register(param, self) - EVT_TEXT(self, id, self.OnChange) +class ParamText(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = '', textWidth=200): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + # We use sizer even here to have the same size of text control + sizer = wxBoxSizer() + self.SetBackgroundColour(panel.GetBackgroundColour()) + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1)) + sizer.Add(self.text, 0, wxALIGN_CENTER_VERTICAL) + self.SetAutoLayout(true) + self.SetSizer(sizer) + sizer.Fit(self) + EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) + def GetValue(self): + return self.text.GetValue() + def SetValue(self, value): + self.freeze = true # disable other handlers + self.text.SetValue(value) + self.freeze = false # disable other handlers def OnChange(self, evt): - panel.SetModified(true) + if self.freeze: return + self.SetModified() evt.Skip() -class ParamAccel(wxTextCtrl): - def __init__(self, parent, id, value, size, name, param): - wxTextCtrl.__init__(self, parent, id, value, size=wxSize(50,-1), name=name) - Register(param, self) - EVT_TEXT(self, id, self.OnChange) - def OnChange(self, evt): - panel.SetModified(true) - evt.Skip() +class ParamAccel(ParamText): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + ParamText.__init__(self, parent, id, size, name, 50) -class ParamPosSize(wxTextCtrl): - def __init__(self, parent, id, value, size, name, param): - wxTextCtrl.__init__(self, parent, id, value, size=wxSize(80,-1), name=name) - Register(param, self) - EVT_TEXT(self, id, self.OnChange) - def OnChange(self, evt): - panel.SetModified(true) - evt.Skip() +class ParamPosSize(ParamText): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + ParamText.__init__(self, parent, id, size, name, 80) class ContentDialog(wxDialog): def __init__(self, parent, value): + #wxPreDialog(self) # Use another constructor w = frame.res.LoadDialog(parent, 'ID_DIALOG_CONTENT') self.this = w.this @@ -166,8 +336,9 @@ class ContentDialog(wxDialog): # Set list items for v in value: self.list.Append(v) - # !!! Bug in XRC or wxWin listbox select random items - self.FindWindowByName('wxID_OK').SetFocus() + self.SetAutoLayout(true) + # !!! self.SetSizer(sizer) + self.GetSizer().Fit(self) # Callbacks self.ID_BUTTON_APPEND = XMLID('ID_BUTTON_APPEND') self.ID_BUTTON_REMOVE = XMLID('ID_BUTTON_REMOVE') @@ -203,20 +374,20 @@ class ContentDialog(wxDialog): elif evt.GetId() == self.ID_BUTTON_UP: evt.Enable(self.list.GetSelection() > 0) elif evt.GetId() == self.ID_BUTTON_DOWN: - evt.Enable(self.list.GetSelection() < self.list.Number() - 1) + evt.Enable(self.list.GetSelection() != -1 and \ + self.list.GetSelection() < self.list.Number() - 1) -class ParamContent(wxPanel): - ID_TEXT_CTRL = wxNewId() - ID_BUTTON_EDIT = wxNewId() - def __init__(self, parent, id, value, size, name, param): - wxPanel.__init__(self, parent, id, name=name) +class ParamContent(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + self.ID_BUTTON_EDIT = wxNewId() self.SetBackgroundColour(panel.GetBackgroundColour()) - Register(param, self) sizer = wxBoxSizer() - self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, str(value), size=wxSize(200,-1)) - sizer.Add(self.text, 0, wxRIGHT, 10) + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) + sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 10) self.button = wxButton(self, self.ID_BUTTON_EDIT, 'Edit...') - sizer.Add(self.button) + sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL) self.SetAutoLayout(true) self.SetSizer(sizer) sizer.Fit(self) @@ -224,7 +395,8 @@ class ParamContent(wxPanel): EVT_BUTTON(self, self.ID_BUTTON_EDIT, self.OnButtonEdit) EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) def OnChange(self, evt): - panel.SetModified(true) + if self.freeze: return + self.SetModified() self.textModified = true evt.Skip() def GetValue(self): @@ -232,59 +404,58 @@ class ParamContent(wxPanel): return eval(self.text.GetValue()) return self.value def SetValue(self, value): + self.freeze = true self.value = value self.text.SetValue(str(value)) # update text ctrl + self.freeze = false def OnButtonEdit(self, evt): if self.textModified: # text has newer value self.value = eval(self.text.GetValue()) dlg = ContentDialog(self, self.value) - if dlg.ShowModal() != wxID_OK: return - value = [] - for i in range(dlg.list.Number()): - value.append(dlg.list.GetString(i)) - # Add ignored flags - self.SetValue(value) - panel.SetModified(true) - self.textModified = false + if dlg.ShowModal() == wxID_OK: + value = [] + for i in range(dlg.list.Number()): + value.append(dlg.list.GetString(i)) + # Add ignored flags + self.SetValue(value) + self.SetModified() + self.textModified = false + dlg.Destroy() # Boxless radiobox -class RadioBox(wxPanel): - ID_RADIO_CHOICE = wxNewId() # economize on IDs, use names +class RadioBox(PPanel): def __init__(self, parent, id, choices, pos=wxDefaultPosition, size=wxDefaultSize, name='radiobox'): - wxPanel.__init__(self, parent, id, pos, size, name=name) + PPanel.__init__(self, parent, id, name) self.SetBackgroundColour(panel.GetBackgroundColour()) self.choices = choices topSizer = wxBoxSizer() for i in choices: - topSizer.Add(wxRadioButton(self, self.ID_RADIO_CHOICE, i, name=i)) + button = wxRadioButton(self, -1, i, name=i) + topSizer.Add(button) + EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice) self.SetAutoLayout(true) self.SetSizer(topSizer) topSizer.Fit(self) - EVT_RADIOBUTTON(self, self.ID_RADIO_CHOICE, self.OnRadioChoice) def SetStringSelection(self, value): - self.value = None + self.freeze = true for i in self.choices: - w = self.FindWindowByName(i) - w.SetValue(i == value) + self.FindWindowByName(i).SetValue(i == value) self.value = value + self.freeze = false def OnRadioChoice(self, evt): - if not self.value: # procedure call - evt.Skip() - return - self.FindWindowByName(self.value).SetValue(false) - self.value = evt.GetEventObject().GetName() - panel.SetModified(true) + if self.freeze: return + if evt.GetSelection(): + self.value = evt.GetEventObject().GetName() + self.SetModified() def GetStringSelection(self): return self.value class ParamBool(RadioBox): values = {'yes': '1', 'no': '0'} seulav = {'1': 'yes', '0': 'no'} - def __init__(self, parent, id, value, size, name, param): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): RadioBox.__init__(self, parent, id, choices = self.values.keys(), name=name) - Register(param, self) - self.SetValue(value) def GetValue(self): return self.values[self.GetStringSelection()] def SetValue(self, value): @@ -294,19 +465,62 @@ class ParamBool(RadioBox): class ParamOrient(RadioBox): values = {'horizontal': 'wxHORIZONTAL', 'vertical': 'wxVERTICAL'} seulav = {'wxHORIZONTAL': 'horizontal', 'wxVERTICAL': 'vertical'} - def __init__(self, parent, id, value, size, name, param): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): RadioBox.__init__(self, parent, id, choices = self.values.keys(), name=name) - Register(param, self) - self.SetValue(value) def GetValue(self): return self.values[self.GetStringSelection()] def SetValue(self, value): if not value: value = 'wxHORIZONTAL' self.SetStringSelection(self.seulav[value]) +class ParamFile(PPanel): + def __init__(self, parent, id = -1, size = wxDefaultSize, name = ''): + PPanel.__init__(self, parent, id, name) + self.ID_TEXT_CTRL = wxNewId() + self.ID_BUTTON_BROWSE = wxNewId() + self.SetBackgroundColour(panel.GetBackgroundColour()) + sizer = wxBoxSizer() + self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1)) + sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 10) + self.button = wxButton(self, self.ID_BUTTON_BROWSE, 'Browse...') + sizer.Add(self.button, 0, wxALIGN_CENTER_VERTICAL) + self.SetAutoLayout(true) + self.SetSizer(sizer) + sizer.Fit(self) + self.textModified = false + EVT_BUTTON(self, self.ID_BUTTON_BROWSE, self.OnButtonBrowse) + EVT_TEXT(self, self.ID_TEXT_CTRL, self.OnChange) + def OnChange(self, evt): + if self.freeze: return + self.SetModified() + self.textModified = true + evt.Skip() + def GetValue(self): + if self.textModified: # text has newer value + return eval(self.text.GetValue()) + return self.value + def SetValue(self, value): + self.freeze = true + self.value = value + self.text.SetValue(value) # update text ctrl + self.freeze = false + def OnButtonBrowse(self, evt): + if self.textModified: # text has newer value + self.value = self.text.GetValue() + dlg = wxFileDialog(self, + defaultDir = os.path.abspath(os.path.dirname(self.value)), + defaultFile = os.path.basename(self.value)) + if dlg.ShowModal() == wxID_OK: + # Make relative + common = os.path.commonprefix([frame.dataFile, dlg.GetPath()]) + self.SetValue(dlg.GetPath()[len(common):]) + self.SetModified() + self.textModified = false + dlg.Destroy() + paramDict = { 'flag': ParamFlag, - 'style': ParamStyle, + 'style': ParamStyle, 'exstyle': ParamExStyle, 'pos': ParamPosSize, 'size': ParamPosSize, 'border': ParamInt, 'cols': ParamInt, 'rows': ParamInt, 'vgap': ParamInt, 'hgap': ParamInt, @@ -314,4 +528,8 @@ paramDict = { 'label': ParamText, 'title': ParamText, 'value': ParamText, 'content': ParamContent, 'selection': ParamInt, 'min': ParamInt, 'max': ParamInt, + 'fg': ParamColour, 'bg': ParamColour, 'font': ParamFont, + 'enabled': ParamBool, 'focused': ParamBool, 'hidden': ParamBool, + 'tooltip': ParamText, 'bitmap': ParamFile, 'icon': ParamFile, } +