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

Remove named methods from WizardWindow, switch to ChangeToPanel<T>

Browse source
This commit is contained in:
John Lewin 2016-06-07 17:23:41 -07:00
parent 6d827a238a
commit 3352c63635
9 changed files with 36 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
connectButton.Click += ConnectButton_Click;
refreshButton = textImageButtonFactory.Generate("Refresh".Localize());
refreshButton.Click += (s, e) => WizardWindow.ChangeToSetupComPortManual();
refreshButton.Click += (s, e) => WizardWindow.ChangeToPanel<SetupStepComPortManual>();
//Add buttons to buttonContainer
footerRow.AddChild(nextButton);

4
PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -17,7 +17,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
//Construct buttons
nextButton = textImageButtonFactory.Generate("Continue".Localize());
nextButton.Click += (s, e) => WizardWindow.ChangeToSetupCompPortTwo();
nextButton.Click += (s, e) => WizardWindow.ChangeToPanel<SetupStepComPortTwo>();
//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.ChangeToSetupComPortManual();
manualLink.Click += (s, e) => WizardWindow.ChangeToPanel<SetupStepComPortManual>();
string printerMessageFourText = LocalizedString.Get("or");
TextWidget printerMessageFour = new TextWidget(printerMessageFourText, 0, 0, 10);

2
PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -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.ChangeToSetupComPortManual();
manualLink.Click += (s, e) => WizardWindow.ChangeToPanel<SetupStepComPortManual>();
printerErrorMessage = new TextWidget("", 0, 0, 10);
printerErrorMessage.AutoExpandBoundsToText = true;

4
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -84,9 +84,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
if (canContinue)
{
#if __ANDROID__
WizardWindow.ChangeToConnectForm();
WizardWindow.ChangeToPanel<SetupWizardConnect>();
#else
WizardWindow.ChangeToInstallDriver();
WizardWindow.ChangeToPanel<SetupStepInstallDriver>();
#endif
}
};

2
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
nextButton.Name = "Connection Wizard Skip Sign In Button";
nextButton.Click += (sender, e) =>
{
WizardWindow.ChangeToAddPrinter();
WizardWindow.ChangeToPanel<SetupStepMakeModelName>();
};
var signInButton = textImageButtonFactory.Generate("Sign In");