diff --git a/MatterControl.csproj b/MatterControl.csproj index 8f0614b65..f56cc312c 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -246,8 +246,8 @@ - - + + @@ -336,7 +336,7 @@ - + diff --git a/PrinterControls/PrinterConnections/ConnectionWizardPanel.cs b/PrinterControls/PrinterConnections/ConnectionWizardPage.cs similarity index 93% rename from PrinterControls/PrinterConnections/ConnectionWizardPanel.cs rename to PrinterControls/PrinterConnections/ConnectionWizardPage.cs index 754b16cf3..8b7a8a999 100644 --- a/PrinterControls/PrinterConnections/ConnectionWizardPanel.cs +++ b/PrinterControls/PrinterConnections/ConnectionWizardPage.cs @@ -8,11 +8,11 @@ using System; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class ConnectionWizardPanel : WizardPanel + public class ConnectionWizardPage : WizardPage { private PrinterInfo activePrinter; - public ConnectionWizardPanel() : base("Cancel") + public ConnectionWizardPage() : base("Cancel") { cancelButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.HaltConnectionThread(); } diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs index 2e72d5ca5..33935ecd3 100644 --- a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs +++ b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class SetupStepBaudRate : ConnectionWizardPanel + public class SetupStepBaudRate : ConnectionWizardPage { private List BaudRateButtonsList = new List(); private FlowLayoutWidget printerBaudRateContainer; diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs index de826bc8b..83295cbe0 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class SetupStepComPortManual : ConnectionWizardPanel + public class SetupStepComPortManual : ConnectionWizardPage { private static Regex linuxDefaultUIFilter = new Regex("/dev/ttyS*\\d+", RegexOptions.CultureInvariant | RegexOptions.Compiled); @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections connectButton.Click += ConnectButton_Click; refreshButton = textImageButtonFactory.Generate("Refresh".Localize()); - refreshButton.Click += (s, e) => WizardWindow.ChangeToPanel(); + refreshButton.Click += (s, e) => WizardWindow.ChangeToPage(); //Add buttons to buttonContainer footerRow.AddChild(nextButton); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortOne.cs b/PrinterControls/PrinterConnections/SetupStepComPortOne.cs index 69f58d759..bd4fafc55 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortOne.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortOne.cs @@ -7,7 +7,7 @@ using System; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class SetupStepComPortOne : ConnectionWizardPanel + public class SetupStepComPortOne : ConnectionWizardPage { private Button nextButton; @@ -17,7 +17,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { //Construct buttons nextButton = textImageButtonFactory.Generate("Continue".Localize()); - nextButton.Click += (s, e) => WizardWindow.ChangeToPanel(); + nextButton.Click += (s, e) => WizardWindow.ChangeToPage(); //Add buttons to buttonContainer footerRow.AddChild(nextButton); @@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections Button manualLink = linkButtonFactory.Generate(LocalizedString.Get("Manually Configure Connection")); manualLink.Margin = new BorderDouble(0, 5); - manualLink.Click += (s, e) => WizardWindow.ChangeToPanel(); + manualLink.Click += (s, e) => WizardWindow.ChangeToPage(); string printerMessageFourText = LocalizedString.Get("or"); TextWidget printerMessageFour = new TextWidget(printerMessageFourText, 0, 0, 10); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs index 87d32db21..c0142edf4 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs @@ -10,7 +10,7 @@ using System.Linq; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class SetupStepComPortTwo : ConnectionWizardPanel + public class SetupStepComPortTwo : ConnectionWizardPage { private string[] startingPortNames; private string[] currentPortNames; @@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections Button manualLink = linkButtonFactory.Generate("Manual Configuration".Localize()); manualLink.Margin = new BorderDouble(0, 5); - manualLink.Click += (s, e) => WizardWindow.ChangeToPanel(); + manualLink.Click += (s, e) => WizardWindow.ChangeToPage(); printerErrorMessage = new TextWidget("", 0, 0, 10); printerErrorMessage.AutoExpandBoundsToText = true; diff --git a/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs b/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs index 258750c7c..cca3668f2 100644 --- a/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs +++ b/PrinterControls/PrinterConnections/SetupStepInstallDriver.cs @@ -11,7 +11,7 @@ using System.IO; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class SetupStepInstallDriver : ConnectionWizardPanel + public class SetupStepInstallDriver : ConnectionWizardPage { private FlowLayoutWidget printerDriverContainer; private TextWidget printerDriverMessage; diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs index f1db4353d..4f1695828 100644 --- a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs +++ b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs @@ -14,7 +14,7 @@ using System.IO; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { //Normally step one of the setup process - public class SetupStepMakeModelName : ConnectionWizardPanel + public class SetupStepMakeModelName : ConnectionWizardPage { private FlowLayoutWidget printerModelContainer; private FlowLayoutWidget printerMakeContainer; @@ -84,9 +84,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections if (canContinue) { #if __ANDROID__ - WizardWindow.ChangeToPanel(); + WizardWindow.ChangeToPage(); #else - WizardWindow.ChangeToPanel(); + WizardWindow.ChangeToPage(); #endif } }; diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/PrinterControls/PrinterConnections/ShowAuthPanel.cs index 435431550..3eab0ca37 100644 --- a/PrinterControls/PrinterConnections/ShowAuthPanel.cs +++ b/PrinterControls/PrinterConnections/ShowAuthPanel.cs @@ -32,7 +32,7 @@ using MatterHackers.MatterControl.CustomWidgets; namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { - public class ShowAuthPanel : ConnectionWizardPanel + public class ShowAuthPanel : ConnectionWizardPage { public ShowAuthPanel() { @@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections nextButton.Name = "Connection Wizard Skip Sign In Button"; nextButton.Click += (sender, e) => { - WizardWindow.ChangeToPanel(); + WizardWindow.ChangeToPage(); }; var signInButton = textImageButtonFactory.Generate("Sign In"); diff --git a/SetupWizard/AndroidConnectDevicePanel.cs b/SetupWizard/AndroidConnectDevicePage.cs similarity index 98% rename from SetupWizard/AndroidConnectDevicePanel.cs rename to SetupWizard/AndroidConnectDevicePage.cs index d7e493649..58b690814 100644 --- a/SetupWizard/AndroidConnectDevicePanel.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -37,7 +37,7 @@ using MatterHackers.MatterControl.PrinterCommunication; namespace MatterHackers.MatterControl { - public class AndroidConnectDevicePanel : WizardPanel + public class AndroidConnectDevicePage : WizardPage { private event EventHandler unregisterEvents; @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl private FlowLayoutWidget retryButtonContainer; private FlowLayoutWidget connectButtonContainer; - public AndroidConnectDevicePanel() + public AndroidConnectDevicePage() { TextWidget printerNameLabel = new TextWidget("Connect Your Device".Localize() + ":", 0, 0, labelFontSize) { @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl //Construct buttons troubleshootButton = whiteImageButtonFactory.Generate("Troubleshoot".Localize(), centerText:true); - troubleshootButton.Click += (s, e) => WizardWindow.ChangeToPanel(); + troubleshootButton.Click += (s, e) => WizardWindow.ChangeToPage(); retryButtonContainer = new FlowLayoutWidget() { diff --git a/SetupWizard/SetupWizardHome.cs b/SetupWizard/SetupWizardHome.cs index a984b1705..6f496860e 100644 --- a/SetupWizard/SetupWizardHome.cs +++ b/SetupWizard/SetupWizardHome.cs @@ -19,17 +19,17 @@ using MatterHackers.MatterControl.SlicerConfiguration; namespace MatterHackers.MatterControl { //Normally step one of the setup process - public class SetupWizardHome : WizardPanel + public class SetupWizardHome : WizardPage { public SetupWizardHome() - : base(unlocalizedTextForCancelButton: "Done") + : base("Done") { headerLabel.Text = "Setup Options".Localize(); textImageButtonFactory.borderWidth = 1; textImageButtonFactory.normalBorderColor = RGBA_Bytes.White; - contentRow.AddChild(new SetupPrinterView(this.textImageButtonFactory) { WizardPanel = this }); + contentRow.AddChild(new SetupPrinterView(this.textImageButtonFactory) { WizardPage = this }); contentRow.AddChild(new SetupAccountView(this.textImageButtonFactory)); contentRow.AddChild(new EnterCodesView(this.textImageButtonFactory)); @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl public class SetupPrinterView : SetupViewBase { - internal WizardPanel WizardPanel { get; set; } + internal WizardPage WizardPage { get; set; } private Button disconnectButton; private TextWidget connectionStatus; @@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl buttonContainer.AddChild(printerSelectorAndEditButton); var printerSelector = new PrinterSelector(); - printerSelector.AddPrinter += (s, e) => WizardPanel.WizardWindow.ChangeToSetupPrinterForm(); + printerSelector.AddPrinter += (s, e) => WizardPage.WizardWindow.ChangeToSetupPrinterForm(); printerSelectorAndEditButton.AddChild(printerSelector); var editButton = TextImageButtonFactory.GetThemedEditButton(); @@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl disconnectButton.Click += (sender, e) => { PrinterConnectionAndCommunication.Instance.Disable(); - WizardPanel.WizardWindow.ChangeToPanel(); + WizardPage.WizardWindow.ChangeToPage(); }; buttonContainer.AddChild(disconnectButton); diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/SetupWizard/SetupWizardTroubleshooting.cs index 60906f8b8..0477a0647 100644 --- a/SetupWizard/SetupWizardTroubleshooting.cs +++ b/SetupWizard/SetupWizardTroubleshooting.cs @@ -20,7 +20,7 @@ using Android.Content; namespace MatterHackers.MatterControl { - public class SetupWizardTroubleshooting : WizardPanel + public class SetupWizardTroubleshooting : WizardPage { private Button nextButton; @@ -44,7 +44,7 @@ namespace MatterHackers.MatterControl //Construct buttons cancelButton = whiteImageButtonFactory.Generate("Cancel".Localize(), centerText:true); - cancelButton.Click += (s, e) => this.WizardWindow.ChangeToPanel(); + cancelButton.Click += (s, e) => this.WizardWindow.ChangeToPage(); //Construct buttons nextButton = textImageButtonFactory.Generate("Continue".Localize()); diff --git a/SetupWizard/SetupWizardWifi.cs b/SetupWizard/SetupWizardWifi.cs index f560a4a9b..50be0294b 100644 --- a/SetupWizard/SetupWizardWifi.cs +++ b/SetupWizard/SetupWizardWifi.cs @@ -35,7 +35,7 @@ using MatterHackers.MatterControl.CustomWidgets; namespace MatterHackers.MatterControl { //Normally step one of the setup process - public class SetupWizardWifi : WizardPanel + public class SetupWizardWifi : WizardPage { public SetupWizardWifi() { diff --git a/SetupWizard/WizardPanel.cs b/SetupWizard/WizardPage.cs similarity index 96% rename from SetupWizard/WizardPanel.cs rename to SetupWizard/WizardPage.cs index add351bce..9ba752c7f 100644 --- a/SetupWizard/WizardPanel.cs +++ b/SetupWizard/WizardPage.cs @@ -5,7 +5,7 @@ using MatterHackers.Localizations; namespace MatterHackers.MatterControl { - public class WizardPanel : GuiWidget + public class WizardPage : GuiWidget { protected FlowLayoutWidget headerRow; protected FlowLayoutWidget contentRow; @@ -25,7 +25,7 @@ namespace MatterHackers.MatterControl protected GuiWidget mainContainer; - public WizardPanel(string unlocalizedTextForCancelButton = "Cancel", TextImageButtonFactory textButtonFactory = null) + public WizardPage(string unlocalizedTextForCancelButton = "Cancel", TextImageButtonFactory textButtonFactory = null) { whiteImageButtonFactory = new TextImageButtonFactory() { diff --git a/SetupWizard/WizardWindow.cs b/SetupWizard/WizardWindow.cs index 8c065b187..448d55030 100644 --- a/SetupWizard/WizardWindow.cs +++ b/SetupWizard/WizardWindow.cs @@ -24,7 +24,7 @@ namespace MatterHackers.MatterControl if (openToHome) { - ChangeToPanel(); + ChangeToPage(); } else { @@ -32,7 +32,7 @@ namespace MatterHackers.MatterControl bool WifiDetected = MatterControlApplication.Instance.IsNetworkConnected(); if (!WifiDetected) { - ChangeToPanel(); + ChangeToPage(); } else { @@ -64,11 +64,11 @@ namespace MatterHackers.MatterControl bool showAuthPanel = ShouldShowAuthPanel?.Invoke() ?? false; if (showAuthPanel) { - ChangeToPanel(); + ChangeToPage(); } else { - ChangeToPanel(); + ChangeToPage(); } } @@ -76,11 +76,11 @@ namespace MatterHackers.MatterControl { if (ActiveSliceSettings.Instance.PrinterDrivers().Count > 0) { - ChangeToPanel(); + ChangeToPage(); } else { - ChangeToPanel(); + ChangeToPage(); } } @@ -88,15 +88,15 @@ namespace MatterHackers.MatterControl { if (string.IsNullOrEmpty(PrinterConnectionAndCommunication.Instance?.ActivePrinter?.BaudRate())) { - ChangeToPanel(); + ChangeToPage(); } else { - ChangeToPanel(); + ChangeToPage(); } } - internal void ChangeToPanel() where PanelType : WizardPanel, new() + internal void ChangeToPage() where PanelType : WizardPage, new() { UiThread.RunOnIdle(() => {