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

Require WizardPage actions to be registered with AddPageAction

Browse source 
- Add HorizontalSpacer and Cancel buttons to all windows
This commit is contained in:
John Lewin 2017-08-23 17:27:30 -07:00
parent 559c300cb4
commit 65135f93a2
23 changed files with 69 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

32
SetupWizard/WizardPage.cs
View file

@ -1,7 +1,9 @@

using System;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
namespace MatterHackers.MatterControl
{
@ -9,7 +11,7 @@ namespace MatterHackers.MatterControl
{
protected FlowLayoutWidget headerRow;
protected FlowLayoutWidget contentRow;
protected FlowLayoutWidget footerRow;
private FlowLayoutWidget footerRow;
protected WrappedTextWidget headerLabel;
protected Button cancelButton;
@ -25,6 +27,8 @@ namespace MatterHackers.MatterControl
protected GuiWidget mainContainer;
protected bool abortCancel = false;
public WizardPage(string unlocalizedTextForCancelButton = "Cancel", string unlocalizedTextForTitle = "Setup Wizard")
{
if (!UserSettings.Instance.IsTouchScreen)
@ -37,10 +41,6 @@ namespace MatterHackers.MatterControl
cancelButton = textImageButtonFactory.Generate(unlocalizedTextForCancelButton.Localize());
cancelButton.Name = "Cancel Wizard Button";
cancelButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() => WizardWindow?.Close());
};
// Create the main container
mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom)
@ -100,6 +100,28 @@ namespace MatterHackers.MatterControl
public string WindowTitle { get; set; }
public void AddPageAction(Button button)
{
footerRow.AddChild(button);
}
public override void OnLoad(EventArgs args)
{
// Add 'Close' event listener after derived types have had a chance to register event listeners
cancelButton.Click += (s, e) =>
{
if (!abortCancel)
{
UiThread.RunOnIdle(() => WizardWindow?.Close());
}
};
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
base.OnLoad(args);
}
public virtual void PageIsBecomingActive()
{
}