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

Merge pull request #1555 from larsbrubaker/1.6.0

Browse source 
Change wording to 'Restore Settings'
This commit is contained in:
Lars Brubaker 2016-10-28 18:41:17 -07:00 • committed by GitHub
commit 7e467ef5ef
5 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SetupWizard/PrinterProfileHistoryPage.cs
View file

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

2
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -398,7 +398,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private static async Task<PrinterSettings> 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

4
SlicerConfiguration/SliceSettingsDetailControl.cs
View file

@ -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>("ExportSettingsPage", "Export Settings"); };
MenuItem settingsHistory = sliceOptionsMenuDropList.AddItem("Settings History".Localize());
settingsHistory.Selected += (s, e) => { WizardWindow.Show<PrinterProfileHistoryPage>("PrinterProfileHistory", "Settings History"); };
MenuItem settingsHistory = sliceOptionsMenuDropList.AddItem("Restore Settings".Localize());
settingsHistory.Selected += (s, e) => { WizardWindow.Show<PrinterProfileHistoryPage>("PrinterProfileHistory", "Restore Settings"); };
settingsHistory.Enabled = !string.IsNullOrEmpty(AuthenticationData.Instance.ActiveSessionUsername);

3
StaticData/Translations/Master.txt
View file

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

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c4fa69caa0e1072825017aa64e88f5d348df73fc
Subproject commit 8fe553169aba90b23c704088a7ba9f11178eb8a4