From b7c93a60fdc37a1fe7f3887291a2b795f8151bb2 Mon Sep 17 00:00:00 2001 From: rytz Date: Thu, 28 Jan 2016 12:39:14 -0800 Subject: [PATCH] Misc. UI changes --- .../ApplicationSettings/ApplicationSettingsView.cs | 5 +---- ConfigurationPage/PrintLeveling/LevelWizardBase.cs | 2 +- CustomWidgets/ExportPrintItemWindow.cs | 3 +-- PartPreviewWindow/View3D/View3DWidget.cs | 7 ++++--- PartPreviewWindow/ViewGcodeBasic.cs | 4 ++-- Queue/OptionsMenu/QueueOptionsMenu.cs | 2 +- StaticData/Translations/Master.txt | 3 +++ 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index 26aaae31c..f25f44bfb 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -152,10 +152,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage buttonRow.HAnchor = HAnchor.ParentLeftRight; buttonRow.Margin = new BorderDouble(0, 6); - string settingLabelBeggining = "Theme".Localize(); - string settingLabelEnd = "Display".Localize(); - string settingLabelFull = String.Format("{0}/{1}", settingLabelBeggining, settingLabelEnd); - TextWidget settingLabel = new TextWidget(settingLabelFull);//"Theme/Display Options" + TextWidget settingLabel = new TextWidget("Theme".Localize()); settingLabel.AutoExpandBoundsToText = true; settingLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; settingLabel.HAnchor = Agg.UI.HAnchor.ParentLeft; diff --git a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs index 58ed54692..bea999b47 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizardBase.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizardBase.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling protected static readonly string doneInstructionsText = LocalizedString.Get("Congratulations!\n\nAuto Print Leveling is now configured and enabled."); protected static readonly string doneInstructionsTextTwo = LocalizedString.Get("Remove the paper"); - protected static readonly string doneInstructionsTextThree = LocalizedString.Get("If in the future you need to re-calibrate your printer, or you wish to turn Auto Print Leveling off, you can find the print leveling controls in 'Advanced Settings'->'Configuration'.\n\nClick 'Done' to close this window."); + protected static readonly string doneInstructionsTextThree = LocalizedString.Get("To re-calibrate the printer, or to turn off Auto Print Leveling, the print leveling controls can be found under 'Options'->'Calibration'.\n\nClick 'Done' to close this window."); protected static readonly string stepTextBeg = LocalizedString.Get("Step"); protected static readonly string stepTextEnd = LocalizedString.Get("of"); diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index 3d16a82c4..484995234 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -117,8 +117,7 @@ namespace MatterHackers.MatterControl bool showExportGCodeButton = ActivePrinterProfile.Instance.ActivePrinter != null || partIsGCode; if (showExportGCodeButton) { - string exportGCodeText = LocalizedString.Get("Export as"); - string exportGCodeTextFull = string.Format("{0} GCode", exportGCodeText); + string exportGCodeTextFull = string.Format("{0} G-Code", "Export as".Localize()); Button exportGCode = textImageButtonFactory.Generate(exportGCodeTextFull); exportGCode.Name = "Export as GCode Button"; exportGCode.HAnchor = HAnchor.ParentLeft; diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index 25a94928b..3e209601c 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -1138,9 +1138,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // add in the dimensions { - buttonPanel.AddChild(createAxisScalingControl("x", 0)); - buttonPanel.AddChild(createAxisScalingControl("y", 1)); - buttonPanel.AddChild(createAxisScalingControl("z", 2)); + + buttonPanel.AddChild(createAxisScalingControl("x".ToUpper(), 0)); + buttonPanel.AddChild(createAxisScalingControl("y".ToUpper(), 1)); + buttonPanel.AddChild(createAxisScalingControl("z".ToUpper(), 2)); uniformScale = new CheckBox("Lock Ratio".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor); uniformScale.Checked = true; diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index 8efd25cc9..f8b8eb967 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -440,7 +440,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow string printTimeLabel = "Print Time".Localize(); string printTimeLabelFull = string.Format("{0}:", printTimeLabel); // put in the print time - modelInfoContainer.AddChild(new TextWidget(printTimeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10)); + modelInfoContainer.AddChild(new TextWidget(printTimeLabelFull, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 9)); { string timeRemainingText = "---"; @@ -493,7 +493,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow modelInfoContainer.AddChild(estimatedPrintTime); } - string weightLabel = "Est. Weight".Localize(); + string weightLabel = "Estimated Weight".Localize(); string weightLabelFull = string.Format("{0}:", weightLabel); modelInfoContainer.AddChild(new TextWidget(weightLabelFull, pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)); { diff --git a/Queue/OptionsMenu/QueueOptionsMenu.cs b/Queue/OptionsMenu/QueueOptionsMenu.cs index de141950c..57d715c4d 100644 --- a/Queue/OptionsMenu/QueueOptionsMenu.cs +++ b/Queue/OptionsMenu/QueueOptionsMenu.cs @@ -81,7 +81,7 @@ namespace MatterHackers.MatterControl.PrintQueue menuItems = new TupleList>(); menuItems.Add(new Tuple>("Design".Localize(), null)); menuItems.Add(new Tuple>(" Export to Zip".Localize(), exportQueueToZipMenu_Click)); - menuItems.Add(new Tuple>("GCode", null)); + menuItems.Add(new Tuple>("G-Code", null)); menuItems.Add(new Tuple>(" Export to Folder or SD Card".Localize(), exportGCodeToFolderButton_Click)); //menuItems.Add(new Tuple>("X3G", null)); //menuItems.Add(new Tuple>("Export to Folder".Localize(), exportX3GButton_Click)); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 9da9caa37..5331aced8 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4477,3 +4477,6 @@ Translated:Create Perimeter English:Loading G-Code Translated:Loading G-Code +English:Estimated Weight +Translated:Estimated Weight +