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

24
SetupWizard/ImportSettingsPage.cs
View file

@ -217,11 +217,8 @@ namespace MatterHackers.MatterControl
this.Parents<SystemWindow>().FirstOrDefault()?.CloseOnIdle();
});
footerRow.AddChild(mergeButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
this.AddPageAction(mergeButton);
if (settingsToImport.QualityLayers.Count == 0 && settingsToImport.MaterialLayers.Count == 0)
{
// Only main setting so don't ask what to merge just do it.
@ -262,17 +259,7 @@ namespace MatterHackers.MatterControl
{
this.headerLabel.Text = "Import Successful".Localize();
var container = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
HAnchor = HAnchor.Stretch,
};
contentRow.AddChild(container);
var successMessageWidget = new WrappedTextWidget(successMessage, textColor: ActiveTheme.Instance.PrimaryTextColor);
container.AddChild(successMessageWidget);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
contentRow.AddChild(new WrappedTextWidget(successMessage, textColor: ActiveTheme.Instance.PrimaryTextColor));
}
}
@ -378,10 +365,7 @@ namespace MatterHackers.MatterControl
importButton.Visible = true;
cancelButton.Visible = true;
//Add buttons to buttonContainer
footerRow.AddChild(importButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
this.AddPageAction(importButton);
}
private GuiWidget CreateDetailInfo(string detailText)