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

14
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -53,9 +53,9 @@ namespace MatterHackers.MatterControl
this.WindowTitle = this.HeaderText = "MatterControl " + "Settings".Localize();
this.WindowSize = new Vector2(700 * GuiWidget.DeviceScale, 600 * GuiWidget.DeviceScale);
contentRow.Padding = theme.DefaultContainerPadding;
contentRow.Padding = 0;
contentRow.BackgroundColor = Color.Transparent;
ContentRow.Padding = theme.DefaultContainerPadding;
ContentRow.Padding = 0;
ContentRow.BackgroundColor = Color.Transparent;
var generalPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
};
contentRow.AddChild(generalSection);
ContentRow.AddChild(generalSection);
theme.ApplyBoxStyle(generalSection);
@ -314,7 +314,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Fit,
Margin = 0
};
contentRow.AddChild(themeSection);
ContentRow.AddChild(themeSection);
theme.ApplyBoxStyle(themeSection);
@ -329,7 +329,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Fit,
Margin = 0
};
contentRow.AddChild(advancedSection);
ContentRow.AddChild(advancedSection);
theme.ApplyBoxStyle(advancedSection);
@ -388,7 +388,7 @@ namespace MatterHackers.MatterControl
advancedPanel.Children<SettingsItem>().First().Border = new BorderDouble(0, 1);
// Enforce consistent SectionWidget spacing and last child borders
foreach (var section in contentRow.Children<SectionWidget>())
foreach (var section in ContentRow.Children<SectionWidget>())
{
section.Margin = new BorderDouble(0, 10, 0, 0);