Merge pull request #151 from pinaise/experimental

Allow resize "Edit Settings" dialog and change slicer exception text
master
kliment 2012-01-07 10:31:59 -08:00
commit 9274f05694
1 changed files with 2 additions and 2 deletions

View File

@ -1271,7 +1271,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.skeinp.wait()
self.stopsf=1
except:
print _("Skeinforge execution failed.")
print _("Failed to execute slicing software: ")
self.stopsf=1
traceback.print_exc(file=sys.stdout)
@ -1615,7 +1615,7 @@ class macroed(wx.Dialog):
class options(wx.Dialog):
"""Options editor"""
def __init__(self,pronterface):
wx.Dialog.__init__(self, None, title=_("Edit settings"))
wx.Dialog.__init__(self, None, title=_("Edit settings"), style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
topsizer=wx.BoxSizer(wx.VERTICAL)
vbox=wx.StaticBoxSizer(wx.StaticBox(self, label=_("Defaults")) ,wx.VERTICAL)
topsizer.Add(vbox,1,wx.ALL+wx.EXPAND)