Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problems with wxStaticBitmap (stock_id attribute, icon type

Browse Source 
switching).

Changed some dimensions in properties panel elements.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Roman Rolinsky
2003-09-12 09:45:35 +00:00
parent 82dc259d6c
commit 0e573042c4
6 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/wxPython/tools/XRCed/CHANGES.txt
View File

@@ -1,3 +1,11 @@
0.1.1-4
-------
Fixed problems with wxStaticBitmap (stock_id attribute, icon type
switching).
Changed some dimensions in properties panel elements.
0.1.1-3 0.1.1-3
------- -------

2
wxPython/wxPython/tools/XRCed/globals.py
View File

@@ -15,7 +15,7 @@ modernFont = wxFont(sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL) smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
progname = 'XRCed' progname = 'XRCed'
version = '0.1.1-3' version = '0.1.1-4'
try: try:
True True

5
wxPython/wxPython/tools/XRCed/panel.py
View File

@@ -20,8 +20,11 @@ class Panel(wxNotebook):
self.modified = False self.modified = False
# Set common button size for parameter buttons # Set common button size for parameter buttons
bTmp = wxButton(self, -1, '')
import params import params
params.buttonSize = self.DLG_SZE(buttonSize) params.buttonSize = (self.DLG_SZE(buttonSize)[0], bTmp.GetSize()[1])
bTmp.Destroy()
del bTmp
# List of child windows # List of child windows
self.pages = [] self.pages = []

12
wxPython/wxPython/tools/XRCed/params.py
View File

@@ -16,7 +16,7 @@ genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER',
'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS', 'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS',
'wxNO_FULL_REPAINT_ON_RESIZE'] 'wxNO_FULL_REPAINT_ON_RESIZE']
buttonSize = (30,-1) # in dialog units, transformed to pixels in panel ctor buttonSize = (35,-1) # in dialog units, transformed to pixels in panel ctor
# Class that can properly disable children # Class that can properly disable children
class PPanel(wxPanel): class PPanel(wxPanel):
@@ -274,8 +274,8 @@ class ParamFont(PPanel):
fontStylesWx2Xml.get(font.GetStyle(), "normal"), fontStylesWx2Xml.get(font.GetStyle(), "normal"),
fontWeightsWx2Xml.get(font.GetWeight(), "normal"), fontWeightsWx2Xml.get(font.GetWeight(), "normal"),
str(font.GetUnderlined()), str(font.GetUnderlined()),
font.GetFaceName(), font.GetFaceName().encode(),
wxFontMapper_GetEncodingName(font.GetEncoding()) wxFontMapper_GetEncodingName(font.GetEncoding()).encode()
] ]
# Add ignored flags # Add ignored flags
self.SetValue(value) self.SetValue(value)
@@ -694,8 +694,8 @@ class RadioBox(PPanel):
self.choices = choices self.choices = choices
topSizer = wxBoxSizer() topSizer = wxBoxSizer()
for i in choices: for i in choices:
button = wxRadioButton(self, -1, i, name=i) button = wxRadioButton(self, -1, i, size=(-1,buttonSize[1]), name=i)
topSizer.Add(button) topSizer.Add(button, 0, wxRIGHT, 5)
EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice) EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice)
self.SetAutoLayout(True) self.SetAutoLayout(True)
self.SetSizer(topSizer) self.SetSizer(topSizer)
@@ -815,10 +815,12 @@ class ParamBitmap(PPanel):
def updateRadios(self): def updateRadios(self):
if self.value[0]: if self.value[0]:
self.radio_std.SetValue(True) self.radio_std.SetValue(True)
self.radio_file.SetValue(False)
self.text.Enable(False) self.text.Enable(False)
self.button.Enable(False) self.button.Enable(False)
self.combo.Enable(True) self.combo.Enable(True)
else: else:
self.radio_std.SetValue(False)
self.radio_file.SetValue(True) self.radio_file.SetValue(True)
self.text.Enable(True) self.text.Enable(True)
self.button.Enable(True) self.button.Enable(True)

4
wxPython/wxPython/tools/XRCed/xrced.xrc
View File

@@ -298,6 +298,7 @@
<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>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxComboBox" name="COMBO_STD"> <object class="wxComboBox" name="COMBO_STD">
@@ -342,6 +343,7 @@
<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>
</object> </object>
<object class="sizeritem"> <object class="sizeritem">
<object class="wxBoxSizer"> <object class="wxBoxSizer">
@@ -355,7 +357,7 @@
<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>30,-1d</size> <size>40,-1d</size>
</object> </object>
</object> </object>
</object> </object>

2
wxPython/wxPython/tools/XRCed/xxx.py
View File

@@ -169,7 +169,7 @@ class xxxParamBitmap(xxxParam):
self.stock_id = value[0] self.stock_id = value[0]
if self.stock_id: if self.stock_id:
self.node.setAttribute('stock_id', self.stock_id) self.node.setAttribute('stock_id', self.stock_id)
else: elif self.node.hasAttribute('stock_id'):
self.node.removeAttribute('stock_id') self.node.removeAttribute('stock_id')
xxxParam.update(self, value[1]) xxxParam.update(self, value[1])