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

Consolidate export button code

Browse source
This commit is contained in:
jlewin 2019-06-04 17:34:22 -07:00
parent a5a5411717
commit fca740e465
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs
View file

@ -196,6 +196,24 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.CloseMenu(); this.CloseMenu();
}; };
var hasErrors = errors.Any(e => e.ErrorLevel == ValidationErrorLevel.Error);
var hasWarnings = errors.Any(e => e.ErrorLevel == ValidationErrorLevel.Warning
&& UserSettings.Instance.get($"Ignore_{e.ID}") != "true");
var hasErrorsOrWarnings = hasErrors || hasWarnings;
if (hasErrorsOrWarnings)
{
string label = hasErrors ? "Action Required".Localize() : "Action Recommended".Localize();
setupRow.AddChild(new TextWidget(label, textColor: hasErrors ? Color.Red : theme.PrimaryAccentColor, pointSize: theme.DefaultFontSize)
{
VAnchor = VAnchor.Bottom,
AutoExpandBoundsToText = true,
});
}
setupRow.AddChild(new HorizontalSpacer());
GCodeExport exportPlugin = null; GCodeExport exportPlugin = null;
bool isSailfish = printer.Settings.GetValue<bool>("enable_sailfish_communication"); bool isSailfish = printer.Settings.GetValue<bool>("enable_sailfish_communication");
@ -235,24 +253,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
exportPlugin); exportPlugin);
}; };
var hasErrors = errors.Any(e => e.ErrorLevel == ValidationErrorLevel.Error);
var hasWarnings = errors.Any(e => e.ErrorLevel == ValidationErrorLevel.Warning
&& UserSettings.Instance.get($"Ignore_{e.ID}") != "true");
var hasErrorsOrWarnings = hasErrors || hasWarnings;
if (hasErrorsOrWarnings)
{
string label = hasErrors ? "Action Required".Localize() : "Action Recommended".Localize();
setupRow.AddChild(new TextWidget(label, textColor: hasErrors ? Color.Red : theme.PrimaryAccentColor, pointSize: theme.DefaultFontSize)
{
VAnchor = VAnchor.Bottom,
AutoExpandBoundsToText = true,
});
}
setupRow.AddChild(new HorizontalSpacer());
setupRow.AddChild(exportGCodeButton); setupRow.AddChild(exportGCodeButton);
setupRow.AddChild(startPrintButton); setupRow.AddChild(startPrintButton);
printPanel.AddChild(setupRow); printPanel.AddChild(setupRow);