chiark / gitweb /
Changed order of material types to put HIPS first.
authorSteven Abadie <steven@alephobjects.com>
Fri, 7 Nov 2014 03:42:33 +0000 (20:42 -0700)
committerSteven Abadie <steven@alephobjects.com>
Fri, 7 Nov 2014 03:42:33 +0000 (20:42 -0700)
Cura/gui/simpleMode.py

index 946832d1ab023a18be2e8afc4458e953757efe4f..ecc1a9952cf96ec62c02ba1ae791e51522f84686 100644 (file)
@@ -23,10 +23,12 @@ class simpleModePanel(wx.Panel):
                self.printTypeJoris.Hide()
 
                printMaterialPanel = wx.Panel(self)
-               self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA', style=wx.RB_GROUP)
-               self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, 'ABS')
                if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
-                       self.printMaterialHIPS = wx.RadioButton(printMaterialPanel, -1, 'HIPS')
+                       self.printMaterialHIPS = wx.RadioButton(printMaterialPanel, -1, 'HIPS', style=wx.RB_GROUP)
+                       self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, 'ABS')
+               else:
+                       self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, 'ABS', style=wx.RB_GROUP)
+               self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA')
                self.printMaterialDiameter = wx.TextCtrl(printMaterialPanel, -1, profile.getProfileSetting('filament_diameter'))
                if profile.getMachineSetting('gcode_flavor') == 'UltiGCode':
                        printMaterialPanel.Show(False)
@@ -48,10 +50,10 @@ class simpleModePanel(wx.Panel):
 
                sb = wx.StaticBox(printMaterialPanel, label=_("Material:"))
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)
-               boxsizer.Add(self.printMaterialPLA)
-               boxsizer.Add(self.printMaterialABS)
                if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
                        boxsizer.Add(self.printMaterialHIPS)
+               boxsizer.Add(self.printMaterialABS)
+               boxsizer.Add(self.printMaterialPLA)
                boxsizer.Add(wx.StaticText(printMaterialPanel, -1, _("Diameter:")))
                boxsizer.Add(self.printMaterialDiameter)
                printMaterialPanel.SetSizer(wx.BoxSizer(wx.VERTICAL))