From 6509b8f287ed3fbd99015a75e2964a5d8a6ce008 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 28 Oct 2016 16:31:50 -0700 Subject: [PATCH] Change wording to 'Restore Settings' --- SetupWizard/PrinterProfileHistoryPage.cs | 6 +++--- SlicerConfiguration/Settings/PrinterSettings.cs | 2 +- SlicerConfiguration/SliceSettingsDetailControl.cs | 4 ++-- StaticData/Translations/Master.txt | 3 +++ Submodules/agg-sharp | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/SetupWizard/PrinterProfileHistoryPage.cs b/SetupWizard/PrinterProfileHistoryPage.cs index afe429084..bc6b96dfe 100644 --- a/SetupWizard/PrinterProfileHistoryPage.cs +++ b/SetupWizard/PrinterProfileHistoryPage.cs @@ -19,7 +19,7 @@ namespace MatterHackers.MatterControl.SetupWizard ScrollableWidget scrollWindow; public PrinterProfileHistoryPage() - : base(unlocalizedTextForTitle: "Settings History") + : base(unlocalizedTextForTitle: "Restore Settings") { scrollWindow = new ScrollableWidget() { @@ -31,7 +31,7 @@ namespace MatterHackers.MatterControl.SetupWizard contentRow.FlowDirection = FlowDirection.TopToBottom; contentRow.AddChild(scrollWindow); - var revertButton = textImageButtonFactory.Generate("Revert"); + var revertButton = textImageButtonFactory.Generate("Restore"); footerRow.AddChild(revertButton); footerRow.AddChild(new HorizontalSpacer()); footerRow.AddChild(cancelButton); @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.SetupWizard loadingText.TextColor = ActiveTheme.Instance.PrimaryTextColor; scrollWindow.AddChild(loadingText); - var results = await ApplicationController.GetProfileHistory(ProfileManager.Instance.ActiveProfile.DeviceToken); + var results = await ApplicationController.GetProfileHistory?.Invoke(ProfileManager.Instance.ActiveProfile.DeviceToken); printerProfileData = results; if(printerProfileData != null) { diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/SlicerConfiguration/Settings/PrinterSettings.cs index 6cd4127ae..6ed84ce8d 100644 --- a/SlicerConfiguration/Settings/PrinterSettings.cs +++ b/SlicerConfiguration/Settings/PrinterSettings.cs @@ -398,7 +398,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration private static async Task GetFirstValidHistoryItem(PrinterInfo printerInfo) { - var recentProfileHistoryItems = await ApplicationController.GetProfileHistory(printerInfo.DeviceToken); + var recentProfileHistoryItems = await ApplicationController.GetProfileHistory?.Invoke(printerInfo.DeviceToken); if (recentProfileHistoryItems != null) { // Iterate history, skipping the first item, limiting to the next five, attempt to load and return the first success diff --git a/SlicerConfiguration/SliceSettingsDetailControl.cs b/SlicerConfiguration/SliceSettingsDetailControl.cs index 720cd2c4c..9f51eb546 100644 --- a/SlicerConfiguration/SliceSettingsDetailControl.cs +++ b/SlicerConfiguration/SliceSettingsDetailControl.cs @@ -112,8 +112,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration sliceOptionsMenuDropList.AddItem("Import".Localize()).Selected += (s, e) => { ImportSettingsMenu_Click(); }; sliceOptionsMenuDropList.AddItem("Export".Localize()).Selected += (s, e) => { WizardWindow.Show("ExportSettingsPage", "Export Settings"); }; - MenuItem settingsHistory = sliceOptionsMenuDropList.AddItem("Settings History".Localize()); - settingsHistory.Selected += (s, e) => { WizardWindow.Show("PrinterProfileHistory", "Settings History"); }; + MenuItem settingsHistory = sliceOptionsMenuDropList.AddItem("Restore Settings".Localize()); + settingsHistory.Selected += (s, e) => { WizardWindow.Show("PrinterProfileHistory", "Restore Settings"); }; settingsHistory.Enabled = !string.IsNullOrEmpty(AuthenticationData.Instance.ActiveSessionUsername); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 56ff3e6c2..8fb07073a 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -5542,3 +5542,6 @@ Translated:Detect perimeters that cross over themselves and combine them. English:Merge Overlapping Lines Translated:Merge Overlapping Lines +English:Restore Settings +Translated:Restore Settings + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c4fa69caa..8fe553169 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c4fa69caa0e1072825017aa64e88f5d348df73fc +Subproject commit 8fe553169aba90b23c704088a7ba9f11178eb8a4