From 7134a4dfe6a831b7aab7ef1698624d57f705241e Mon Sep 17 00:00:00 2001 From: chriskiehl Date: Thu, 9 Jul 2015 20:01:54 -0400 Subject: [PATCH] Issue #93 - populate Gooey with defaults --- gooey/gui/widgets/widget_pack.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gooey/gui/widgets/widget_pack.py b/gooey/gui/widgets/widget_pack.py index cd5eacb..82b3981 100644 --- a/gooey/gui/widgets/widget_pack.py +++ b/gooey/gui/widgets/widget_pack.py @@ -52,6 +52,7 @@ class BaseChooser(WidgetPack): self.parent = parent self.option_string = data['commands'][0] if data['commands'] else '' self.text_box = wx.TextCtrl(self.parent) + self.text_box.AppendText(safe_default(data, '')) self.text_box.SetMinSize((0, -1)) dt = FileDrop(self.text_box) self.text_box.SetDropTarget(dt) @@ -133,6 +134,7 @@ class TextInputPayload(WidgetPack): self.widget.SetDropTarget(dt) self.widget.SetMinSize((0, -1)) self.widget.SetDoubleBuffered(True) + self.widget.AppendText(safe_default(data, '')) return self.widget def getValue(self): @@ -159,7 +161,7 @@ class DropdownPayload(WidgetPack): self.widget = wx.ComboBox( parent=parent, id=-1, - value=self.default_value, + value=safe_default(data, self.default_value), choices=data['choices'], style=wx.CB_DROPDOWN ) @@ -188,8 +190,8 @@ class CounterPayload(WidgetPack): self.widget = wx.ComboBox( parent=parent, id=-1, - value='', - choices=[str(x) for x in range(1, 7)], + value=safe_default(data, ''), + choices=map(str, range(1, 11)), style=wx.CB_DROPDOWN ) return self.widget @@ -208,3 +210,6 @@ class CounterPayload(WidgetPack): repeated_args = arg * int(dropdown_value) return '-' + repeated_args +def safe_default(data, default): + # str(None) is 'None'!? Whaaaaat...? + return str(data['default']) if data['default'] else ''