nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc. label changes

Browse source
This commit is contained in:
rytz 2016-01-14 17:26:42 -08:00
parent d7bc6af53d
commit 8fd46d8a78
6 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/ControlWidgets/MacroControls.cs
View file

@ -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);
}

4
PrinterControls/ControlWidgets/TemperatureControls.cs
View file

@ -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);

4
PrinterControls/EditMacrosWindow.cs
View file

@ -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;

7
PrinterControls/EditManualMovementSpeedsWindow.cs
View file

@ -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);

4
PrinterControls/EditTemperaturePresetsWindow.cs
View file

@ -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);

8
StaticData/SliceSettings/Properties.json
View file

@ -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 %"
},