Update naming and labeling for tool heads and hotends

Improve user facing text for consistency, simplification, and better understanding.

diff --git a/Cura/gui/configBase.py b/Cura/gui/configBase.py
index 4ccc23825a3ded5d6e3fd10664cb80f11b338e2e..75eb4efeb9205623511ddb7824d91c64bc90c9a6 100644 (file)
--- a/Cura/gui/configBase.py
+++ b/Cura/gui/configBase.py
@@ -249,7 +249,7 @@ class SettingRow(object):
                else:
                        self.ctrl.SetValue(value)
 
-class ToolheadRow(object):
+class ToolHeadRow(object):
        def __init__(self, panel, configName, index = None):
                sizer = panel.GetSizer()
                x = sizer.GetRows()
@@ -272,7 +272,7 @@ class ToolheadRow(object):
                self.ctrl = wx.TextCtrl(self.subpanel, -1, self.setting.getValue(self.settingIndex))
                self.ctrl.Enable(False)
 
-               self.button = wx.Button(self.subpanel, -1, _("Change Toolhead"))
+               self.button = wx.Button(self.subpanel, -1, _("Change Tool Head"))
 
                flag = wx.EXPAND
                self.ctrl.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 6ec668c5ff40138c2e438c08fb170dde07776211..e623e43ebac85cc55446832afb7455d7ccffcc3b 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -1199,7 +1199,7 @@ class LulzbotToolheadSelectPage(InfoPage):
 
 class LulzbotMiniToolheadSelectPage(LulzbotToolheadSelectPage):
        def __init__(self, parent, allowBack = True):
-               super(LulzbotMiniToolheadSelectPage, self).__init__(parent, _("LulzBot Mini Toolhead Selection"))
+               super(LulzbotMiniToolheadSelectPage, self).__init__(parent, _("LulzBot Mini Tool Head Selection"))
 
                self.allowBack = allowBack
                self.panel = self.AddPanel()
@@ -1231,7 +1231,7 @@ class LulzbotMiniToolheadSelectPage(LulzbotToolheadSelectPage):
 
 class LulzbotTazToolheadSelectPage(LulzbotToolheadSelectPage):
        def __init__(self, parent):
-               super(LulzbotTazToolheadSelectPage, self).__init__(parent, _("LulzBot TAZ Toolhead Selection"))
+               super(LulzbotTazToolheadSelectPage, self).__init__(parent, _("LulzBot TAZ Tool Head Selection"))
 
                self.panel = self.AddPanel()
                image_size=(LulzbotMachineSelectPage.IMAGE_WIDTH, LulzbotMachineSelectPage.IMAGE_HEIGHT)
@@ -1320,15 +1320,15 @@ class LulzbotTazToolheadSelectPage(LulzbotToolheadSelectPage):
 
 class LulzbotHotendSelectPage(LulzbotToolheadSelectPage):
        def __init__(self, parent, allowBack = True):
-               super(LulzbotHotendSelectPage, self).__init__(parent, _("LulzBot Toolhead Hotend Selection"))
+               super(LulzbotHotendSelectPage, self).__init__(parent, _("LulzBot Tool Head Hotend Selection"))
 
                self.allowBack = allowBack
                self.panel = self.AddPanel()
                image_size=(LulzbotMachineSelectPage.IMAGE_WIDTH, LulzbotMachineSelectPage.IMAGE_HEIGHT)
-               self.v1 = self.AddImageButton(self.panel, 0, 0, _('v1 (Budaschnozzle Hotends)'),
+               self.v1 = self.AddImageButton(self.panel, 0, 0, _('v1 (Budaschnozzle)'),
                                                                                        'Lulzbot_Toolhead_v1.jpg', image_size,
                                                                                        style=ImageButton.IB_GROUP)
-               self.v2 = self.AddImageButton(self.panel, 0, 1, _('v2 (Hexagon Hotends)'),
+               self.v2 = self.AddImageButton(self.panel, 0, 1, _('v2 (Hexagon)'),
                                                                                        'Lulzbot_Toolhead_v2.jpg', image_size)
                self.v1.SetValue(True)
 
@@ -1386,7 +1386,7 @@ class LulzbotFirmwareUpdatePage(InfoPage):
                self.AddSeperator()
                self.AddText(_("Firmware is the piece of software running directly on your 3D printer.\nThis firmware controls the stepper motors, regulates the temperature\nand ultimately makes your printer work."))
                self.AddHiddenSeperator()
-               self.AddText(_("The firmware shipping with new Lulzbot printers works, but upgrades may be available\nwhich improve the functionality of your printer.\nIf you changed your toolhead, you will also need to flash\na new firmware or you may risk damaging the toolhead."))
+               self.AddText(_("The firmware shipping with new Lulzbot printers works, but upgrades may be available\nwhich improve the functionality of your printer.\nIf you changed your tool head, you will also need to flash\n new firmware or you risk damaging your printer."))
                self.AddHiddenSeperator()
                self.AddText(_("To avoid any possible confusion, make sure to disconnect all printers from your PC\nexpect the printer that you are currently configuring."))
                self.AddHiddenSeperator()
@@ -1403,7 +1403,7 @@ class LulzbotFirmwareUpdatePage(InfoPage):
 
        def OnSkipClick(self, e):
                dlg = wx.MessageDialog(self, _("Are you sure you want to skip the firmware upgrade?\n" +
-                                                                          "It could damage your printer if you changed your toolhead and have not updated thefirmware!"),
+                                                                          "It could damage your printer if you changed your tool head and have not updated thefirmware!"),
                                                        _('Skip firmware upgrade?'), wx.YES_NO | wx.ICON_EXCLAMATION)
                skip = dlg.ShowModal() == wx.ID_YES
                dlg.Destroy()
@@ -1413,7 +1413,7 @@ class LulzbotFirmwareUpdatePage(InfoPage):
 
 class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
        def __init__(self):
-               super(LulzbotChangeToolheadWizard, self).__init__(None, -1, _("Change Lulzbot Toolhead Wizard"))
+               super(LulzbotChangeToolheadWizard, self).__init__(None, -1, _("Change Lulzbot Tool Head Wizard"))
 
                self._nozzle_size = profile.getProfileSettingFloat('nozzle_size')
                self._machine_name = profile.getMachineSetting('machine_name')

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index eee3c35c27e285e657ed701dc3af125064824677..f18e3a944dfce24a5867f290a8d2fdc4b993e022 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -124,8 +124,8 @@ class machineSettingsDialog(wx.Dialog):
 
                        printer_type = profile.getMachineSetting('machine_type', idx)
                        if printer_type.startswith('lulzbot_'):
-                               configBase.TitleRow(right, _("Toolhead"))
-                               row = configBase.ToolheadRow(right, 'toolhead', index=idx)
+                               configBase.TitleRow(right, _("Tool Head"))
+                               row = configBase.ToolHeadRow(right, 'toolhead', index=idx)
                                row.button.Bind(wx.EVT_BUTTON, self.OnChangeToolheadButton)
 
                        configBase.TitleRow(right, _("Printer head size"))

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index da590a30d44b2be77003ecc954944791bd157631..2ad49b202324047179af720d9ce9866cdeb5f3b7 100644 (file)
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -178,7 +178,7 @@ class Scene(object):
                                        self._oneAtATime = False
                                        if self._lastResultOneAtATime:
                                                if self._sceneView:
-                                                       self._sceneView.notification.message("Object must be shorter than {}mm for this printer/toolhead. Reduce object size or swap to \"All at once\" mode. ".format(self._gantryHeight))
+                                                       self._sceneView.notification.message("Object must be shorter than {}mm for this printer/tool head. Reduce object size or swap to \"All at once\" mode. ".format(self._gantryHeight))
                                                break
 
                self._lastResultOneAtATime = self._oneAtATime

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 881bf8e00e7a64b1b4d8046964761c2895b6a189..b6d9372b6c24d397633ab28d45ee84e68520fc8d 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -552,7 +552,7 @@ setting('serial_port_auto', '', str, 'machine', 'hidden')
 setting('serial_baud', 'AUTO', str, 'machine', 'hidden').setLabel(_("Baudrate"), _("Speed of the serial port communication\nNeeds to match your firmware settings\nCommon values are 250000, 115200, 57600"))
 setting('serial_baud_auto', '', int, 'machine', 'hidden')
 
-setting('toolhead', 'Default', str, 'machine', 'hidden').setLabel(_("Installed toolhead"), _("Which toolhead is currently installed. This setting is only used by LulzBot machines."))
+setting('toolhead', 'Default', str, 'machine', 'hidden').setLabel(_("Installed Tool Head"), _("Which tool head is currently installed. This setting is only used by LulzBot machines."))
 setting('toolhead_shortname', '', str, 'machine', 'hidden')
 setting('extruder_head_size_min_x', '0.0', float, 'machine', 'hidden').setLabel(_("Head size towards X min (mm)"), _("The head size when printing multiple objects, measured from the tip of the nozzle towards the outer part of the head."))
 setting('extruder_head_size_min_y', '0.0', float, 'machine', 'hidden').setLabel(_("Head size towards Y min (mm)"), _("The head size when printing multiple objects, measured from the tip of the nozzle towards the outer part of the head."))