diff --git a/ActionBar/TemperatureWidgetBase.cs b/ActionBar/TemperatureWidgetBase.cs index 7a2d8bed8..cd00b3e9f 100644 --- a/ActionBar/TemperatureWidgetBase.cs +++ b/ActionBar/TemperatureWidgetBase.cs @@ -32,6 +32,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.Agg.VertexSource; using MatterHackers.MatterControl.PrinterCommunication; +using MatterHackers.Localizations; namespace MatterHackers.MatterControl.ActionBar { @@ -105,7 +106,7 @@ namespace MatterHackers.MatterControl.ActionBar buttonContainer.HAnchor = Agg.UI.HAnchor.ParentLeftRight; buttonContainer.Height = 18* TextWidget.GlobalPointSizeScaleRatio; - preheatButton = whiteButtonFactory.Generate("PREHEAT"); + preheatButton = whiteButtonFactory.Generate("Preheat".Localize().ToUpper()); preheatButton.Cursor = Cursors.Hand; preheatButton.Visible = false; diff --git a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs index 3daaaa55b..49b91c0e7 100644 --- a/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs +++ b/ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs @@ -63,7 +63,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage buttonRow.HAnchor = HAnchor.ParentLeftRight; buttonRow.Margin = new BorderDouble(0, 6); - TextWidget settingLabel = new TextWidget(LocalizedString.Get("Theme/Display Options")); + string settingLabelBeggining = LocalizedString.Get("Theme"); + string settingLabelEnd = LocalizedString.Get("Display Options"); + string settingLabelFull = String.Format("{0}/{1}", settingLabelBeggining, settingLabelEnd); + TextWidget settingLabel = new TextWidget(settingLabelFull);//"Theme/Display Options" settingLabel.AutoExpandBoundsToText = true; settingLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; settingLabel.HAnchor = Agg.UI.HAnchor.ParentLeft; @@ -123,8 +126,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage optionsContainer.AddChild(releaseOptionsDropList); optionsContainer.Width = 200; - MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem("Normal", "responsive"); - MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem("Touchscreen", "touchscreen"); + MenuItem releaseOptionsDropDownItem = releaseOptionsDropList.AddItem(LocalizedString.Get("Normal"), "responsive"); + MenuItem preReleaseDropDownItem = releaseOptionsDropList.AddItem(LocalizedString.Get("Touchscreen"), "touchscreen"); List acceptableUpdateFeedTypeValues = new List() { "responsive", "touchscreen" }; string currentUpdateFeedType = UserSettings.Instance.get("ApplicationDisplayMode"); diff --git a/ConfigurationPage/CloudSettings/CloudSettingsView.cs b/ConfigurationPage/CloudSettings/CloudSettingsView.cs index 0f37a748e..b88c43967 100644 --- a/ConfigurationPage/CloudSettings/CloudSettingsView.cs +++ b/ConfigurationPage/CloudSettings/CloudSettingsView.cs @@ -209,7 +209,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage configureNotificationSettingsButton.VAnchor = VAnchor.ParentCenter; configureNotificationSettingsButton.Click += new ButtonBase.ButtonEventHandler(configureNotificationSettingsButton_Click); - notificationSettingsLabel = new TextWidget("Notification Settings"); + notificationSettingsLabel = new TextWidget(LocalizedString.Get("Notification Settings")); notificationSettingsLabel.AutoExpandBoundsToText = true; notificationSettingsLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; notificationSettingsLabel.VAnchor = VAnchor.ParentCenter; diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index f69edb7f0..714df5d2d 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -28,12 +28,12 @@ namespace MatterHackers.MatterControl bool partIsGCode = false; string documentsPath; - public ExportPrintItemWindow(PrintItemWrapper printItemWraper) + public ExportPrintItemWindow(PrintItemWrapper printItemWrapper) : base(400, 250) { - this.printItemWrapper = printItemWraper; + this.printItemWrapper = printItemWrapper; documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal); - if (Path.GetExtension(printItemWraper.FileLocation).ToUpper() == ".GCODE") + if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == ".GCODE") { partIsGCode = true; } diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs index b79018baf..8996735de 100644 --- a/PartPreviewWindow/View3DTransfromPart.cs +++ b/PartPreviewWindow/View3DTransfromPart.cs @@ -60,6 +60,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public class View3DTransformPart : PartPreview3DWidget { public WindowType windowType { get; set; } + public PrintItemWrapper PrintItemWrapper { + get { return this.printItemWrapper; } + } FlowLayoutWidget viewOptionContainer; FlowLayoutWidget rotateOptionContainer; @@ -87,9 +90,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow FlowLayoutWidget saveButtons; Button applyScaleButton; +<<<<<<< HEAD PrintItemWrapper printItemWrapper; bool saveAsWindowIsOpen = false; SaveAsWindow saveAsWindow; +======= + PrintItemWrapper printItemWrapper; + bool saveAsWindowIsOpen = false; + SaveAsWindow saveAsWindow; + ExportPrintItemWindow exportingWindow; + bool exportingWindowIsOpen = false; +>>>>>>> Greg/development List asynchMeshGroupsList = new List(); List asynchMeshGroupTransforms = new List(); @@ -343,7 +354,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow EnterEditAndCreateSelectionData(); }; + Button exportButton = textImageButtonFactory.Generate(LocalizedString.Get("Export")); + exportButton.Margin = new BorderDouble(right: 10); + exportButton.Click += (sender, e) => + { + UiThread.RunOnIdle((state) => + { + OpenExportWindow(); + + }); + + }; + enterEditButtonsContainer.AddChild(enterEdittingButton); + enterEditButtonsContainer.AddChild(exportButton); } editToolBar.AddChild(enterEditButtonsContainer); @@ -495,6 +519,29 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } + private void OpenExportWindow() + { + if (exportingWindowIsOpen == false) + { + exportingWindow = new ExportPrintItemWindow(this.PrintItemWrapper);// + this.exportingWindowIsOpen = true; + exportingWindow.Closed += new EventHandler(ExportQueueItemWindow_Closed); + exportingWindow.ShowAsSystemWindow(); + } + else + { + if (exportingWindow != null) + { + exportingWindow.BringToFront(); + } + } + } + + void ExportQueueItemWindow_Closed(object sender, EventArgs e) + { + this.exportingWindowIsOpen = false; + } + public void ThemeChanged(object sender, EventArgs e) { processingProgressControl.fillColor = ActiveTheme.Instance.PrimaryAccentColor; diff --git a/PrintQueue/OptionsMenu/QueueOptionsMenu.cs b/PrintQueue/OptionsMenu/QueueOptionsMenu.cs index e444f50a9..b5da01497 100644 --- a/PrintQueue/OptionsMenu/QueueOptionsMenu.cs +++ b/PrintQueue/OptionsMenu/QueueOptionsMenu.cs @@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.PrintQueue void SetMenuItems() { menuItems = new TupleList>(); - menuItems.Add(new Tuple>("Design", null)); + menuItems.Add(new Tuple>(LocalizedString.Get("Design"), null)); menuItems.Add(new Tuple>(LocalizedString.Get(" Import from Zip"), importQueueFromZipMenu_Click)); menuItems.Add(new Tuple>(LocalizedString.Get(" Export to Zip"), exportQueueToZipMenu_Click)); menuItems.Add(new Tuple>("GCode", null)); diff --git a/PrinterControls/TemperatureIndicator.cs b/PrinterControls/TemperatureIndicator.cs index 08f835fd8..f02defcb9 100644 --- a/PrinterControls/TemperatureIndicator.cs +++ b/PrinterControls/TemperatureIndicator.cs @@ -254,7 +254,7 @@ namespace MatterHackers.MatterControl this.textImageButtonFactory.FixedWidth = 76* TextWidget.GlobalPointSizeScaleRatio; { - Button tempButton = textImageButtonFactory.Generate(LocalizedString.Get("PREHEAT")); + Button tempButton = textImageButtonFactory.Generate("Preheat".Localize().ToUpper()); tempButton.Margin = new BorderDouble(right: 5)* TextWidget.GlobalPointSizeScaleRatio; presetsContainer.AddChild(tempButton); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 253566858..eb1538ee0 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -2666,3 +2666,39 @@ Translated:Creating Edit Data English:Finding Meshes Translated:Finding Meshes +English:Preheat +Translated:Preheat + +English:Extruder Temperature Override +Translated:Extruder Temperature Override + +English:Bed Temperature Override +Translated:Bed Temperature Override + +English:Hardware Settings +Translated:Hardware Settings + +English:Cloud Settings +Translated:Cloud Settings + +English:Application Settings +Translated:Application Settings + +English:Update Notification Feed +Translated:Update Notification Feed + +English:Pre-Release +Translated:Pre-Release + +English:Development +Translated:Development + +English:Language Options +Translated:Language Options + +English:Change Display Mode +Translated:Change Display Mode + +English:Theme/Display Options +Translated:Theme/Display Options +