From: daid303 Date: Fri, 19 Apr 2013 08:15:29 +0000 (+0200) Subject: Fix color selection. X-Git-Tag: 13.05~77 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=df5f8cd8038c44ce127472f4f77d63404288b0e4;p=cura.git Fix color selection. --- diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py index 7bc4ebfc..f3f38421 100644 --- a/Cura/gui/configBase.py +++ b/Cura/gui/configBase.py @@ -170,7 +170,7 @@ class SettingRow(): self.ctrl = wx.CheckBox(panel, -1, style=wx.ALIGN_RIGHT) self.SetValue(self.setting.getValue()) self.ctrl.Bind(wx.EVT_CHECKBOX, self.OnSettingChange) - elif self.setting.getType() is wx.Colour: + elif valueOverride is not None and valueOverride is wx.Colour: self.ctrl = wx.ColourPickerCtrl(panel, -1) self.SetValue(self.setting.getValue()) self.ctrl.Bind(wx.EVT_COLOURPICKER_CHANGED, self.OnSettingChange) diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py index 10cac728..66aaf042 100644 --- a/Cura/gui/preferencesDialog.py +++ b/Cura/gui/preferencesDialog.py @@ -33,9 +33,9 @@ class preferencesDialog(wx.Frame): configBase.SettingRow(left, 'extruder_offset_y%d' % (i)) configBase.TitleRow(left, 'Colours') - configBase.SettingRow(left, 'model_colour') + configBase.SettingRow(left, 'model_colour', wx.Colour) for i in xrange(1, self.oldExtruderAmount): - configBase.SettingRow(left, 'model_colour%d' % (i+1)) + configBase.SettingRow(left, 'model_colour%d' % (i+1), wx.Colour) configBase.TitleRow(right, 'Filament settings') configBase.SettingRow(right, 'filament_physical_density')