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

Unified the android and desktop setup wizard classes

Browse source
This commit is contained in:
Lars Brubaker 2016-06-01 18:17:11 -07:00
parent 6acbe7f2d3
commit b54e6a14ad
25 changed files with 1850 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PrinterControls/PrinterConnections/SetupConnectionWidgetBase.cs
View file

@ -20,7 +20,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
protected TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
protected LinkButtonFactory linkButtonFactory = new LinkButtonFactory();
public SetupConnectionWidgetBase(ConnectionWizard wizard) : base(wizard)
public SetupConnectionWidgetBase(WizardWindow wizard) : base(wizard)
{
SetDisplayAttributes();
@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
settings.SetName(ActivePrinter.Name);
});
UiThread.RunOnIdle(connectionWizard.Close);
UiThread.RunOnIdle(wizardWindow.Close);
}
private void SetDisplayAttributes()
@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
private void CancelButton_Click(object sender, EventArgs mouseEvent)
{
PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
UiThread.RunOnIdle(connectionWizard.Close);
UiThread.RunOnIdle(wizardWindow.Close);
}
}
}