From: daid303 <daid303@gmail.com>
Date: Thu, 7 Mar 2013 15:59:06 +0000 (+0100)
Subject: Merge branch 'master' into SteamEngine
X-Git-Tag: 13.05~195
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fbf4f9267dba413208b7ac7369facc72a2f7bc6e;p=cura.git

Merge branch 'master' into SteamEngine
---

fbf4f9267dba413208b7ac7369facc72a2f7bc6e
diff --cc Cura/gui/simpleMode.py
index 82cb6bf1,0b170e77..14d2a891
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@@ -15,11 -15,10 +15,11 @@@ class simpleModePanel(wx.Panel)
  		#self.menubar.Insert(1, toolsMenu, 'Normal mode')
  
  		printTypePanel = wx.Panel(self)
- 		self.printTypeNormal = wx.RadioButton(printTypePanel, -1, 'Normal quality print', style=wx.RB_GROUP)
+ 		self.printTypeHigh = wx.RadioButton(printTypePanel, -1, 'High quality print', style=wx.RB_GROUP)
+ 		self.printTypeNormal = wx.RadioButton(printTypePanel, -1, 'Normal quality print')
  		self.printTypeLow = wx.RadioButton(printTypePanel, -1, 'Fast low quality print')
- 		self.printTypeHigh = wx.RadioButton(printTypePanel, -1, 'High quality print')
  		self.printTypeJoris = wx.RadioButton(printTypePanel, -1, 'Thin walled cup or vase')
 +		self.printTypeJoris.Hide()
  
  		printMaterialPanel = wx.Panel(self)
  		self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA', style=wx.RB_GROUP)