From 8fd46d8a78175509a3d54c4c64fbc2b775fb8a4f Mon Sep 17 00:00:00 2001 From: rytz Date: Thu, 14 Jan 2016 17:26:42 -0800 Subject: [PATCH] Misc. label changes --- PrinterControls/ControlWidgets/MacroControls.cs | 2 +- PrinterControls/ControlWidgets/TemperatureControls.cs | 4 ---- PrinterControls/EditMacrosWindow.cs | 4 ++-- PrinterControls/EditManualMovementSpeedsWindow.cs | 7 ++----- PrinterControls/EditTemperaturePresetsWindow.cs | 4 ++-- StaticData/SliceSettings/Properties.json | 8 ++++---- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/PrinterControls/ControlWidgets/MacroControls.cs b/PrinterControls/ControlWidgets/MacroControls.cs index e3fc18d2b..889330ce8 100644 --- a/PrinterControls/ControlWidgets/MacroControls.cs +++ b/PrinterControls/ControlWidgets/MacroControls.cs @@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl.PrinterControls } if (buttonCount == 0) { - TextWidget noMacrosFound = new TextWidget(LocalizedString.Get("No macros are currently setup for this printer."), pointSize: 10); + TextWidget noMacrosFound = new TextWidget(LocalizedString.Get("No macros are currently set up for this printer."), pointSize: 10); noMacrosFound.TextColor = ActiveTheme.Instance.PrimaryTextColor; macroButtonContainer.AddChild(noMacrosFound); } diff --git a/PrinterControls/ControlWidgets/TemperatureControls.cs b/PrinterControls/ControlWidgets/TemperatureControls.cs index c63756e93..3af0b4b4d 100644 --- a/PrinterControls/ControlWidgets/TemperatureControls.cs +++ b/PrinterControls/ControlWidgets/TemperatureControls.cs @@ -21,10 +21,6 @@ namespace MatterHackers.MatterControl.PrinterControls mainContainer.HAnchor = HAnchor.ParentLeftRight; mainContainer.Margin = new BorderDouble(left: 0); - TextWidget subheader = new TextWidget("Temporarily override target temperature".Localize(), pointSize: 8, textColor: ActiveTheme.Instance.PrimaryTextColor); - subheader.Margin = new BorderDouble(bottom: 6); - mainContainer.AddChild(subheader); - temperatureGroupBox.AddChild(mainContainer); RGBA_Bytes separatorLineColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 100); diff --git a/PrinterControls/EditMacrosWindow.cs b/PrinterControls/EditMacrosWindow.cs index 0ecd530c8..bc4fdf5cb 100644 --- a/PrinterControls/EditMacrosWindow.cs +++ b/PrinterControls/EditMacrosWindow.cs @@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl macroNameInput = new MHTextEditWidget(windowController.ActiveMacro.Name); macroNameInput.HAnchor = HAnchor.ParentLeftRight; - string giveMacroANameLabel = LocalizedString.Get("Give your macro a name"); + string giveMacroANameLabel = LocalizedString.Get("Give the macro a name"); string giveMacroANameLabelFull = string.Format("{0}.", giveMacroANameLabel); macroNameError = new TextWidget(giveMacroANameLabelFull, 0, 0, 10); macroNameError.TextColor = ActiveTheme.Instance.PrimaryTextColor; @@ -169,7 +169,7 @@ namespace MatterHackers.MatterControl macroCommandInput.VAnchor = VAnchor.ParentBottomTop; macroCommandInput.ActualTextEditWidget.VAnchor = VAnchor.ParentBottomTop; - string shouldBeGCodeLabel = LocalizedString.Get("This should be in 'Gcode'"); + string shouldBeGCodeLabel = LocalizedString.Get("This should be in 'G-Code'"); string shouldBeGCodeLabelFull = string.Format("{0}.", shouldBeGCodeLabel); macroCommandError = new TextWidget(shouldBeGCodeLabelFull, 0, 0, 10); macroCommandError.TextColor = ActiveTheme.Instance.PrimaryTextColor; diff --git a/PrinterControls/EditManualMovementSpeedsWindow.cs b/PrinterControls/EditManualMovementSpeedsWindow.cs index 563431530..88965c1d5 100644 --- a/PrinterControls/EditManualMovementSpeedsWindow.cs +++ b/PrinterControls/EditManualMovementSpeedsWindow.cs @@ -128,14 +128,11 @@ namespace MatterHackers.MatterControl TextWidget axisLabel; if (settingsArray[i].StartsWith("e")) { - int extruderIndex = (int)double.Parse(settingsArray[i].Substring(1)) + 1; - string extruderLabelTxt = LocalizedString.Get("Extruder"); - axisLabel = new TextWidget(string.Format("{0} {1}", extruderLabelTxt, extruderIndex), textColor: ActiveTheme.Instance.PrimaryTextColor); + axisLabel = new TextWidget(string.Format("{0}(s)", "Extruder".Localize()), textColor: ActiveTheme.Instance.PrimaryTextColor); } else { - string axisLabelText = LocalizedString.Get("Axis"); - axisLabel = new TextWidget(string.Format("{0} {1}", axisLabelText, settingsArray[i]), textColor: ActiveTheme.Instance.PrimaryTextColor); + axisLabel = new TextWidget(string.Format("{0} {1}", "Axis".Localize(), settingsArray[i].ToUpper()), textColor: ActiveTheme.Instance.PrimaryTextColor); } axisLabel.VAnchor = VAnchor.ParentCenter; leftRightEdit.AddChild(axisLabel); diff --git a/PrinterControls/EditTemperaturePresetsWindow.cs b/PrinterControls/EditTemperaturePresetsWindow.cs index aee9528bb..5543e7d39 100644 --- a/PrinterControls/EditTemperaturePresetsWindow.cs +++ b/PrinterControls/EditTemperaturePresetsWindow.cs @@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl leftRightEdit.Padding = new BorderDouble(3); leftRightEdit.HAnchor |= Agg.UI.HAnchor.ParentLeftRight; string presetLabelTxt = LocalizedString.Get("Preset"); - TextWidget label = new TextWidget(string.Format("{1} {0}.", preset_count, presetLabelTxt), textColor: ActiveTheme.Instance.PrimaryTextColor); + TextWidget label = new TextWidget(string.Format("{1} {0}", preset_count, presetLabelTxt), textColor: ActiveTheme.Instance.PrimaryTextColor); label.VAnchor = VAnchor.ParentCenter; leftRightEdit.AddChild(label); @@ -175,7 +175,7 @@ namespace MatterHackers.MatterControl GuiWidget hSpacer = new GuiWidget(); hSpacer.HAnchor = HAnchor.ParentLeftRight; - TextWidget maxWidgetLabel = new TextWidget(LocalizedString.Get("Max Temp."), textColor: ActiveTheme.Instance.PrimaryTextColor); + TextWidget maxWidgetLabel = new TextWidget(LocalizedString.Get("Max Temp"), textColor: ActiveTheme.Instance.PrimaryTextColor); maxWidgetLabel.VAnchor = VAnchor.ParentCenter; leftRightEdit.AddChild(maxWidgetLabel); leftRightEdit.AddChild(hSpacer); diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 5ce5986d5..0d45e19ce 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -233,7 +233,7 @@ { "SlicerConfigName": "extruder_offset", "PresentationName": "Extruder Offset", - "HelpText": "This is the offset of each extruder relative to the first extruder. Only useful for multiple extruder machines.", + "HelpText": "The offset of each extruder relative to the first extruder. Only useful for multiple extruder machines.", "DataEditType": "OFFSET2", "ExtraSettings": "mm" }, @@ -332,7 +332,7 @@ { "SlicerConfigName": "first_layer_extrusion_width", "PresentationName": "First Layer", - "HelpText": "Setting this to greater than 100% can often help the first layer have better adhesion to the print bed.", + "HelpText": "A modifier of the width of the extrusion for the first layer of the print. A value greater than 100% can help with adhesion to the print bed.", "DataEditType": "DOUBLE_OR_PERCENT", "ExtraSettings": "mm or %\\nleave 0 for default" }, @@ -804,7 +804,7 @@ { "SlicerConfigName": "skirt_distance", "PresentationName": "Distance From Object", - "HelpText": "The distance to start drawing the first skirt loop. Make this 0 to create an anchor for the part to the bed.", + "HelpText": "The distance from the model at which the first skirt loop is drawn. Make this 0 to create an anchor for the part to the bed, also known as a brim.", "DataEditType": "POSITIVE_DOUBLE", "ExtraSettings": "mm", "QuickMenuSettings": [{"MenuName" : "Touching", "Value": "0"},{"MenuName" : "Standard", "Value": "3"},{"MenuName" : "Far", "Value": "10"}] @@ -1107,7 +1107,7 @@ { "SlicerConfigName": "top_solid_infill_speed", "PresentationName": "Top Solid Infill", - "HelpText": "The speed to print the top infill. This can be set explicitly or as a percentage of the Infill speed.", + "HelpText": "The speed at which the top solid layers will print. Can be set explicitly or as a percentage of the Infill speed.", "DataEditType": "DOUBLE_OR_PERCENT", "ExtraSettings": "mm/s or %" },