From 72ea164f115e9ab9b99b2cba318d741a33fd93ae Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 18 Nov 2020 15:18:32 -0800 Subject: [PATCH] add new application icon for GLFW --- .../Settings/SliceSettingsFields.cs | 2 +- .../View3D/PrinterBar/PrinterActionsBar.cs | 2 +- StaticData/Icons/application.png | Bin 0 -> 3617 bytes Submodules/agg-sharp | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 StaticData/Icons/application.png diff --git a/MatterControl.Printing/Settings/SliceSettingsFields.cs b/MatterControl.Printing/Settings/SliceSettingsFields.cs index e3c1a7351..e2f4b8779 100644 --- a/MatterControl.Printing/Settings/SliceSettingsFields.cs +++ b/MatterControl.Printing/Settings/SliceSettingsFields.cs @@ -1038,7 +1038,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration HelpText = "The starting height (z) of the print head before probing each print level position.".Localize(), DataEditType = DataEditTypes.DOUBLE, Units = "mm".Localize(), - ShowIfSet = "!has_hardware_leveling", + ShowIfSet = "!has_hardware_leveling&has_z_probe", DefaultValue = "10", RebuildGCodeOnChange = false }, diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index 04568569f..c4a977ed4 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -314,7 +314,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }, new NamedBoolAction() { - Title = "Configure Printer".Localize(), + Title = "Show Printer".Localize(), Action = () => { }, GetIsActive = () => printer.ViewState.ConfigurePrinterVisible, SetIsActive = (value) => printer.ViewState.ConfigurePrinterVisible = value diff --git a/StaticData/Icons/application.png b/StaticData/Icons/application.png new file mode 100644 index 0000000000000000000000000000000000000000..670470b0f368de32411361307a6869dcae6d3351 GIT binary patch literal 3617 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 literal 0 HcmV?d00001 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index e65a677ae..d045922f4 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit e65a677aed2ce96019b0dc4ac5e0033e8179a790 +Subproject commit d045922f4b54675b3ed4a241101c5b4965d0892e