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

Require window title to show, use theme colors

Browse source
This commit is contained in:
jlewin 2019-03-20 16:27:39 -07:00
parent 2c8b06203c
commit 499d46a686
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs
View file

@ -74,6 +74,7 @@ namespace MatterHackers.MatterControl.PrinterControls
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(
"Printer Calibration",
new ISetupWizard[]
{
new PrintLevelingWizard(printer),
@ -90,7 +91,9 @@ namespace MatterHackers.MatterControl.PrinterControls
homePage.ContentRow.AddChild(new WrappedTextWidget(
@"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dictum sagittis lectus, eget interdum erat aliquam et. Cras fermentum eleifend urna, non lacinia diam egestas eu. Morbi et ullamcorper ex. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris sed nisl sapien. Aenean bibendum nec massa et pulvinar. Praesent sagittis lorem ut ornare cursus. Pellentesque non dolor sem. Donec at imperdiet massa. Vestibulum faucibus diam non tincidunt fermentum. Morbi lacus ligula, dictum sit amet purus ac, viverra tincidunt nisi. Quisque eget justo viverra, pulvinar sapien quis, pellentesque.
Fusce faucibus dictum convallis.Nulla molestie purus a nibh sodales consequat.Morbi lacus nisl, scelerisque in tincidunt nec, tempus sed metus.Aenean in dictum enim.Nunc pretium tellus sem, eu egestas lacus consectetur non.Mauris posuere viverra maximus.Praesent sit amet accumsan nisl.Quisque rutrum ultricies posuere.Nulla facilisi.Nulla augue dolor, facilisis sed nibh sed, bibendum malesuada erat.".Replace("\r\n", "\n")));
Fusce faucibus dictum convallis.Nulla molestie purus a nibh sodales consequat.Morbi lacus nisl, scelerisque in tincidunt nec, tempus sed metus.Aenean in dictum enim.Nunc pretium tellus sem, eu egestas lacus consectetur non.Mauris posuere viverra maximus.Praesent sit amet accumsan nisl.Quisque rutrum ultricies posuere.Nulla facilisi.Nulla augue dolor, facilisis sed nibh sed, bibendum malesuada erat.".Replace("\r\n", "\n"),
pointSize: theme.DefaultFontSize,
textColor: theme.TextColor));
return homePage;
});

4
MatterControlLib/SetupWizard/DialogWindow.cs
View file

@ -85,14 +85,14 @@ namespace MatterHackers.MatterControl
return wizardWindow;
}
public static DialogWindow Show(IEnumerable<ISetupWizard> stages, Func<DialogPage> homePageGenerator)
public static DialogWindow Show(string title, IEnumerable<ISetupWizard> stages, Func<DialogPage> homePageGenerator)
{
var wizardStages = stages.ToList();
var type = homePageGenerator.GetType();
var homePage = homePageGenerator();
var wizardWindow = new StagedSetupWizard(stages, homePageGenerator);
var wizardWindow = new StagedSetupWizard(title, stages, homePageGenerator);
wizardWindow.Closed += (s, e) => allWindows.Remove(type);
allWindows[type] = wizardWindow;

4
MatterControlLib/SetupWizard/StagedSetupWizard.cs
View file

@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl
}
}
public StagedSetupWizard(IEnumerable<ISetupWizard> stages, Func<DialogPage> homePageGenerator)
public StagedSetupWizard(string title, IEnumerable<ISetupWizard> stages, Func<DialogPage> homePageGenerator)
{
this.stages = stages;
this.homePageGenerator = homePageGenerator;
@ -121,7 +121,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Stretch
});
this.Title = activeStage.Title;
this.Title = title;
this.Size = new Vector2(1200, 700);
this.AddChild(row);
}