From 7a243ce407e552533825857ed95316763086e19f Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 19 Jun 2018 15:02:25 -0700 Subject: [PATCH] Rename WizardWindow to DialogWindow --- AboutPage/AboutPage.cs | 2 +- ConfigurationPage/PrintLeveling/LevelingWizardPage.cs | 4 ++-- ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs | 2 +- .../PrintLeveling/WizardPages/FindBedHeight.cs | 4 ++-- .../PrintLeveling/WizardPages/WaitForTempPage.cs | 4 ++-- ControlElements/StyledMessageBoxWindow.cs | 2 +- EeProm/EePromRepetierWindow.cs | 4 ++-- PartPreviewWindow/LibraryBrowserPage.cs | 2 +- PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs | 4 ++-- PrinterControls/EditLevelingSettingsPage.cs | 2 +- PrinterControls/MacroDetailPage.cs | 4 ++-- PrinterControls/MacroListPage.cs | 4 ++-- PrinterControls/PrinterConnections/SetupStepBaudRate.cs | 2 +- .../PrinterConnections/SetupStepComPortManual.cs | 2 +- PrinterControls/PrinterConnections/SetupStepComPortOne.cs | 4 ++-- PrinterControls/PrinterConnections/SetupStepComPortTwo.cs | 2 +- .../PrinterConnections/SetupStepMakeModelName.cs | 2 +- PrinterControls/PrinterConnections/ShowAuthPanel.cs | 6 +++--- SetupWizard/AndroidConnectDevicePage.cs | 4 ++-- SetupWizard/CopyGuestProfilesToUser.cs | 2 +- SetupWizard/DialogPage.cs | 6 +++--- SetupWizard/DialogWindow.cs | 6 +++--- SetupWizard/ImportSettingsPage.cs | 4 ++-- SetupWizard/InputBoxPage.cs | 2 +- SetupWizard/LicenseAgreementPage.cs | 2 +- SetupWizard/PrinterProfileHistoryPage.cs | 2 +- SetupWizard/SetupWizardTroubleshooting.cs | 4 ++-- SetupWizard/SetupWizardWifi.cs | 2 +- SetupWizard/SyncingPrintersPage.cs | 6 +++--- SlicerConfiguration/PresetSelectorWidget.cs | 4 ++-- .../SlicePresetsWindow/SlicePresetsWindow.cs | 4 ++-- 31 files changed, 52 insertions(+), 52 deletions(-) diff --git a/AboutPage/AboutPage.cs b/AboutPage/AboutPage.cs index 6303b70e2..a124a99bc 100644 --- a/AboutPage/AboutPage.cs +++ b/AboutPage/AboutPage.cs @@ -177,7 +177,7 @@ namespace MatterHackers.MatterControl }; feedbackButton.Click += (s, e) => UiThread.RunOnIdle(() => { - this.WizardWindow.ChangeToPage(); + this.DialogWindow.ChangeToPage(); }); this.AddPageAction(feedbackButton); diff --git a/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs b/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs index 3b8caf563..bcbc99131 100644 --- a/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs +++ b/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl }; nextButton.Click += (s, e) => { - wizardContext.ShowNextPage(this.WizardWindow); + wizardContext.ShowNextPage(this.DialogWindow); }; this.AddPageAction(nextButton); @@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl doneButton.Click += (s, e) => { - this.WizardWindow.CloseOnIdle(); + this.DialogWindow.CloseOnIdle(); }; this.AddPageAction(doneButton); diff --git a/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs b/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs index 332d24761..631e3575f 100644 --- a/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs +++ b/ConfigurationPage/PrintLeveling/LevelingWizardRootPage.cs @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public override void OnLoad(EventArgs args) { - levelingContext.ShowNextPage(this.WizardWindow); + levelingContext.ShowNextPage(this.DialogWindow); base.OnLoad(args); } } diff --git a/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs b/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs index fe5f7ccdf..f0f66e7d3 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs @@ -102,13 +102,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public override void OnLoad(EventArgs args) { - this.WizardWindow.KeyDown += TopWindowKeyDown; + this.DialogWindow.KeyDown += TopWindowKeyDown; base.OnLoad(args); } public override void OnClosed(ClosedEventArgs e) { - this.WizardWindow.KeyDown -= TopWindowKeyDown; + this.DialogWindow.KeyDown -= TopWindowKeyDown; base.OnClosed(e); } diff --git a/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs b/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs index e493d7811..c2295ea89 100644 --- a/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs +++ b/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs @@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public override void OnLoad(EventArgs args) { // hook our parent so we can turn off the bed when we are done with leveling - this.WizardWindow.Closed += WizardWindow_Closed; + this.DialogWindow.Closed += WizardWindow_Closed; base.OnLoad(args); } @@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling { // Make sure when the wizard closes we turn off the bed heating printer.Connection.TurnOffBedAndExtruders(TurnOff.AfterDelay); - this.WizardWindow.Closed -= WizardWindow_Closed; + this.DialogWindow.Closed -= WizardWindow_Closed; } public override void PageIsBecomingActive() diff --git a/ControlElements/StyledMessageBoxWindow.cs b/ControlElements/StyledMessageBoxWindow.cs index e22aa37c0..62f88a103 100644 --- a/ControlElements/StyledMessageBoxWindow.cs +++ b/ControlElements/StyledMessageBoxWindow.cs @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl var affirmativeButton = theme.CreateDialogButton(yesOk); affirmativeButton.Click += (s, e) => { - UiThread.RunOnIdle(this.WizardWindow.Close); + UiThread.RunOnIdle(this.DialogWindow.Close); // If applicable, invoke the callback responseCallback?.Invoke(true); diff --git a/EeProm/EePromRepetierWindow.cs b/EeProm/EePromRepetierWindow.cs index c81e50892..94ee82e26 100644 --- a/EeProm/EePromRepetierWindow.cs +++ b/EeProm/EePromRepetierWindow.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl.EeProm { if(!printer.Connection.IsConnected) { - this.WizardWindow.CloseOnIdle(); + this.DialogWindow.CloseOnIdle(); } }, ref unregisterEvents); } @@ -177,7 +177,7 @@ namespace MatterHackers.MatterControl.EeProm { currentEePromSettings.Save(printer.Connection); currentEePromSettings.Clear(); - this.WizardWindow.Close(); + this.DialogWindow.Close(); }); }; this.AddPageAction(buttonSave); diff --git a/PartPreviewWindow/LibraryBrowserPage.cs b/PartPreviewWindow/LibraryBrowserPage.cs index 5761469db..e8fa8ae8a 100644 --- a/PartPreviewWindow/LibraryBrowserPage.cs +++ b/PartPreviewWindow/LibraryBrowserPage.cs @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl writableContainer); } - this.WizardWindow.CloseOnIdle(); + this.DialogWindow.CloseOnIdle(); }; this.AddPageAction(acceptButton); diff --git a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index d38712ee1..7865850f2 100644 --- a/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -337,7 +337,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow case FirmwareTypes.Repetier: if (repetierEEPromPage != null) { - repetierEEPromPage.WizardWindow.BringToFront(); + repetierEEPromPage.DialogWindow.BringToFront(); } else { @@ -354,7 +354,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow case FirmwareTypes.Marlin: if (marlinEEPromPage != null) { - marlinEEPromPage.WizardWindow.BringToFront(); + marlinEEPromPage.DialogWindow.BringToFront(); } else { diff --git a/PrinterControls/EditLevelingSettingsPage.cs b/PrinterControls/EditLevelingSettingsPage.cs index 5321587e4..2b410ae8a 100644 --- a/PrinterControls/EditLevelingSettingsPage.cs +++ b/PrinterControls/EditLevelingSettingsPage.cs @@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl } printer.Settings.Helpers.SetPrintLevelingData(newLevelingData, false); - this.WizardWindow.Close(); + this.DialogWindow.Close(); }); }; diff --git a/PrinterControls/MacroDetailPage.cs b/PrinterControls/MacroDetailPage.cs index 9667f0cb5..1198fb3cd 100644 --- a/PrinterControls/MacroDetailPage.cs +++ b/PrinterControls/MacroDetailPage.cs @@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl printerSettings.Save(); } - this.WizardWindow.ChangeToPage(new MacroListPage(printerSettings)); + this.DialogWindow.ChangeToPage(new MacroListPage(printerSettings)); } }); }; @@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl protected override void OnCancel(out bool abortCancel) { abortCancel = true; - this.WizardWindow.ChangeToPage(new MacroListPage(printerSettings)); + this.DialogWindow.ChangeToPage(new MacroListPage(printerSettings)); } private bool ValidateMacroForm() diff --git a/PrinterControls/MacroListPage.cs b/PrinterControls/MacroListPage.cs index 3e036a6b8..3c56609f5 100644 --- a/PrinterControls/MacroListPage.cs +++ b/PrinterControls/MacroListPage.cs @@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl addMacroButton.ToolTipText = "Add a new Macro".Localize(); addMacroButton.Click += (s, e) => { - this.WizardWindow.ChangeToPage( + this.DialogWindow.ChangeToPage( new MacroDetailPage( new GCodeMacro() { @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl editLink.Margin = new BorderDouble(right: 5); editLink.Click += (s, e) => { - this.WizardWindow.ChangeToPage( + this.DialogWindow.ChangeToPage( new MacroDetailPage(localMacroReference, printerSettings)); }; macroRow.AddChild(editLink); diff --git a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs index 5fe6fc259..f58bd829a 100644 --- a/PrinterControls/PrinterConnections/SetupStepBaudRate.cs +++ b/PrinterControls/PrinterConnections/SetupStepBaudRate.cs @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { UiThread.RunOnIdle(() => { - this.WizardWindow.ChangeToPage(new SetupStepComPortOne(printer)); + this.DialogWindow.ChangeToPage(new SetupStepComPortOne(printer)); }); } }; diff --git a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs index 169b99189..7dbc57835 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortManual.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortManual.cs @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections refreshButton = theme.CreateDialogButton("Refresh".Localize()); refreshButton.Click += (s, e) => UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(new SetupStepComPortManual(printer)); + DialogWindow.ChangeToPage(new SetupStepComPortManual(printer)); }); this.AddPageAction(nextButton); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortOne.cs b/PrinterControls/PrinterConnections/SetupStepComPortOne.cs index 745e8b572..b80aa07a5 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortOne.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortOne.cs @@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections manualLink.Margin = new BorderDouble(0, 5); manualLink.Click += (s, e) => UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(new SetupStepComPortManual(printer)); + DialogWindow.ChangeToPage(new SetupStepComPortManual(printer)); }); container.AddChild(manualLink); @@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections var nextButton = theme.CreateDialogButton("Continue".Localize()); nextButton.Click += (s, e) => UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(new SetupStepComPortTwo(printer)); + DialogWindow.ChangeToPage(new SetupStepComPortTwo(printer)); }); this.AddPageAction(nextButton); diff --git a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs index 0b0ac4fb1..b1957f625 100644 --- a/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs +++ b/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs @@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections manualLink.Margin = new BorderDouble(0, 5); manualLink.Click += (s, e) => UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(new SetupStepComPortManual(printer)); + DialogWindow.ChangeToPage(new SetupStepComPortManual(printer)); }); printerErrorMessage = new TextWidget("", 0, 0, 10) diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs index a8a281fa7..ccaccc0ba 100644 --- a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs +++ b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs @@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections #else UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(new SetupStepComPortOne(printer)); + DialogWindow.ChangeToPage(new SetupStepComPortOne(printer)); }); #endif } diff --git a/PrinterControls/PrinterConnections/ShowAuthPanel.cs b/PrinterControls/PrinterConnections/ShowAuthPanel.cs index 8d8c9dd2c..34057f285 100644 --- a/PrinterControls/PrinterConnections/ShowAuthPanel.cs +++ b/PrinterControls/PrinterConnections/ShowAuthPanel.cs @@ -79,7 +79,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { UiThread.RunOnIdle(() => { - WizardWindow.Close(); + DialogWindow.Close(); PrinterSetup.ChangeToAccountCreate(); }); }; @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections { UiThread.RunOnIdle(() => { - WizardWindow.Close(); + DialogWindow.Close(); PrinterSetup.ShowAuthDialog?.Invoke(); }); }; @@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(); + DialogWindow.ChangeToPage(); }); } diff --git a/SetupWizard/AndroidConnectDevicePage.cs b/SetupWizard/AndroidConnectDevicePage.cs index 61fa6b261..c4ff49d9c 100644 --- a/SetupWizard/AndroidConnectDevicePage.cs +++ b/SetupWizard/AndroidConnectDevicePage.cs @@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl troubleshootButton = theme.WhiteButtonFactory.Generate("Troubleshoot".Localize()); troubleshootButton.Click += (s, e) => UiThread.RunOnIdle(() => { - WizardWindow.ChangeToPage(); + DialogWindow.ChangeToPage(); }); retryButtonContainer = new FlowLayoutWidget() @@ -150,7 +150,7 @@ namespace MatterHackers.MatterControl this.generalError.Text = "Please wait..."; this.generalError.Visible = true; nextButton.Visible = false; - UiThread.RunOnIdle(this.WizardWindow.Close); + UiThread.RunOnIdle(this.DialogWindow.Close); } private void communicationStateChanged(object sender, EventArgs args) diff --git a/SetupWizard/CopyGuestProfilesToUser.cs b/SetupWizard/CopyGuestProfilesToUser.cs index c150bc83f..37d309b93 100644 --- a/SetupWizard/CopyGuestProfilesToUser.cs +++ b/SetupWizard/CopyGuestProfilesToUser.cs @@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl // Close the window and update the PrintersImported flag UiThread.RunOnIdle(() => { - WizardWindow.Close(); + DialogWindow.Close(); ProfileManager.Instance.PrintersImported = true; ProfileManager.Instance.Save(); diff --git a/SetupWizard/DialogPage.cs b/SetupWizard/DialogPage.cs index 4eff02d65..a43756dee 100644 --- a/SetupWizard/DialogPage.cs +++ b/SetupWizard/DialogPage.cs @@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl #endif } - public DialogWindow WizardWindow { get; set; } + public DialogWindow DialogWindow { get; set; } public string WindowTitle { get; set; } @@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl if (!abortCancel) { - UiThread.RunOnIdle(() => WizardWindow?.Close()); + this.DialogWindow?.CloseOnIdle(); } }; @@ -199,7 +199,7 @@ namespace MatterHackers.MatterControl if (!abortCancel) { - UiThread.RunOnIdle(() => WizardWindow?.Close()); + this.DialogWindow?.CloseOnIdle(); } } }; diff --git a/SetupWizard/DialogWindow.cs b/SetupWizard/DialogWindow.cs index 4de46c811..e2c9c1990 100644 --- a/SetupWizard/DialogWindow.cs +++ b/SetupWizard/DialogWindow.cs @@ -131,7 +131,7 @@ namespace MatterHackers.MatterControl { activePage = pageToChangeTo; - pageToChangeTo.WizardWindow = this; + pageToChangeTo.DialogWindow = this; this.CloseAllChildren(); this.AddChild(pageToChangeTo); this.Invalidate(); @@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl public DialogPage ChangeToPage() where PanelType : DialogPage, new() { PanelType panel = new PanelType(); - panel.WizardWindow = this; + panel.DialogWindow = this; ChangeToPage(panel); // in the event of a reload all make sure we rebuild the contents correctly @@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl // make new content with the possibly changed theme PanelType newPanel = new PanelType(); - newPanel.WizardWindow = this; + newPanel.DialogWindow = this; AddChild(newPanel, thisIndex); panel.CloseOnIdle(); diff --git a/SetupWizard/ImportSettingsPage.cs b/SetupWizard/ImportSettingsPage.cs index 7fd92c97f..78e3fdc6b 100644 --- a/SetupWizard/ImportSettingsPage.cs +++ b/SetupWizard/ImportSettingsPage.cs @@ -202,10 +202,10 @@ namespace MatterHackers.MatterControl string importSettingSuccessMessage = string.Format("You have successfully imported a new {0} setting. You can find '{1}' in your list of {0} settings.".Localize(), sectionName, layerName); - WizardWindow.ChangeToPage( + DialogWindow.ChangeToPage( new ImportSucceeded(importSettingSuccessMessage) { - WizardWindow = this.WizardWindow, + DialogWindow = this.DialogWindow, }); if (destIsMaterial) diff --git a/SetupWizard/InputBoxPage.cs b/SetupWizard/InputBoxPage.cs index 8645b8dbc..1acbcc191 100644 --- a/SetupWizard/InputBoxPage.cs +++ b/SetupWizard/InputBoxPage.cs @@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl if (!string.IsNullOrEmpty(newName)) { action.Invoke(newName); - this.WizardWindow.CloseOnIdle(); + this.DialogWindow.CloseOnIdle(); } }; this.AddPageAction(actionButton); diff --git a/SetupWizard/LicenseAgreementPage.cs b/SetupWizard/LicenseAgreementPage.cs index 4ed882764..c193ad0c6 100644 --- a/SetupWizard/LicenseAgreementPage.cs +++ b/SetupWizard/LicenseAgreementPage.cs @@ -58,7 +58,7 @@ public class LicenseAgreementPage : DialogPage acceptButton.Click += (s, e) => { UserSettings.Instance.set(UserSettingsKey.SoftwareLicenseAccepted, "true"); - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle(DialogWindow.Close); }; acceptButton.Visible = true; diff --git a/SetupWizard/PrinterProfileHistoryPage.cs b/SetupWizard/PrinterProfileHistoryPage.cs index 6f411fa68..bb7a7d576 100644 --- a/SetupWizard/PrinterProfileHistoryPage.cs +++ b/SetupWizard/PrinterProfileHistoryPage.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.SetupWizard ApplicationController.Instance.RefreshActiveInstance(printerSettings); } - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle(DialogWindow.Close); } }; this.AddPageAction(revertButton); diff --git a/SetupWizard/SetupWizardTroubleshooting.cs b/SetupWizard/SetupWizardTroubleshooting.cs index 56cbe4552..f4733fccc 100644 --- a/SetupWizard/SetupWizardTroubleshooting.cs +++ b/SetupWizard/SetupWizardTroubleshooting.cs @@ -45,7 +45,7 @@ namespace MatterHackers.MatterControl RefreshStatus(); nextButton = theme.ButtonFactory.Generate("Continue".Localize()); - nextButton.Click += (sender, e) => UiThread.RunOnIdle(this.WizardWindow.Close); + nextButton.Click += (sender, e) => UiThread.RunOnIdle(this.DialogWindow.Close); nextButton.Visible = false; this.AddPageAction(nextButton); @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl UiThread.RunOnIdle(() => { - this.WizardWindow.ChangeToPage(); + this.DialogWindow.ChangeToPage(); }); } diff --git a/SetupWizard/SetupWizardWifi.cs b/SetupWizard/SetupWizardWifi.cs index 62f0cecba..a7fcb40b9 100644 --- a/SetupWizard/SetupWizardWifi.cs +++ b/SetupWizard/SetupWizardWifi.cs @@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl { UiThread.RunOnIdle(() => { - this.WizardWindow.ChangeToPage(PrinterSetup.GetBestStartPage()); + this.DialogWindow.ChangeToPage(PrinterSetup.GetBestStartPage()); }); } } diff --git a/SetupWizard/SyncingPrintersPage.cs b/SetupWizard/SyncingPrintersPage.cs index 8a8951bb7..c1af76ce9 100644 --- a/SetupWizard/SyncingPrintersPage.cs +++ b/SetupWizard/SyncingPrintersPage.cs @@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl.SetupWizard // Switch to setup wizard if no profiles exist UiThread.RunOnIdle(() => { - this.WizardWindow.ChangeToPage(PrinterSetup.GetBestStartPage()); + this.DialogWindow.ChangeToPage(PrinterSetup.GetBestStartPage()); }); } else if (ProfileManager.Instance.ActiveProfiles.Count() == 1) @@ -46,11 +46,11 @@ namespace MatterHackers.MatterControl.SetupWizard ProfileManager.SwitchToProfile(ProfileManager.Instance.ActiveProfiles.First().ID).ConfigureAwait(false); // only close the window if we are not switching to the setup printer form - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle(DialogWindow.Close); } else // multiple printers - close the window { - UiThread.RunOnIdle(WizardWindow.Close); + UiThread.RunOnIdle(DialogWindow.Close); } }); } diff --git a/SlicerConfiguration/PresetSelectorWidget.cs b/SlicerConfiguration/PresetSelectorWidget.cs index 56ebee953..b9f8d2f9b 100644 --- a/SlicerConfiguration/PresetSelectorWidget.cs +++ b/SlicerConfiguration/PresetSelectorWidget.cs @@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } else { - ApplicationController.Instance.EditMaterialPresetsPage.WizardWindow.BringToFront(); + ApplicationController.Instance.EditMaterialPresetsPage.DialogWindow.BringToFront(); } } @@ -200,7 +200,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } else { - ApplicationController.Instance.EditQualityPresetsWindow.WizardWindow.BringToFront(); + ApplicationController.Instance.EditQualityPresetsWindow.DialogWindow.BringToFront(); } } }; diff --git a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs index 9f0d2c98a..67c8b2d05 100644 --- a/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs +++ b/SlicerConfiguration/SlicePresetsWindow/SlicePresetsWindow.cs @@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration UiThread.RunOnIdle(() => { presetsContext.DeleteLayer(); - this.WizardWindow.Close(); + this.DialogWindow.Close(); }); }; this.AddPageAction(deleteButton); @@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public override void OnLoad(EventArgs args) { - this.WizardWindow.Padding = 0; + this.DialogWindow.Padding = 0; footerRow.Padding = theme.DefaultContainerPadding; footerRow.Margin = 0; footerRow.Border = new BorderDouble(top: 1);