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

Improving SLA export ui

Browse source
This commit is contained in:
Lars Brubaker 2021-02-16 17:34:40 -08:00
parent 35deaaa1b8
commit 0ad421360c
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ExportSlaPopupMenu.cs
View file

@ -75,13 +75,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
allUiFields.Clear();
var printPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
var exportPanel = new FlowLayoutWidget(FlowDirection.TopToBottom)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = menuTheme.BackgroundColor
};
printPanel.AddChild(new TextWidget("Options".Localize(), textColor: menuTheme.TextColor, pointSize: theme.DefaultFontSize)
exportPanel.AddChild(new TextWidget("Options".Localize(), textColor: menuTheme.TextColor, pointSize: theme.DefaultFontSize)
{
HAnchor = HAnchor.Left
});
@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
Padding = 5,
MinimumSize = new Vector2(400 * GuiWidget.DeviceScale, 65 * GuiWidget.DeviceScale),
};
printPanel.AddChild(optionsPanel);
exportPanel.AddChild(optionsPanel);
var settingsToAdd = new[]
{
@ -151,17 +151,18 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// Find the first export plugin with the target type
if (exportPlugins.FirstOrDefault(p => p.GetType() == targetPluginType) is IExportPlugin exportPlugin)
{
string exportType = "Export G-Code".Localize();
string exportType = "Export Photon File".Localize();
exportPlugin.Initialize(printer);
var exportGCodeButton = menuTheme.CreateDialogButton("Export".Localize());
var exportButton = menuTheme.CreateDialogButton("Export".Localize());
theme.ApplyPrimaryActionStyle(exportButton);
exportGCodeButton.Name = "Export SLA Button";
exportGCodeButton.Enabled = exportPlugin.Enabled;
exportGCodeButton.ToolTipText = exportPlugin.Enabled ? exportType : exportPlugin.DisabledReason;
exportButton.Name = "Export SLA Button";
exportButton.Enabled = exportPlugin.Enabled;
exportButton.ToolTipText = exportPlugin.Enabled ? exportType : exportPlugin.DisabledReason;
exportGCodeButton.Click += (s, e) =>
exportButton.Click += (s, e) =>
{
this.CloseMenu();
ExportPrintItemPage.DoExport(
@ -170,12 +171,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
exportPlugin);
};
setupRow.AddChild(exportGCodeButton);
setupRow.AddChild(exportButton);
}
// Export button
printPanel.AddChild(setupRow);
exportPanel.AddChild(setupRow);
if (hasErrorsOrWarnings)
{
@ -208,19 +209,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
BackgroundColor = layoutStyle == FlowDirection.TopToBottom ? printPanel.BackgroundColor : Color.Transparent
BackgroundColor = layoutStyle == FlowDirection.TopToBottom ? exportPanel.BackgroundColor : Color.Transparent
};
// Clear bottom padding
printPanel.Padding = printPanel.Padding.Clone(bottom: 2);
exportPanel.Padding = exportPanel.Padding.Clone(bottom: 2);
errorsContainer.AddChild(printPanel);
errorsContainer.AddChild(exportPanel);
errorsContainer.AddChild(errorsPanel);
return errorsContainer;
}
return printPanel;
return exportPanel;
};
this.AddChild(new TextButton("Export".Localize(), theme)

9
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -127,11 +127,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
else
{
// add the start print button
this.AddChild(new ExportSlaPopupMenu(printer, theme)
var exportButton = new ExportSlaPopupMenu(printer, theme)
{
Margin = theme.ButtonSpacing
});
};
// add the SLA export button
this.AddChild(exportButton);
theme.ApplyPrimaryActionStyle(exportButton);
}
this.AddChild(new SliceButton(printer, printerTabPage, theme)