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

Group print popup optional items into SectionWidget

Browse source
This commit is contained in:
John Lewin 2018-01-22 10:32:32 -08:00
parent f0aa5db046
commit 09b2db02b9
2 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PartPreviewWindow/SectionWidget.cs
View file

@ -7,7 +7,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
/// <summary>
/// A container control having a header and a content panel, with optional collapse behavior and right aligned widget
/// </summary>
public class SectionWidget : FlowLayoutWidget
public class SectionWidget : FlowLayoutWidget, IIgnoredPopupChild
{
private ExpandCheckboxButton checkbox;

40
PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs
View file

@ -81,12 +81,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var settingsContext = new SettingsContext(printer, null, NamedSettingsLayers.All);
foreach (var key in new[] { "layer_height", "fill_density", "support_material", "create_raft", "spiral_vase", "layer_to_pause" })
var lightGray = new Color("#aaa");
foreach (var key in new[] { "layer_height", "fill_density", "support_material", "create_raft"})
{
var settingsData = SettingsOrganizer.Instance.GetSettingsData(key);
var row = SliceSettingsTabView.CreateItemRow(settingsData, settingsContext, printer, Color.Black, theme, ref tabIndex);
var lightGray = new Color("#aaa");
foreach (var widget in row.Descendants<MHNumberEdit>())
{
@ -103,6 +104,41 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
optionsPanel.AddChild(row);
}
var subPanel = new FlowLayoutWidget(FlowDirection.TopToBottom);
// TODO: lookup settings values
bool anySettingOverridden = false;
var sectionWidget = new SectionWidget("Advanced", subPanel, theme, expanded: anySettingOverridden)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,
Margin = 0
};
column.AddChild(sectionWidget);
foreach (var key in new[] { "spiral_vase", "layer_to_pause" })
{
var settingsData = SettingsOrganizer.Instance.GetSettingsData(key);
var row = SliceSettingsTabView.CreateItemRow(settingsData, settingsContext, printer, Color.Black, theme, ref tabIndex);
foreach (var widget in row.Descendants<MHNumberEdit>())
{
widget.Border = 1;
widget.BorderColor = lightGray;
}
foreach (var widget in row.Descendants<MHTextEditWidget>())
{
widget.Border = 1;
widget.BorderColor = lightGray;
}
subPanel.AddChild(row);
}
sectionWidget.ApplyBoxStyle();
var button = new TextButton("Start Print".Localize(), theme, Color.Black)
{
Name = "Start Print Button",