0.1.5-2
------- Using wx.GetDefaultPyEncoding/wx.SetDefaultPyEncoding for changing active encoding. Fixed pasting siblings (Ctrl key pressed while pasting). Dealed with ascii build (Python does not recognize 'ascii' as valid encoding). If encoding is not specified it is not written in XRC. Will add more customization in the future. Changed to use SimpleTool instead or Toggle tool (does not work on Win32). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -5,6 +5,12 @@ Using wx.GetDefaultPyEncoding/wx.SetDefaultPyEncoding for changing active encodi
|
|||||||
|
|
||||||
Fixed pasting siblings (Ctrl key pressed while pasting).
|
Fixed pasting siblings (Ctrl key pressed while pasting).
|
||||||
|
|
||||||
|
Dealed with ascii build (Python does not recognize 'ascii' as valid encoding).
|
||||||
|
If encoding is not specified it is not written in XRC. Will add more
|
||||||
|
customization in the future.
|
||||||
|
|
||||||
|
Changed to use SimpleTool instead or Toggle tool (does not work on Win32).
|
||||||
|
|
||||||
0.1.5-1
|
0.1.5-1
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
@@ -4,7 +4,6 @@
|
|||||||
# Created: 02.12.2002
|
# Created: 02.12.2002
|
||||||
# RCS-ID: $Id$
|
# RCS-ID: $Id$
|
||||||
|
|
||||||
import wx
|
|
||||||
from wxPython.wx import *
|
from wxPython.wx import *
|
||||||
from wxPython.xrc import *
|
from wxPython.xrc import *
|
||||||
try:
|
try:
|
||||||
@@ -18,8 +17,10 @@ import sys
|
|||||||
progname = 'XRCed'
|
progname = 'XRCed'
|
||||||
version = '0.1.5-2'
|
version = '0.1.5-2'
|
||||||
# Can be changed to set other default encoding different
|
# Can be changed to set other default encoding different
|
||||||
#defaultEncoding = sys.getdefaultencoding()
|
defaultEncoding = ''
|
||||||
defaultEncoding = wx.GetDefaultPyEncoding()
|
# you comment above and can uncomment this:
|
||||||
|
#import wx
|
||||||
|
#defaultEncoding = wx.GetDefaultPyEncoding()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
True
|
True
|
||||||
|
@@ -13,6 +13,7 @@ class Panel(wxNotebook):
|
|||||||
def __init__(self, parent, id = -1):
|
def __init__(self, parent, id = -1):
|
||||||
if wxPlatform != '__WXMAC__': # some problems with this style on macs
|
if wxPlatform != '__WXMAC__': # some problems with this style on macs
|
||||||
wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
|
wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
|
||||||
|
self.SetBackgroundColour(parent.GetBackgroundColour())
|
||||||
else:
|
else:
|
||||||
wxNotebook.__init__(self, parent, id)
|
wxNotebook.__init__(self, parent, id)
|
||||||
global panel
|
global panel
|
||||||
|
@@ -19,7 +19,10 @@ class MemoryFile:
|
|||||||
self.name = name
|
self.name = name
|
||||||
self.buffer = ''
|
self.buffer = ''
|
||||||
def write(self, data):
|
def write(self, data):
|
||||||
|
if g.currentEncoding:
|
||||||
self.buffer += data.encode(g.currentEncoding)
|
self.buffer += data.encode(g.currentEncoding)
|
||||||
|
else:
|
||||||
|
self.buffer += data.encode()
|
||||||
def close(self):
|
def close(self):
|
||||||
wxMemoryFSHandler_AddFile(self.name, self.buffer)
|
wxMemoryFSHandler_AddFile(self.name, self.buffer)
|
||||||
|
|
||||||
@@ -355,6 +358,8 @@ class HighLightBox:
|
|||||||
def Remove(self):
|
def Remove(self):
|
||||||
map(wxWindow.Destroy, self.lines)
|
map(wxWindow.Destroy, self.lines)
|
||||||
g.testWin.highLight = None
|
g.testWin.highLight = None
|
||||||
|
def Refresh(self):
|
||||||
|
map(wxWindow.Refresh, self.lines)
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
@@ -648,6 +653,7 @@ class XML_Tree(wxTreeCtrl):
|
|||||||
g.testWin.highLight.Replace(pos, size)
|
g.testWin.highLight.Replace(pos, size)
|
||||||
else:
|
else:
|
||||||
g.testWin.highLight = HighLightBox(pos, size)
|
g.testWin.highLight = HighLightBox(pos, size)
|
||||||
|
g.testWin.highLight.Refresh()
|
||||||
g.testWin.highLight.item = item
|
g.testWin.highLight.item = item
|
||||||
|
|
||||||
def ShowTestWindow(self, item):
|
def ShowTestWindow(self, item):
|
||||||
@@ -769,7 +775,7 @@ class XML_Tree(wxTreeCtrl):
|
|||||||
memFile.close() # write to wxMemoryFS
|
memFile.close() # write to wxMemoryFS
|
||||||
xmlFlags = wxXRC_NO_SUBCLASSING
|
xmlFlags = wxXRC_NO_SUBCLASSING
|
||||||
# Use translations if encoding is not specified
|
# Use translations if encoding is not specified
|
||||||
if g.currentEncoding == 'ascii':
|
if not g.currentEncoding:
|
||||||
xmlFlags != wxXRC_USE_LOCALE
|
xmlFlags != wxXRC_USE_LOCALE
|
||||||
res = wxXmlResource('', xmlFlags)
|
res = wxXmlResource('', xmlFlags)
|
||||||
res.Load('memory:xxx.xrc')
|
res.Load('memory:xxx.xrc')
|
||||||
|
@@ -198,9 +198,9 @@ class Frame(wxFrame):
|
|||||||
tb.AddSimpleTool(wxID_COPY, copy_bmp, 'Copy', 'Copy')
|
tb.AddSimpleTool(wxID_COPY, copy_bmp, 'Copy', 'Copy')
|
||||||
tb.AddSimpleTool(self.ID_TOOL_PASTE, paste_bmp, 'Paste', 'Paste')
|
tb.AddSimpleTool(self.ID_TOOL_PASTE, paste_bmp, 'Paste', 'Paste')
|
||||||
tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL))
|
tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL))
|
||||||
tb.AddCheckTool(self.ID_TOOL_LOCATE,
|
tb.AddSimpleTool(self.ID_TOOL_LOCATE,
|
||||||
images.getLocateBitmap(), images.getLocateArmedBitmap(),
|
images.getLocateBitmap(), #images.getLocateArmedBitmap(),
|
||||||
'Locate', 'Locate control in test window and select it')
|
'Locate', 'Locate control in test window and select it', True)
|
||||||
tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL))
|
tb.AddControl(wxStaticLine(tb, -1, size=(-1,23), style=wxLI_VERTICAL))
|
||||||
tb.AddSimpleTool(self.ID_TEST, images.getTestBitmap(), 'Test', 'Test window')
|
tb.AddSimpleTool(self.ID_TEST, images.getTestBitmap(), 'Test', 'Test window')
|
||||||
tb.AddSimpleTool(self.ID_REFRESH, images.getRefreshBitmap(),
|
tb.AddSimpleTool(self.ID_REFRESH, images.getRefreshBitmap(),
|
||||||
@@ -977,6 +977,8 @@ Homepage: http://xrced.sourceforge.net\
|
|||||||
if dom.encoding:
|
if dom.encoding:
|
||||||
g.currentEncoding = dom.encoding
|
g.currentEncoding = dom.encoding
|
||||||
wx.SetDefaultPyEncoding(g.currentEncoding.encode())
|
wx.SetDefaultPyEncoding(g.currentEncoding.encode())
|
||||||
|
else:
|
||||||
|
g.currentEncoding = ''
|
||||||
# Change dir
|
# Change dir
|
||||||
self.dataFile = path = os.path.abspath(path)
|
self.dataFile = path = os.path.abspath(path)
|
||||||
dir = os.path.dirname(path)
|
dir = os.path.dirname(path)
|
||||||
@@ -1016,9 +1018,9 @@ Homepage: http://xrced.sourceforge.net\
|
|||||||
if tree.selection and panel.IsModified():
|
if tree.selection and panel.IsModified():
|
||||||
self.OnRefresh(wxCommandEvent())
|
self.OnRefresh(wxCommandEvent())
|
||||||
if g.currentEncoding:
|
if g.currentEncoding:
|
||||||
f = codecs.open(path, 'w', g.currentEncoding)
|
f = codecs.open(path, 'wt', g.currentEncoding)
|
||||||
else:
|
else:
|
||||||
f = codecs.open(path, 'w')
|
f = codecs.open(path, 'wt')
|
||||||
# Make temporary copy for formatting it
|
# Make temporary copy for formatting it
|
||||||
# !!! We can't clone dom node, it works only once
|
# !!! We can't clone dom node, it works only once
|
||||||
#self.domCopy = tree.dom.cloneNode(True)
|
#self.domCopy = tree.dom.cloneNode(True)
|
||||||
|
@@ -11,34 +11,26 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxTextCtrl" name="TEXT">
|
<object class="wxTextCtrl" name="TEXT">
|
||||||
|
|
||||||
|
|
||||||
<size>250,100</size>
|
<size>250,100</size>
|
||||||
|
|
||||||
|
|
||||||
<style>wxTE_MULTILINE</style>
|
<style>wxTE_MULTILINE</style>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxEXPAND</flag>
|
<flag>wxALL|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxStaticLine"/>
|
<object class="wxStaticLine"/>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -47,32 +39,25 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_OK">
|
<object class="wxButton" name="wxID_OK">
|
||||||
|
|
||||||
|
|
||||||
<label>OK</label>
|
<label>OK</label>
|
||||||
|
|
||||||
|
|
||||||
<default>1</default>
|
<default>1</default>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT</flag>
|
<flag>wxRIGHT</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_CANCEL">
|
<object class="wxButton" name="wxID_CANCEL">
|
||||||
|
|
||||||
|
|
||||||
<label>Cancel</label>
|
<label>Cancel</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@@ -90,17 +75,13 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxListBox" name="LIST">
|
<object class="wxListBox" name="LIST">
|
||||||
|
|
||||||
|
|
||||||
<content/>
|
<content/>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
|
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -109,77 +90,60 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_UP">
|
<object class="wxButton" name="BUTTON_UP">
|
||||||
|
|
||||||
|
|
||||||
<label>Move Up</label>
|
<label>Move Up</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM|wxEXPAND</flag>
|
<flag>wxBOTTOM|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_DOWN">
|
<object class="wxButton" name="BUTTON_DOWN">
|
||||||
|
|
||||||
|
|
||||||
<label>Move Down</label>
|
<label>Move Down</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="spacer">
|
<object class="spacer">
|
||||||
|
|
||||||
|
|
||||||
<size>10,20</size>
|
<size>10,20</size>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_APPEND">
|
<object class="wxButton" name="BUTTON_APPEND">
|
||||||
|
|
||||||
|
|
||||||
<label>Append...</label>
|
<label>Append...</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM|wxEXPAND</flag>
|
<flag>wxBOTTOM|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_REMOVE">
|
<object class="wxButton" name="BUTTON_REMOVE">
|
||||||
|
|
||||||
|
|
||||||
<label>Remove</label>
|
<label>Remove</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxEXPAND</flag>
|
<flag>wxALL|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxStaticLine"/>
|
<object class="wxStaticLine"/>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -188,32 +152,25 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_OK">
|
<object class="wxButton" name="wxID_OK">
|
||||||
|
|
||||||
|
|
||||||
<label>OK</label>
|
<label>OK</label>
|
||||||
|
|
||||||
|
|
||||||
<default>1</default>
|
<default>1</default>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT</flag>
|
<flag>wxRIGHT</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_CANCEL">
|
<object class="wxButton" name="wxID_CANCEL">
|
||||||
|
|
||||||
|
|
||||||
<label>Cancel</label>
|
<label>Cancel</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@@ -231,17 +188,13 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxCheckListBox" name="CHECK_LIST">
|
<object class="wxCheckListBox" name="CHECK_LIST">
|
||||||
|
|
||||||
|
|
||||||
<content/>
|
<content/>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
|
<flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -250,77 +203,60 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_UP">
|
<object class="wxButton" name="BUTTON_UP">
|
||||||
|
|
||||||
|
|
||||||
<label>Move Up</label>
|
<label>Move Up</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM|wxEXPAND</flag>
|
<flag>wxBOTTOM|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_DOWN">
|
<object class="wxButton" name="BUTTON_DOWN">
|
||||||
|
|
||||||
|
|
||||||
<label>Move Down</label>
|
<label>Move Down</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="spacer">
|
<object class="spacer">
|
||||||
|
|
||||||
|
|
||||||
<size>10,20</size>
|
<size>10,20</size>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_APPEND">
|
<object class="wxButton" name="BUTTON_APPEND">
|
||||||
|
|
||||||
|
|
||||||
<label>Append...</label>
|
<label>Append...</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM|wxEXPAND</flag>
|
<flag>wxBOTTOM|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_REMOVE">
|
<object class="wxButton" name="BUTTON_REMOVE">
|
||||||
|
|
||||||
|
|
||||||
<label>Remove</label>
|
<label>Remove</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxEXPAND</flag>
|
<flag>wxALL|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxStaticLine"/>
|
<object class="wxStaticLine"/>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -329,32 +265,25 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_OK">
|
<object class="wxButton" name="wxID_OK">
|
||||||
|
|
||||||
|
|
||||||
<label>OK</label>
|
<label>OK</label>
|
||||||
|
|
||||||
|
|
||||||
<default>1</default>
|
<default>1</default>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT</flag>
|
<flag>wxRIGHT</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_CANCEL">
|
<object class="wxButton" name="wxID_CANCEL">
|
||||||
|
|
||||||
|
|
||||||
<label>Cancel</label>
|
<label>Cancel</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@@ -368,29 +297,22 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxCheckListBox" name="CHECK_LIST">
|
<object class="wxCheckListBox" name="CHECK_LIST">
|
||||||
|
|
||||||
|
|
||||||
<content/>
|
<content/>
|
||||||
|
|
||||||
|
|
||||||
<size>250,250</size>
|
<size>250,250</size>
|
||||||
|
|
||||||
|
|
||||||
<style></style>
|
<style></style>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxEXPAND</flag>
|
<flag>wxALL|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxStaticLine"/>
|
<object class="wxStaticLine"/>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -399,32 +321,25 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_OK">
|
<object class="wxButton" name="wxID_OK">
|
||||||
|
|
||||||
|
|
||||||
<label>OK</label>
|
<label>OK</label>
|
||||||
|
|
||||||
|
|
||||||
<default>1</default>
|
<default>1</default>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT</flag>
|
<flag>wxRIGHT</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_CANCEL">
|
<object class="wxButton" name="wxID_CANCEL">
|
||||||
|
|
||||||
|
|
||||||
<label>Cancel</label>
|
<label>Cancel</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@@ -442,23 +357,17 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxListBox" name="LIST">
|
<object class="wxListBox" name="LIST">
|
||||||
|
|
||||||
|
|
||||||
<content/>
|
<content/>
|
||||||
|
|
||||||
|
|
||||||
<size>80,100</size>
|
<size>80,100</size>
|
||||||
|
|
||||||
|
|
||||||
<style>wxLB_SORT</style>
|
<style>wxLB_SORT</style>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -467,43 +376,34 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_ADD">
|
<object class="wxButton" name="BUTTON_ADD">
|
||||||
|
|
||||||
|
|
||||||
<label>Add...</label>
|
<label>Add...</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM</flag>
|
<flag>wxBOTTOM</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>3</border>
|
<border>3</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_REMOVE">
|
<object class="wxButton" name="BUTTON_REMOVE">
|
||||||
|
|
||||||
|
|
||||||
<label>Remove</label>
|
<label>Remove</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxStaticLine"/>
|
<object class="wxStaticLine"/>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -512,32 +412,25 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_OK">
|
<object class="wxButton" name="wxID_OK">
|
||||||
|
|
||||||
|
|
||||||
<label>OK</label>
|
<label>OK</label>
|
||||||
|
|
||||||
|
|
||||||
<default>1</default>
|
<default>1</default>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxBOTTOM</flag>
|
<flag>wxBOTTOM</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="wxID_CANCEL">
|
<object class="wxButton" name="wxID_CANCEL">
|
||||||
|
|
||||||
|
|
||||||
<label>Cancel</label>
|
<label>Cancel</label>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
<flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>10</border>
|
<border>10</border>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
@@ -554,17 +447,14 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxRadioButton" name="RADIO_STD">
|
<object class="wxRadioButton" name="RADIO_STD">
|
||||||
|
|
||||||
|
|
||||||
<label>art:</label>
|
<label>art:</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALIGN_CENTRE_VERTICAL</flag>
|
<flag>wxALIGN_CENTRE_VERTICAL</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxComboBox" name="COMBO_STD">
|
<object class="wxComboBox" name="COMBO_STD">
|
||||||
|
|
||||||
|
|
||||||
<content>
|
<content>
|
||||||
<item>wxART_ADD_BOOKMARK</item>
|
<item>wxART_ADD_BOOKMARK</item>
|
||||||
<item>wxART_DEL_BOOKMARK</item>
|
<item>wxART_DEL_BOOKMARK</item>
|
||||||
@@ -616,20 +506,16 @@
|
|||||||
</content>
|
</content>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT|wxEXPAND</flag>
|
<flag>wxRIGHT|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxRadioButton" name="RADIO_FILE">
|
<object class="wxRadioButton" name="RADIO_FILE">
|
||||||
|
|
||||||
|
|
||||||
<label>file:</label>
|
<label>file:</label>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxALIGN_CENTRE_VERTICAL</flag>
|
<flag>wxALIGN_CENTRE_VERTICAL</flag>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
@@ -638,38 +524,30 @@
|
|||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxTextCtrl" name="TEXT_FILE"/>
|
<object class="wxTextCtrl" name="TEXT_FILE"/>
|
||||||
|
|
||||||
|
|
||||||
<option>1</option>
|
<option>1</option>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT|wxEXPAND</flag>
|
<flag>wxRIGHT|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<object class="sizeritem">
|
<object class="sizeritem">
|
||||||
<object class="wxButton" name="BUTTON_BROWSE">
|
<object class="wxButton" name="BUTTON_BROWSE">
|
||||||
|
|
||||||
|
|
||||||
<label>Browse...</label>
|
<label>Browse...</label>
|
||||||
|
|
||||||
|
|
||||||
<size>40,-1d</size>
|
<size>40,-1d</size>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxRIGHT|wxEXPAND</flag>
|
<flag>wxRIGHT|wxEXPAND</flag>
|
||||||
|
|
||||||
|
|
||||||
<border>5</border>
|
<border>5</border>
|
||||||
</object>
|
</object>
|
||||||
<vgap>2</vgap>
|
<vgap>2</vgap>
|
||||||
<growablecols>1</growablecols>
|
<growablecols>1</growablecols>
|
||||||
</object>
|
</object>
|
||||||
|
|
||||||
|
|
||||||
<flag>wxEXPAND</flag>
|
<flag>wxEXPAND</flag>
|
||||||
</object>
|
</object>
|
||||||
</object>
|
</object>
|
||||||
|
@@ -47,12 +47,16 @@ class xxxParam(xxxNode):
|
|||||||
self.textNode.data = value
|
self.textNode.data = value
|
||||||
else:
|
else:
|
||||||
def value(self):
|
def value(self):
|
||||||
|
try:
|
||||||
return self.textNode.data.encode(g.currentEncoding)
|
return self.textNode.data.encode(g.currentEncoding)
|
||||||
|
except LookupError:
|
||||||
|
return self.textNode.data.encode()
|
||||||
def update(self, value):
|
def update(self, value):
|
||||||
try: # handle exception if encoding is wrong
|
try: # handle exception if encoding is wrong
|
||||||
self.textNode.data = unicode(value, g.currentEncoding)
|
self.textNode.data = unicode(value, g.currentEncoding)
|
||||||
except UnicodeDecodeError:
|
except UnicodeDecodeError:
|
||||||
wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
|
self.textNode.data = unicode(value)
|
||||||
|
#wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
|
||||||
|
|
||||||
# Integer parameter
|
# Integer parameter
|
||||||
class xxxParamInt(xxxParam):
|
class xxxParamInt(xxxParam):
|
||||||
|
Reference in New Issue
Block a user