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

Re-wrote the load filament wizard as not a macro so we have more control over it

Browse source 
Added it to the setup steps

issue: MatterHackers/MCCentral#4429
Put in a loading filament as part of initial setup process
This commit is contained in:
Lars Brubaker 2018-11-02 16:14:37 -07:00
parent 6469cba676
commit 775f1982bd
68 changed files with 832 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

18
MatterControlLib/SetupWizard/AndroidConnectDevicePage.cs
View file

@ -61,12 +61,12 @@ namespace MatterHackers.MatterControl
TextColor = ActiveTheme.Instance.PrimaryTextColor,
Margin = new BorderDouble(bottom: 10)
};
contentRow.AddChild(printerNameLabel);
ContentRow.AddChild(printerNameLabel);
contentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
contentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
//Add inputs to main container
ApplicationController.Instance.ActivePrinter.Connection.CommunicationStateChanged.RegisterEvent(communicationStateChanged, ref unregisterEvents);
@ -87,10 +87,10 @@ namespace MatterHackers.MatterControl
connectButtonContainer.AddChild(connectButton);
connectButtonContainer.AddChild(skipButton);
connectButtonContainer.AddChild(new HorizontalSpacer());
contentRow.AddChild(connectButtonContainer);
ContentRow.AddChild(connectButtonContainer);
skipMessage = new TextWidget("(Press 'Skip' to setup connection later)".Localize(), 0, 0, 10, textColor: ActiveTheme.Instance.PrimaryTextColor);
contentRow.AddChild(skipMessage);
ContentRow.AddChild(skipMessage);
generalError = new TextWidget("", 0, 0, errorFontSize)
{
@ -99,7 +99,7 @@ namespace MatterHackers.MatterControl
Visible = false,
Margin = new BorderDouble(top: 20),
};
contentRow.AddChild(generalError);
ContentRow.AddChild(generalError);
//Construct buttons
retryButton = theme.CreateLightDialogButton("Retry".Localize());
@ -125,7 +125,7 @@ namespace MatterHackers.MatterControl
retryButtonContainer.AddChild(troubleshootButton);
retryButtonContainer.AddChild(new HorizontalSpacer());
contentRow.AddChild(retryButtonContainer);
ContentRow.AddChild(retryButtonContainer);
//Construct buttons
nextButton = theme.CreateDialogButton("Continue".Localize());