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

Continue merge of Android and Desktop panels

Browse source 
- Add ChangeToPanel implementation that takes panel type param
 - Remove WizardPanel constructors that take WizardWindow params
 - Use initializer syntax
 - Remove dead code
 - Remove problematic ReloadAll calls
This commit is contained in:
John Lewin 2016-06-07 15:45:50 -07:00
parent 12c26bd453
commit 6d827a238a
15 changed files with 148 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PrinterControls/PrinterConnections/ConnectionWizardPanel.cs
View file

@ -12,8 +12,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
private PrinterInfo activePrinter;
public ConnectionWizardPanel(WizardWindow wizard)
: base(wizard, "Cancel")
public ConnectionWizardPanel() : base("Cancel")
{
cancelButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
}
@ -51,7 +50,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
settings.SetName(ActivePrinter.Name);
});
UiThread.RunOnIdle(wizardWindow.Close);
UiThread.RunOnIdle(WizardWindow.Close);
}
}
}

4
PrinterControls/PrinterConnections/SetupStepBaudRate.cs
View file

@ -19,7 +19,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private Button printerBaudRateHelpLink;
private TextWidget printerBaudRateHelpMessage;
public SetupStepBaudRate(WizardWindow connectionWizard) : base(connectionWizard)
public SetupStepBaudRate()
{
linkButtonFactory.fontSize = 8;
@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private void MoveToNextWidget()
{
wizardWindow.ChangeToInstallDriverOrComPortOne();
WizardWindow.ChangeToInstallDriverOrComPortOne();
}
private void NextButton_Click(object sender, EventArgs mouseEvent)

6
PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -30,7 +30,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private event EventHandler unregisterEvents;
protected List<SerialPortIndexRadioButton> SerialPortButtonsList = new List<SerialPortIndexRadioButton>();
public SetupStepComPortManual(WizardWindow connectionWizard) : base(connectionWizard)
public SetupStepComPortManual()
{
linkButtonFactory.fontSize = 8;
@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
connectButton.Click += ConnectButton_Click;
refreshButton = textImageButtonFactory.Generate("Refresh".Localize());
refreshButton.Click += (s, e) => connectionWizard.ChangeToSetupComPortManual();
refreshButton.Click += (s, e) => WizardWindow.ChangeToSetupComPortManual();
//Add buttons to buttonContainer
footerRow.AddChild(nextButton);
@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private void MoveToNextWidget(object state)
{
wizardWindow.ChangeToInstallDriverOrComPortOne();
WizardWindow.ChangeToInstallDriverOrComPortOne();
}
private void ConnectButton_Click(object sender, EventArgs mouseEvent)

6
PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -11,13 +11,13 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
private Button nextButton;
public SetupStepComPortOne(WizardWindow connectionWizard) : base(connectionWizard)
public SetupStepComPortOne()
{
contentRow.AddChild(createPrinterConnectionMessageContainer());
{
//Construct buttons
nextButton = textImageButtonFactory.Generate("Continue".Localize());
nextButton.Click += (s, e) => connectionWizard.ChangeToSetupCompPortTwo();
nextButton.Click += (s, e) => WizardWindow.ChangeToSetupCompPortTwo();
//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.ChangeToSetupComPortManual();
string printerMessageFourText = LocalizedString.Get("or");
TextWidget printerMessageFour = new TextWidget(printerMessageFourText, 0, 0, 10);

4
PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -20,7 +20,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private event EventHandler unregisterEvents;
public SetupStepComPortTwo(WizardWindow windowController) : base(windowController)
public SetupStepComPortTwo()
{
startingPortNames = FrostedSerialPort.GetPortNames();
contentRow.AddChild(createPrinterConnectionMessageContainer());
@ -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.ChangeToSetupComPortManual();
printerErrorMessage = new TextWidget("", 0, 0, 10);
printerErrorMessage.AutoExpandBoundsToText = true;

4
PrinterControls/PrinterConnections/SetupStepConfigureConnection.cs
View file

@ -36,7 +36,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
public class SetupStepConfigureConnection : ConnectionWizardPanel
{
public SetupStepConfigureConnection(WizardWindow connectionWizard) : base(connectionWizard)
public SetupStepConfigureConnection()
{
BorderDouble elementMargin = new BorderDouble(top: 5);
@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
//Construct buttons
var nextButton = textImageButtonFactory.Generate("Connect");
nextButton.Click += (s, e) => wizardWindow.ChangeToSetupBaudOrComPortOne();
nextButton.Click += (s, e) => WizardWindow.ChangeToSetupBaudOrComPortOne();
var skipButton = textImageButtonFactory.Generate("Skip");
skipButton.Click += (s, e) => SaveAndExit();

7
PrinterControls/PrinterConnections/SetupStepInstallDriver.cs
View file

@ -19,8 +19,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private Button installButton;
private Button skipButton;
public SetupStepInstallDriver(WizardWindow windowController)
: base(windowController)
public SetupStepInstallDriver()
{
headerLabel.Text = string.Format(LocalizedString.Get("Install Communication Driver"));
printerDriverContainer = createPrinterDriverContainer();
@ -35,13 +34,13 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
bool canContinue = this.InstallDriver();
if (canContinue)
{
wizardWindow.ChangeToSetupBaudOrComPortOne();
WizardWindow.ChangeToSetupBaudOrComPortOne();
}
});
};
skipButton = textImageButtonFactory.Generate(LocalizedString.Get("Skip"));
skipButton.Click += (s, e) => wizardWindow.ChangeToSetupBaudOrComPortOne();
skipButton.Click += (s, e) => WizardWindow.ChangeToSetupBaudOrComPortOne();
//Add buttons to buttonContainer
footerRow.AddChild(installButton);

6
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -32,7 +32,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private BoundDropList printerManufacturerSelector;
private BoundDropList printerModelSelector;
public SetupStepMakeModelName(WizardWindow windowController) : base(windowController)
public SetupStepMakeModelName()
{
printerManufacturerSelector = new BoundDropList(string.Format("- {0} -", "Select Make".Localize()), maxHeight: 200)
{
@ -84,9 +84,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
if (canContinue)
{
#if __ANDROID__
wizardWindow.ChangeToConnectForm();
WizardWindow.ChangeToConnectForm();
#else
wizardWindow.ChangeToInstallDriver();
WizardWindow.ChangeToInstallDriver();
#endif
}
};

7
PrinterControls/PrinterConnections/ShowAuthPanel.cs
View file

@ -34,9 +34,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
public class ShowAuthPanel : ConnectionWizardPanel
{
public ShowAuthPanel(WizardWindow connectionWizard) : base(connectionWizard)
public ShowAuthPanel()
{
TextWidget userLoginPromptLabel = new TextWidget("Would you like to sign in to access your cloud\nprinter profiles?")
{
PointSize = 12,
@ -48,7 +47,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
nextButton.Name = "Connection Wizard Skip Sign In Button";
nextButton.Click += (sender, e) =>
{
connectionWizard.ChangeToAddPrinter();
WizardWindow.ChangeToAddPrinter();
};
var signInButton = textImageButtonFactory.Generate("Sign In");
@ -56,7 +55,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
signInButton.Click += (s, e) =>
{
WizardWindow.ShowAuthDialog?.Invoke();
UiThread.RunOnIdle(connectionWizard.Close);
UiThread.RunOnIdle(WizardWindow.Close);
};