diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs index 71885a34e..693772a8b 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs @@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.ActionBar this.MakeScrollable = false; this.AlignToRightEdge = true; - ImageWidget = new ImageWidget(StaticData.Instance.LoadIcon("hotend.png", 14, 14).SetToColor(theme.TextColor)) + ImageWidget = new ImageWidget(StaticData.Instance.LoadIcon("hotend.png", 14, 14).GrayToColor(theme.TextColor)) { VAnchor = VAnchor.Center, Margin = new BorderDouble(right: 5) diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs index 8d96e8d26..7877a5ef8 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs @@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.ActionBar this.DisplayCurrentTemperature(); this.ToolTipText = "Bed Temperature".Localize(); - this.ImageWidget.Image = StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor); + this.ImageWidget.Image = StaticData.Instance.LoadIcon("bed.png", 16, 16).GrayToColor(theme.TextColor); this.PopupContent = this.GetPopupContent(ApplicationController.Instance.MenuTheme); diff --git a/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs b/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs index 889937d68..5cad3a467 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs @@ -381,7 +381,7 @@ namespace MatterHackers.MatterControl.ActionBar // material can be changed even when the printer is not connected alwaysEnabled.Add(materialSettingsRow); // add in a shop button - var shopButton = new ThemedTextIconButton("Shop".Localize(), StaticData.Instance.LoadIcon("cart.png", 16, 16).SetToColor(menuTheme.TextColor), theme) + var shopButton = new ThemedTextIconButton("Shop".Localize(), StaticData.Instance.LoadIcon("cart.png", 16, 16).GrayToColor(menuTheme.TextColor), theme) { BackgroundColor = theme.SlightShade, HoverColor = theme.SlightShade.WithAlpha(75), diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 724954941..1e082558d 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -194,7 +194,7 @@ namespace MatterHackers.MatterControl { ID = "Export", Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(MenuTheme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(MenuTheme.TextColor), Action = () => { Instance.ExportLibraryItems( @@ -767,7 +767,7 @@ namespace MatterHackers.MatterControl new NamedAction() { ID = "Delete", - Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), Title = "Remove".Localize(), Action = sceneContext.Scene.DeleteSelection, IsEnabled = () => sceneContext.Scene.SelectedItem != null @@ -776,7 +776,7 @@ namespace MatterHackers.MatterControl { ID = "Export", Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor), Action = () => { ApplicationController.Instance.ExportLibraryItems( @@ -823,7 +823,7 @@ namespace MatterHackers.MatterControl await sceneContext.Scene.AutoArrangeChildren(view3DWidget.BedCenter).ConfigureAwait(false); }, IsEnabled = () => sceneContext.EditableScene, - Icon = StaticData.Instance.LoadIcon("arrange_all.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("arrange_all.png", 16, 16).GrayToColor(theme.TextColor), }, new NamedAction() { @@ -2614,7 +2614,7 @@ namespace MatterHackers.MatterControl VAnchor = VAnchor.Stretch }; - var icon = StaticData.Instance.LoadIcon("help_page.png", 16, 16).SetToColor(theme.TextColor); + var icon = StaticData.Instance.LoadIcon("help_page.png", 16, 16).GrayToColor(theme.TextColor); helpDocsTab = new ChromeTab("HelpDocs", "Help".Localize(), tabControl, helpTreePanel, theme, icon) { diff --git a/MatterControlLib/ApplicationView/BrandMenuButton.cs b/MatterControlLib/ApplicationView/BrandMenuButton.cs index 90c892e9b..9dc37c849 100644 --- a/MatterControlLib/ApplicationView/BrandMenuButton.cs +++ b/MatterControlLib/ApplicationView/BrandMenuButton.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl }; this.AddChild(row); - row.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("mh-app-logo.png", 16, 16).SetToColor(theme.TextColor), theme) + row.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("mh-app-logo.png", 16, 16).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, @@ -89,11 +89,11 @@ namespace MatterHackers.MatterControl MinimumSize = new Vector2(300, 0) }; - var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(menuTheme.TextColor); + var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).GrayToColor(menuTheme.TextColor); PopupMenu.MenuItem menuItem; - menuItem = popupMenu.CreateMenuItem("Open System File", StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = popupMenu.CreateMenuItem("Open System File", StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => ApplicationController.OpenFileWithSystemDialog((fileNames) => { if (fileNames != null && fileNames.Any()) @@ -104,10 +104,10 @@ namespace MatterHackers.MatterControl popupMenu.CreateSeparator(); - menuItem = popupMenu.CreateMenuItem("Help".Localize(), StaticData.Instance.LoadIcon("help_page.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = popupMenu.CreateMenuItem("Help".Localize(), StaticData.Instance.LoadIcon("help_page.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => ApplicationController.Instance.ShowApplicationHelp("Docs"); - menuItem = popupMenu.CreateMenuItem("Interface Tour".Localize(), StaticData.Instance.LoadIcon("tour.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = popupMenu.CreateMenuItem("Interface Tour".Localize(), StaticData.Instance.LoadIcon("tour.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => { UiThread.RunOnIdle(() => @@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl { popupMenu.CreateSeparator(); - menuItem = popupMenu.CreateMenuItem("Check For Update".Localize(), StaticData.Instance.LoadIcon("update.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = popupMenu.CreateMenuItem("Check For Update".Localize(), StaticData.Instance.LoadIcon("update.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => UiThread.RunOnIdle(() => { UpdateControlData.Instance.CheckForUpdate(); @@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl popupMenu.CreateSeparator(); - menuItem = popupMenu.CreateMenuItem("Settings".Localize(), StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = popupMenu.CreateMenuItem("Settings".Localize(), StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => DialogWindow.Show(); menuItem.Name = "Settings MenuItem"; @@ -140,7 +140,7 @@ namespace MatterHackers.MatterControl if (IntPtr.Size == 8) { - indicatorIcon = StaticData.Instance.LoadIcon("x64.png", 16, 16).SetToColor(menuTheme.TextColor); + indicatorIcon = StaticData.Instance.LoadIcon("x64.png", 16, 16).GrayToColor(menuTheme.TextColor); } popupMenu.CreateSubMenu("Community".Localize(), menuTheme, (modifyMenu) => @@ -159,9 +159,9 @@ namespace MatterHackers.MatterControl modifyMenu.CreateSeparator(); - menuItem = modifyMenu.CreateMenuItem("Report a Bug".Localize(), StaticData.Instance.LoadIcon("feedback.png", 16, 16).SetToColor(menuTheme.TextColor)); + menuItem = modifyMenu.CreateMenuItem("Report a Bug".Localize(), StaticData.Instance.LoadIcon("feedback.png", 16, 16).GrayToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => ApplicationController.LaunchBrowser("https://github.com/MatterHackers/MatterControl/issues"); - }, StaticData.Instance.LoadIcon("feedback.png", 16, 16).SetToColor(menuTheme.TextColor)); + }, StaticData.Instance.LoadIcon("feedback.png", 16, 16).GrayToColor(menuTheme.TextColor)); popupMenu.CreateSeparator(); diff --git a/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs b/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs index b5b8cd855..516b5eb4d 100644 --- a/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs +++ b/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs @@ -62,7 +62,7 @@ namespace MatterHackers.MatterControl { } - public ImageBuffer DefaultThumbnail() => StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(Theme.TextColor); + public ImageBuffer DefaultThumbnail() => StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(Theme.TextColor); public ImageBuffer LoadCachedImage(string cacheId, int width, int height) { diff --git a/MatterControlLib/ApplicationView/SceneOperations.cs b/MatterControlLib/ApplicationView/SceneOperations.cs index b2ed47eb5..14b0ce5cb 100644 --- a/MatterControlLib/ApplicationView/SceneOperations.cs +++ b/MatterControlLib/ApplicationView/SceneOperations.cs @@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl scene.SelectedItem = baseMesh; }, - Icon = (theme) => StaticData.Instance.LoadIcon("add_base.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("add_base.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), // this is for when base is working with generic meshes //IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem.IsPathObject()), @@ -246,7 +246,7 @@ namespace MatterHackers.MatterControl && componentObject.Finalized && !componentObject.ProOnly; }, - Icon = (theme) => StaticData.Instance.LoadIcon("scale_32x32.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("scale_32x32.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A component must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && (sceneContext.Scene.SelectedItem is ComponentObject3D), }; @@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl // Invalidate image to kick off rebuild of ImageConverter stack imageObject.Invalidate(InvalidateType.Image); }, - Icon = (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "An image must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem is ImageObject3D, }; @@ -360,7 +360,7 @@ namespace MatterHackers.MatterControl path.Invalidate(InvalidateType.Properties); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("image_to_path.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("image_to_path.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "An image must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem is IImageProvider, }; @@ -389,7 +389,7 @@ namespace MatterHackers.MatterControl inflatePath.Invalidate(InvalidateType.Properties); }, - Icon = (theme) => StaticData.Instance.LoadIcon("inflate_path.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("inflate_path.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem.IsPathObject(), }; @@ -422,7 +422,7 @@ namespace MatterHackers.MatterControl extrude.Invalidate(InvalidateType.Properties); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("linear_extrude.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("linear_extrude.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem.IsPathObject(), }; @@ -455,7 +455,7 @@ namespace MatterHackers.MatterControl revolve.Invalidate(InvalidateType.Properties); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("revolve.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("revolve.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem.IsPathObject(), }; @@ -498,7 +498,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new ReplaceCommand(items, new[] { component })); scene.SelectedItem = component; }, - Icon = (theme) => StaticData.Instance.LoadIcon("component.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("component.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => { @@ -519,7 +519,7 @@ namespace MatterHackers.MatterControl { new MirrorObject3D_2().WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("mirror_32x32.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("mirror_32x32.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -547,7 +547,7 @@ namespace MatterHackers.MatterControl outlinePath.Invalidate(InvalidateType.Properties); }, - Icon = (theme) => StaticData.Instance.LoadIcon("outline.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("outline.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem.IsPathObject(), }; @@ -563,7 +563,7 @@ namespace MatterHackers.MatterControl { new RotateObject3D_2().WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "rotate.png"), 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "rotate.png"), 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null, }; @@ -579,7 +579,7 @@ namespace MatterHackers.MatterControl { new ScaleObject3D_3().WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("scale_32x32.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("scale_32x32.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null, }; @@ -607,7 +607,7 @@ namespace MatterHackers.MatterControl smoothPath.Invalidate(InvalidateType.Properties); }, - Icon = (theme) => StaticData.Instance.LoadIcon("smooth_path.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("smooth_path.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "A path must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && sceneContext.Scene.SelectedItem.IsPathObject(), }; @@ -623,7 +623,7 @@ namespace MatterHackers.MatterControl { new TranslateObject3D().WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "translate.png"), 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "translate.png"), 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null, }; @@ -664,7 +664,7 @@ namespace MatterHackers.MatterControl align.Name = align.NameFromChildren(); align.NameOverriden = false; }, - Icon = (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 2 parts must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem is SelectionGroupObject3D, }; @@ -684,7 +684,7 @@ namespace MatterHackers.MatterControl { return sceneContext.EditableScene && sceneContext.Scene.VisibleMeshes().Any(); }, - Icon = (theme) => StaticData.Instance.LoadIcon("arrange_all.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("arrange_all.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), ShowInModifyMenu = (sceneContext) => false, }; } @@ -868,9 +868,9 @@ namespace MatterHackers.MatterControl } // register legacy types so they still show, they don't have ui to create so they don't have icons set dynamically - Icons.Add(typeof(AlignObject3D), (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply()); + Icons.Add(typeof(AlignObject3D), (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply()); - Icons.Add(typeof(ImageObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply()); + Icons.Add(typeof(ImageObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply()); } private static SceneOperation CombineOperation() @@ -890,7 +890,7 @@ namespace MatterHackers.MatterControl new CombineObject3D_2().WrapSelectedItemAndSelect(sceneContext.Scene); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("combine.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("combine.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 2 parts must be selected".Localize().Stars(), IsEnabled = (sceneContext) => BooleanCandidate(sceneContext.Scene.SelectedItem, true), }; @@ -907,7 +907,7 @@ namespace MatterHackers.MatterControl var curve = new CurveObject3D_3(); curve.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("curve.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("curve.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -942,7 +942,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new TransformCommand(transformData)); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("dual_align.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("dual_align.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 2 parts must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem is SelectionGroupObject3D, }; @@ -976,7 +976,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { selectedItem }, new[] { fit })); scene.SelectedItem = fit; }, - Icon = (theme) => StaticData.Instance.LoadIcon("fit.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("fit.png", 16, 16).GrayToColor(theme.TextColor), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is SelectionGroupObject3D), }; } @@ -997,7 +997,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { selectedItem }, new[] { fit })); scene.SelectedItem = fit; }, - Icon = (theme) => StaticData.Instance.LoadIcon("fit.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("fit.png", 16, 16).GrayToColor(theme.TextColor), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is SelectionGroupObject3D), }; } @@ -1034,7 +1034,7 @@ namespace MatterHackers.MatterControl var hollowOut = new HollowOutObject3D(); hollowOut.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("hollow.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("hollow.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1099,7 +1099,7 @@ namespace MatterHackers.MatterControl }, HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null, - Icon = (theme) => StaticData.Instance.LoadIcon("lay_flat.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("lay_flat.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), }; } @@ -1135,7 +1135,7 @@ namespace MatterHackers.MatterControl }, HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null, - Icon = (theme) => StaticData.Instance.LoadIcon("update.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("update.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), }; } @@ -1170,7 +1170,7 @@ namespace MatterHackers.MatterControl var pinch = new PinchObject3D_3(); pinch.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("pinch.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("pinch.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1187,7 +1187,7 @@ namespace MatterHackers.MatterControl var cut = new PlaneCutObject3D(); cut.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("plane_cut.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("plane_cut.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1204,7 +1204,7 @@ namespace MatterHackers.MatterControl var cut = new FindSliceObject3D(); cut.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("plane_cut.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("plane_cut.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1241,7 +1241,7 @@ namespace MatterHackers.MatterControl var hollowOut = new DecimateObject3D(); hollowOut.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("reduce.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("reduce.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1280,7 +1280,7 @@ namespace MatterHackers.MatterControl { Action = (sceneContext) => sceneContext.Scene.DeleteSelection(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), - Icon = (theme) => StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), ShowInModifyMenu = (sceneContext) => false, TitleGetter = () => "Remove".Localize(), @@ -1299,7 +1299,7 @@ namespace MatterHackers.MatterControl var hollowOut = new RepairObject3D(); hollowOut.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("repair.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("repair.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1366,7 +1366,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new SetOutputType(selectedItem, allAreSupport ? PrintOutputTypes.Default : PrintOutputTypes.Support)); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("support.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("support.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1397,7 +1397,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new SetOutputType(selectedItem, allAreWipeTower ? PrintOutputTypes.Default : PrintOutputTypes.WipeTower)); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("wipe_tower.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("wipe_tower.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1428,7 +1428,7 @@ namespace MatterHackers.MatterControl scene.UndoBuffer.AddAndDo(new SetOutputType(selectedItem, allAreFuzzy ? PrintOutputTypes.Default : PrintOutputTypes.Fuzzy)); } }, - Icon = (theme) => StaticData.Instance.LoadIcon("fuzzy_region.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("fuzzy_region.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1445,7 +1445,7 @@ namespace MatterHackers.MatterControl var twist = new TwistObject3D(); twist.WrapSelectedItemAndSelect(sceneContext.Scene); }, - Icon = (theme) => StaticData.Instance.LoadIcon("twist.png", 16, 16).SetToColor(theme.TextColor), + Icon = (theme) => StaticData.Instance.LoadIcon("twist.png", 16, 16).GrayToColor(theme.TextColor), HelpTextGetter = () => "At least 1 part must be selected".Localize().Stars(), IsEnabled = (sceneContext) => IsMeshObject(sceneContext.Scene.SelectedItem), }; @@ -1471,7 +1471,7 @@ namespace MatterHackers.MatterControl return false; }, - Icon = (theme) => StaticData.Instance.LoadIcon("ungroup.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), + Icon = (theme) => StaticData.Instance.LoadIcon("ungroup.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), UiHint = "Shift + G".Localize(), }; } diff --git a/MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs b/MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs index a39e0a4b0..bb904e69b 100644 --- a/MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs +++ b/MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs @@ -266,7 +266,7 @@ namespace MatterHackers.MatterControl public static GuiWidget CreateSearchButton(this ThemeConfig theme) { - return new ThemedIconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor), theme) + return new ThemedIconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Search".Localize(), }; @@ -354,7 +354,7 @@ namespace MatterHackers.MatterControl public static void RebuildTheme(this ThemeConfig theme) { - theme.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40).SetToColor(theme.TextColor); + theme.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40).GrayToColor(theme.TextColor); } public static void RemovePrimaryActionStyle(this ThemeConfig theme, GuiWidget guiWidget) diff --git a/MatterControlLib/CustomWidgets/DockingTabControl.cs b/MatterControlLib/CustomWidgets/DockingTabControl.cs index a015d62aa..6a2ca504c 100644 --- a/MatterControlLib/CustomWidgets/DockingTabControl.cs +++ b/MatterControlLib/CustomWidgets/DockingTabControl.cs @@ -167,7 +167,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { string imageFile = this.ControlIsPinned ? "Pushpin.png" : "PushpinUnpin.png"; - var pinTabButton = new ThemedIconButton(StaticData.Instance.LoadIcon(imageFile, 16, 16).SetToColor(theme.TextColor), theme) + var pinTabButton = new ThemedIconButton(StaticData.Instance.LoadIcon(imageFile, 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Pin Settings Button", ToolTipText = this.ControlIsPinned ? "Unpin".Localize() : "Pin".Localize() diff --git a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs index 161081510..055bc5289 100644 --- a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs +++ b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs @@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.ActionArea.VAnchor = VAnchor.Stretch; this.ActionArea.MinimumSize = new Vector2(0, titleText.Height); - var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) + var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = editToolTipText ?? "Edit".Localize(), Name = helpArticle.Name + " Edit" diff --git a/MatterControlLib/CustomWidgets/InlineListItemEdit.cs b/MatterControlLib/CustomWidgets/InlineListItemEdit.cs index f91398f87..02e21fb8f 100644 --- a/MatterControlLib/CustomWidgets/InlineListItemEdit.cs +++ b/MatterControlLib/CustomWidgets/InlineListItemEdit.cs @@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.CustomWidgets public InlineListItemEdit(string title, ThemeConfig theme, string automationName, bool boldFont = false) : base(title, theme, automationName, boldFont) { - var removeButton = new ThemedIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), theme) + var removeButton = new ThemedIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Delete".Localize(), Visible = true, diff --git a/MatterControlLib/CustomWidgets/InlineStringEdit.cs b/MatterControlLib/CustomWidgets/InlineStringEdit.cs index 6fbba2868..ea6e918ee 100644 --- a/MatterControlLib/CustomWidgets/InlineStringEdit.cs +++ b/MatterControlLib/CustomWidgets/InlineStringEdit.cs @@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.ActionArea.VAnchor = VAnchor.Stretch; this.ActionArea.MinimumSize = new Vector2(0, titleText.Height); - saveButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-save_16.png", 16, 16).SetToColor(theme.TextColor), theme) + saveButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-save_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Save".Localize(), Visible = false, @@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.CustomWidgets rightPanel = new FlowLayoutWidget(); - var icon = editable ? StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor) : new ImageBuffer(16, 16); + var icon = editable ? StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor) : new ImageBuffer(16, 16); editButton = new ThemedIconButton(icon, theme) { diff --git a/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs b/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs index db763f672..b046bddb6 100644 --- a/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs +++ b/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { this.CloseChildren(); - var backButton = new ThemedIconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "back.png"), 20, 20).SetToColor(theme.TextColor), theme) + var backButton = new ThemedIconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "back.png"), 20, 20).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Fit | VAnchor.Center, Enabled = currentContainer.Parent != null, diff --git a/MatterControlLib/DesignTools/EditorTools/LithophanePlugin.cs b/MatterControlLib/DesignTools/EditorTools/LithophanePlugin.cs index 36f15bd20..96b7ebd99 100644 --- a/MatterControlLib/DesignTools/EditorTools/LithophanePlugin.cs +++ b/MatterControlLib/DesignTools/EditorTools/LithophanePlugin.cs @@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl.Plugins.Lithophane IsEnabled = (sceneContext) => sceneContext?.Scene?.SelectedItem is IImageProvider, HelpTextGetter = () => "An image must be selected".Localize().Stars(), ShowInModifyMenu = (sceneContext) => sceneContext?.Scene?.SelectedItem is IImageProvider, - Icon = (theme) => StaticData.Instance.LoadIcon("lithophane.png", 16, 16).SetToColor(theme.TextColor) + Icon = (theme) => StaticData.Instance.LoadIcon("lithophane.png", 16, 16).GrayToColor(theme.TextColor) }, "Image"); } diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index a0ea8607f..6a659f456 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -1117,7 +1117,7 @@ namespace MatterHackers.MatterControl.DesignTools if (directoryPathAttribute != null) { // add a browse button - var browseButton = new ThemedIconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "folder.png"), 16, 16).SetToColor(theme.TextColor), theme) + var browseButton = new ThemedIconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "folder.png"), 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Select Folder".Localize(), }; @@ -1327,7 +1327,7 @@ namespace MatterHackers.MatterControl.DesignTools VAnchor = VAnchor.Center }; searchRow.AddChild(searchField); - var searchButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor), theme) + var searchButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Search".Localize(), }; @@ -1572,7 +1572,7 @@ namespace MatterHackers.MatterControl.DesignTools public static GuiWidget GetUnlockRow(ThemeConfig theme, string url) { - var detailsLink = new ThemedTextIconButton("Unlock".Localize(), StaticData.Instance.LoadIcon("locked.png", 16, 16).SetToColor(theme.TextColor), theme) + var detailsLink = new ThemedTextIconButton("Unlock".Localize(), StaticData.Instance.LoadIcon("locked.png", 16, 16).GrayToColor(theme.TextColor), theme) { Margin = 5, ToolTipText = "Visit MatterHackers.com to Purchase".Localize() @@ -1590,7 +1590,7 @@ namespace MatterHackers.MatterControl.DesignTools { if (item.GetType().GetCustomAttributes(typeof(WebPageLinkAttribute), true).FirstOrDefault() is WebPageLinkAttribute unlockLink) { - var detailsLink = new ThemedTextIconButton(unlockLink.ButtonName.Localize(), StaticData.Instance.LoadIcon("internet.png", 16, 16).SetToColor(theme.TextColor), theme) + var detailsLink = new ThemedTextIconButton(unlockLink.ButtonName.Localize(), StaticData.Instance.LoadIcon("internet.png", 16, 16).GrayToColor(theme.TextColor), theme) { BackgroundColor = theme.MinimalShade, ToolTipText = unlockLink.Url, diff --git a/MatterControlLib/DialogPages/AboutPage.cs b/MatterControlLib/DialogPages/AboutPage.cs index 95810f65a..d859e2e88 100644 --- a/MatterControlLib/DialogPages/AboutPage.cs +++ b/MatterControlLib/DialogPages/AboutPage.cs @@ -122,7 +122,7 @@ namespace MatterHackers.MatterControl var data = JsonConvert.DeserializeObject>(StaticData.Instance.ReadAllText(Path.Combine("License", "license.json"))); - var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(theme.TextColor); + var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).GrayToColor(theme.TextColor); SectionWidget section = null; diff --git a/MatterControlLib/DialogPages/StartupPage.cs b/MatterControlLib/DialogPages/StartupPage.cs index 984ec122e..51317577e 100644 --- a/MatterControlLib/DialogPages/StartupPage.cs +++ b/MatterControlLib/DialogPages/StartupPage.cs @@ -99,12 +99,12 @@ namespace MatterHackers.MatterControl } var pulseImage = new ImageBuffer(borderImage); - var pulseWord = StaticData.Instance.LoadIcon("pulse_word.png").SetToColor(theme.TextColor); + var pulseWord = StaticData.Instance.LoadIcon("pulse_word.png").GrayToColor(theme.TextColor); var wordWidth = bounds.Width * .8; graphics = pulseImage.NewGraphics2D(); graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best; graphics.RenderMaxSize(pulseWord, new Vector2(pulseImage.Width / 2 - wordWidth / 2, margin), new Vector2(wordWidth, bounds.Height)); - var pulseLogo = StaticData.Instance.LoadIcon("pulse_logo.png").SetToColor(theme.TextColor); + var pulseLogo = StaticData.Instance.LoadIcon("pulse_logo.png").GrayToColor(theme.TextColor); var logoWidth = bounds.Width * .5; graphics = pulseImage.NewGraphics2D(); graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best; @@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl graphics = printerImage.NewGraphics2D(); graphics.ImageRenderQuality = Graphics2D.TransformQuality.Best; var imageWidth = bounds.Width * .8; - var printerIcon = StaticData.Instance.LoadIcon(iconFile).CropToVisible().SetToColor(theme.TextColor); + var printerIcon = StaticData.Instance.LoadIcon(iconFile).CropToVisible().GrayToColor(theme.TextColor); var offset = pulseImage.Width / 2 - imageWidth / 2; graphics.RenderMaxSize(printerIcon, new Vector2(offset, offset), new Vector2(imageWidth, bounds.Height)); diff --git a/MatterControlLib/DialogPages/UpdateControlView.cs b/MatterControlLib/DialogPages/UpdateControlView.cs index eafc98fda..914525506 100644 --- a/MatterControlLib/DialogPages/UpdateControlView.cs +++ b/MatterControlLib/DialogPages/UpdateControlView.cs @@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl this.AddChild(new HorizontalSpacer()); - checkUpdateButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).SetToColor(theme.TextColor), theme) + checkUpdateButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).GrayToColor(theme.TextColor), theme) { ToolTipText = "Check for Update".Localize(), BackgroundColor = theme.MinimalShade, diff --git a/MatterControlLib/History/PrintHistoryEditor.cs b/MatterControlLib/History/PrintHistoryEditor.cs index ab8bafcce..3ad086ef4 100644 --- a/MatterControlLib/History/PrintHistoryEditor.cs +++ b/MatterControlLib/History/PrintHistoryEditor.cs @@ -115,9 +115,9 @@ namespace MatterHackers.MatterControl.PrintHistory var size = (int)(buttonFontSize * GuiWidget.DeviceScale); - var star = StaticData.Instance.LoadIcon("star.png", size, size).SetToColor(theme.TextColor); - var openStar = StaticData.Instance.LoadIcon("open_star.png", size, size).SetToColor(theme.TextColor); - var failure = StaticData.Instance.LoadIcon("failure.png", size, size).SetToColor(theme.TextColor); + var star = StaticData.Instance.LoadIcon("star.png", size, size).GrayToColor(theme.TextColor); + var openStar = StaticData.Instance.LoadIcon("open_star.png", size, size).GrayToColor(theme.TextColor); + var failure = StaticData.Instance.LoadIcon("failure.png", size, size).GrayToColor(theme.TextColor); content.AddChild(new GuiWidget(size, 1)); diff --git a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs index d5951cb03..f364100c6 100644 --- a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs +++ b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs @@ -251,7 +251,7 @@ namespace MatterHackers.MatterControl { theme = AppContext.Theme; - defaultIcon = StaticData.Instance.LoadIcon("mesh.png").SetToColor(theme.TextColor); //.AnyAlphaToColor(theme.PrimaryAccentColor); + defaultIcon = StaticData.Instance.LoadIcon("mesh.png").GrayToColor(theme.TextColor); //.AnyAlphaToColor(theme.PrimaryAccentColor); } return defaultIcon; diff --git a/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs b/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs index eff834c86..f65b952ca 100644 --- a/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs +++ b/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs @@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.Library { return Task.FromResult( StaticData.Instance.LoadIcon( - Path.Combine((width > 50 || height > 50) ? "icon_sd_card_115x115.png" : "icon_sd_card_50x50.png")).SetToColor(ApplicationController.Instance.Theme.TextColor)); + Path.Combine((width > 50 || height > 50) ? "icon_sd_card_115x115.png" : "icon_sd_card_50x50.png")).GrayToColor(ApplicationController.Instance.Theme.TextColor)); } public override void Load() diff --git a/MatterControlLib/Library/Widgets/CloneSettingsPage.cs b/MatterControlLib/Library/Widgets/CloneSettingsPage.cs index 334f0d229..ee6cb66a0 100644 --- a/MatterControlLib/Library/Widgets/CloneSettingsPage.cs +++ b/MatterControlLib/Library/Widgets/CloneSettingsPage.cs @@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.Library.Widgets // Must come before pathButton.Click definition RadioButton copyAndCalibrateOption = null; - var openButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(theme.TextColor), theme) + var openButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { BackgroundColor = theme.MinimalShade, Margin = new BorderDouble(left: 8), diff --git a/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs b/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs index d9ffc83c7..ac69d5ac2 100644 --- a/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs +++ b/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs @@ -55,8 +55,8 @@ namespace MatterHackers.MatterControl.CustomWidgets public ExpandCheckboxButton(string text, ThemeConfig theme, int pointSize = 11, bool expandable = true) { - arrowRight = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).SetToColor(theme.TextColor); - arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12).SetToColor(theme.TextColor); + arrowRight = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).GrayToColor(theme.TextColor); + arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12).GrayToColor(theme.TextColor); imageButton = new ThemedIconButton(arrowRight, theme) { diff --git a/MatterControlLib/Library/Widgets/HardwareTreeView.cs b/MatterControlLib/Library/Widgets/HardwareTreeView.cs index 033a597fb..a58f735d6 100644 --- a/MatterControlLib/Library/Widgets/HardwareTreeView.cs +++ b/MatterControlLib/Library/Widgets/HardwareTreeView.cs @@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.Library.Widgets Text = "Printers".Localize(), HAnchor = HAnchor.Stretch, AlwaysExpandable = true, - Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).SetToColor(theme.TextColor) + Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).GrayToColor(theme.TextColor) }; printersNode.TreeView = this; @@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Library.Widgets mainRow.AddChild(new HorizontalSpacer()); // add in the create pulse button - var createPulse = new ThemedIconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).SetToColor(theme.TextColor), theme) + var createPulse = new ThemedIconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).GrayToColor(theme.TextColor), theme) { Name = "Setup Pulse", VAnchor = VAnchor.Center, @@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.Library.Widgets mainRow.AddChild(createPulse); // add in the create printer button - var createPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).SetToColor(theme.TextColor), theme) + var createPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).GrayToColor(theme.TextColor), theme) { Name = "Create Printer", VAnchor = VAnchor.Center, @@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl.Library.Widgets mainRow.AddChild(createPrinter); // add in the import printer button - var importPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-import_18.png", 18, 18).SetToColor(theme.TextColor), theme) + var importPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-import_18.png", 18, 18).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, diff --git a/MatterControlLib/Library/Widgets/LibraryWidget.cs b/MatterControlLib/Library/Widgets/LibraryWidget.cs index 9bbe77063..37bdf9c6d 100644 --- a/MatterControlLib/Library/Widgets/LibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/LibraryWidget.cs @@ -224,7 +224,7 @@ namespace MatterHackers.MatterControl.Library.Widgets public static GuiWidget CreateSortingMenuButton(ThemeConfig theme, LibraryListView libraryView) { var viewOptionsButton = new PopupMenuButton( - new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor)), theme) + new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).GrayToColor(theme.TextColor)), theme) { AlignToRightEdge = true, Name = "Print Library View Options", @@ -293,7 +293,7 @@ namespace MatterHackers.MatterControl.Library.Widgets Func containersShown) { var viewMenuButton = new PopupMenuButton( - new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32).SetToColor(theme.TextColor)) + new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32).GrayToColor(theme.TextColor)) { // VAnchor = VAnchor.Center }, @@ -574,7 +574,7 @@ namespace MatterHackers.MatterControl.Library.Widgets { menuActions.Add(new LibraryAction(ActionScope.ListView) { - Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(theme.TextColor), Title = "Add".Localize(), ToolTipText = "Add an.stl, .obj, .3mf, .amf, .gcode or.zip file to the Library".Localize(), Action = (selectedLibraryItems, listView) => @@ -602,7 +602,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListView) { Title = "Create Folder".Localize() + "...", - Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { DialogWindow.Show( @@ -634,7 +634,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListView) { Title = "Enter Share Code".Localize() + "...", - Icon = StaticData.Instance.LoadIcon("enter-code.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("enter-code.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { UiThread.RunOnIdle(() => @@ -712,7 +712,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Open".Localize(), - Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { listView.SelectedItems.FirstOrDefault()?.OnDoubleClick(null); @@ -746,7 +746,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Open a copy".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { ApplicationController.Instance.OpenIntoNewTab(selectedLibraryItems); @@ -771,7 +771,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Add to Bed".Localize(), - Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16).GrayToColor(theme.TextColor), Action = async (selectedLibraryItems, listView) => { var activeContext = ApplicationController.Instance.DragDropData; @@ -827,7 +827,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { ApplicationController.Instance.ExportLibraryItems(libraryView.SelectedItems.Select(item => item.Model)); @@ -844,7 +844,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Share".Localize() + "...", - Icon = StaticData.Instance.LoadIcon("share.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("share.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { // Previously - shareFromLibraryButton_Click @@ -868,7 +868,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Rename".Localize(), - Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { if (libraryView.SelectedItems.Count == 1) @@ -972,7 +972,7 @@ namespace MatterHackers.MatterControl.Library.Widgets menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Remove".Localize(), - Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { // Previously - deleteFromLibraryButton_Click diff --git a/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs index e0547a099..24be528b9 100644 --- a/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs +++ b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.thumbWidth = width; this.thumbHeight = height; - overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).SetToColor(theme.TextColor); + overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).GrayToColor(theme.TextColor); } public bool HasMenu { get; set; } = false; diff --git a/MatterControlLib/Library/Widgets/PopupLibraryWidget.cs b/MatterControlLib/Library/Widgets/PopupLibraryWidget.cs index da35c203c..ac1d71938 100644 --- a/MatterControlLib/Library/Widgets/PopupLibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/PopupLibraryWidget.cs @@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.Library.Widgets allControls.AddChild(navBar); theme.ApplyBottomBorder(navBar); - var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor), theme) + var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).GrayToColor(theme.TextColor), theme) { HAnchor = HAnchor.Stretch, VAnchor = VAnchor.Fit, diff --git a/MatterControlLib/Library/Widgets/SearchableTreePanel.cs b/MatterControlLib/Library/Widgets/SearchableTreePanel.cs index 2093fad21..a2a28b059 100644 --- a/MatterControlLib/Library/Widgets/SearchableTreePanel.cs +++ b/MatterControlLib/Library/Widgets/SearchableTreePanel.cs @@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.Library.Widgets this.theme = theme; this.TreeLoaded = false; - var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor).AjustAlpha(0.3); + var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).GrayToColor(theme.TextColor).AjustAlpha(0.3); searchBox = new TextEditWithInlineCancel(theme) { diff --git a/MatterControlLib/PartPreviewWindow/DesignTabPage.cs b/MatterControlLib/PartPreviewWindow/DesignTabPage.cs index 7dbf68e28..d7aad2141 100644 --- a/MatterControlLib/PartPreviewWindow/DesignTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/DesignTabPage.cs @@ -187,8 +187,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow favoritesBar.VerticalScrollBar.Show = ScrollBar.ShowState.Never; - var expandedImage = StaticData.Instance.LoadIcon("expand.png", 16, 16).SetToColor(theme.TextColor); - var collapsedImage = StaticData.Instance.LoadIcon("collapse.png", 16, 16).SetToColor(theme.TextColor); + var expandedImage = StaticData.Instance.LoadIcon("expand.png", 16, 16).GrayToColor(theme.TextColor); + var collapsedImage = StaticData.Instance.LoadIcon("collapse.png", 16, 16).GrayToColor(theme.TextColor); var expandBarButton = new ThemedIconButton(expanded ? collapsedImage : expandedImage, theme) { diff --git a/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs index 3fc95329f..ce7ff8297 100644 --- a/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs @@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var buttonGroup = new ObservableCollection(); - speedsButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("speeds.png", 16, 16).SetToColor(theme.TextColor), theme) + speedsButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("speeds.png", 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "Speeds Button", @@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonPanel.AddChild(speedsButton); - materialsButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("materials.png", 16, 16).SetToColor(theme.TextColor), theme) + materialsButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("materials.png", 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "Materials Button", @@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonPanel.AddChild(materialsButton); - noColorButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("no-color.png", 16, 16).SetToColor(theme.TextColor), theme) + noColorButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("no-color.png", 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "No Color Button", diff --git a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs index f268f3906..05466511c 100644 --- a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs +++ b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs @@ -258,7 +258,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow if (getPickedColor != null) { - var selectButton = rightContent.AddChild(new ThemedTextIconButton("Select".Localize(), StaticData.Instance.LoadIcon("eye_dropper.png", 16, 16).SetToColor(theme.TextColor), theme) + var selectButton = rightContent.AddChild(new ThemedTextIconButton("Select".Localize(), StaticData.Instance.LoadIcon("eye_dropper.png", 16, 16).GrayToColor(theme.TextColor), theme) { Margin = 0, HAnchor = HAnchor.Fit | HAnchor.Left, diff --git a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs index adda3a204..426388a55 100644 --- a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs +++ b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs @@ -855,7 +855,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; moveButtons.AddChild(textWidget); var buttonSize = 24 * DeviceScale; - var moveLeftButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).SetToColor(theme.TextColor).MirrorX(), theme) + var moveLeftButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).GrayToColor(theme.TextColor).MirrorX(), theme) { Width = buttonSize, Height = buttonSize, @@ -871,7 +871,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; moveButtons.AddChild(moveLeftButton); - var moveRightButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).SetToColor(theme.TextColor), theme) + var moveRightButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).GrayToColor(theme.TextColor), theme) { Width = buttonSize, Height = buttonSize, @@ -989,7 +989,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow tabControl, new DesignTabPage(workspace, theme, ""), theme, - StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor)) + StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(theme.TextColor)) { Name = "newPart" + tabControl.AllTabs.Count(), }; diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs index 46b6a0d6b..d5d4bbe8d 100644 --- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs @@ -680,7 +680,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // add in the move up button var babyStepAmount = .02; - var upButton = babySteppingControls.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("Up Arrow.png", 32, 32).SetToColor(theme.TextColor), theme) + var upButton = babySteppingControls.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("Up Arrow.png", 32, 32).GrayToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, VAnchor = VAnchor.Absolute, @@ -719,7 +719,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }); // add in the move down button - var downButton = babySteppingControls.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("Down Arrow.png", 32, 32).SetToColor(theme.TextColor), theme) + var downButton = babySteppingControls.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("Down Arrow.png", 32, 32).GrayToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, VAnchor = VAnchor.Absolute, @@ -890,7 +890,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - timeContainer.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("fa-clock_24.png", 24, 24).SetToColor(theme.TextColor)) + timeContainer.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("fa-clock_24.png", 24, 24).GrayToColor(theme.TextColor)) { VAnchor = VAnchor.Center }); diff --git a/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs b/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs index 09cc6d238..9371a25c5 100644 --- a/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs +++ b/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs @@ -227,7 +227,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { if (string.IsNullOrEmpty(buttonText)) { - return new ThemedIconButton(StaticData.Instance.LoadIcon(iconFilename, 12, 12).SetToColor(theme.TextColor), theme) + return new ThemedIconButton(StaticData.Instance.LoadIcon(iconFilename, 12, 12).GrayToColor(theme.TextColor), theme) { Margin = theme.ButtonSpacing, Enabled = clickAction != null, @@ -239,7 +239,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var oldSize = theme.DefaultFontSize; theme.DefaultFontSize = 8; - var pauseButton = new ThemedTextIconButton(buttonText, StaticData.Instance.LoadIcon(iconFilename, 12, 12).SetToColor(theme.TextColor), theme) + var pauseButton = new ThemedTextIconButton(buttonText, StaticData.Instance.LoadIcon(iconFilename, 12, 12).GrayToColor(theme.TextColor), theme) { Margin = new BorderDouble(marginX, 0), Padding = new BorderDouble(7, 3), diff --git a/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs b/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs index 0751ba3df..8ee658ca1 100644 --- a/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs +++ b/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs @@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.taskDetails = taskDetails; this.Padding = new BorderDouble(3, 0); - this.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("wait.png", 14, 14).SetToColor(theme.TextColor)) + this.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("wait.png", 14, 14).GrayToColor(theme.TextColor)) { VAnchor = VAnchor.Center, HAnchor = HAnchor.Left diff --git a/MatterControlLib/PartPreviewWindow/SaveAsPage.cs b/MatterControlLib/PartPreviewWindow/SaveAsPage.cs index e0c7245ca..7523f86d9 100644 --- a/MatterControlLib/PartPreviewWindow/SaveAsPage.cs +++ b/MatterControlLib/PartPreviewWindow/SaveAsPage.cs @@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl contentRow.AddChild(itemNameWidget); - var icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).SetToColor(ApplicationController.Instance.MenuTheme.TextColor); + var icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).GrayToColor(ApplicationController.Instance.MenuTheme.TextColor); var isEnabled = false; if (librarySelectorWidget.ActiveContainer is ILibraryWritableContainer writableContainer) { @@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl createFolderButton.Name = "Create Folder In Button"; folderButtonRow.AddChild(createFolderButton); - var refreshButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).SetToColor(theme.TextColor), theme) + var refreshButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Refresh Folder".Localize(), Enabled = isEnabled, diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 9f0d4cace..a96cfc248 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow toolbar.AddChild(primaryActionsPanel); // put in a make permanent button - var icon = StaticData.Instance.LoadIcon("apply.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(); + var icon = StaticData.Instance.LoadIcon("apply.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(); applyButton = new ThemedIconButton(icon, theme) { Margin = theme.ButtonSpacing, @@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow toolbar.AddChild(applyButton); // put in a remove button - cancelButton = new ThemedIconButton(StaticData.Instance.LoadIcon("cancel.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply(), theme) + cancelButton = new ThemedIconButton(StaticData.Instance.LoadIcon("cancel.png", 16, 16).GrayToColor(theme.TextColor).SetPreMultiply(), theme) { Margin = theme.ButtonSpacing, ToolTipText = "Cancel".Localize(), diff --git a/MatterControlLib/PartPreviewWindow/Tabs.cs b/MatterControlLib/PartPreviewWindow/Tabs.cs index 670fac9d2..d3234371c 100644 --- a/MatterControlLib/PartPreviewWindow/Tabs.cs +++ b/MatterControlLib/PartPreviewWindow/Tabs.cs @@ -306,7 +306,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.TabBar.ActionArea.AddChild(tabTrailer); - var plusTabButton = new NewTabButton(StaticData.Instance.LoadIcon("fa-plus_12.png", 12, 12).SetToColor(theme.TextColor), theme) + var plusTabButton = new NewTabButton(StaticData.Instance.LoadIcon("fa-plus_12.png", 12, 12).GrayToColor(theme.TextColor), theme) { Height = 20 * GuiWidget.DeviceScale, }; diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs index 5a0729081..934a3eb5b 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs @@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private static ImageBuffer CreateOverflowIcon(ThemeConfig theme) { - return StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).SetToColor(theme.TextColor); + return StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).GrayToColor(theme.TextColor); } } } diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index 3438eca64..f3dfcb7b4 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.CloseMenu(); }; }, - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor), ButtonEnabled = exportPlugin.Enabled, ButtonName = "Export GCode Button", ButtonAction = (widget) => diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs index 7147d8326..2b56e8e5f 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs @@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var resetConnectionButton = new ThemedTextIconButton( "Reset".Localize(), - StaticData.Instance.LoadIcon("e_stop.png", 14, 14).SetToColor(theme.TextColor), + StaticData.Instance.LoadIcon("e_stop.png", 14, 14).GrayToColor(theme.TextColor), theme) { ToolTipText = "Reboots the firmware on the controller".Localize(), @@ -154,7 +154,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var buttonGroupB = new ObservableCollection(); var iconPath = Path.Combine("ViewTransformControls", "model.png"); - modelViewButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).SetToColor(theme.TextColor), theme) + modelViewButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupB, Name = "Model View Button", @@ -170,7 +170,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewModes.Add(PartViewMode.Model, modelViewButton); iconPath = Path.Combine("ViewTransformControls", "gcode_3d.png"); - layers3DButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).SetToColor(theme.TextColor), theme) + layers3DButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupB, Name = "Layers3D Button", @@ -187,7 +187,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(layers3DButton); iconPath = Path.Combine("ViewTransformControls", "gcode_2d.png"); - layers2DButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).SetToColor(theme.TextColor), theme) + layers2DButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(iconPath, 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupB, Name = "Layers2D Button", @@ -310,7 +310,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { new NamedAction() { - Icon = StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16).GrayToColor(theme.TextColor), Title = "Configure EEProm".Localize(), Action = configureEePromButton_Click, IsEnabled = () => printer.Connection.IsConnected @@ -389,7 +389,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { ApplicationController.Instance.ExportAsMatterControlConfig(printer); }), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor), }); menuActions.Add(new ActionSeparator()); menuActions.Add(new NamedAction() @@ -402,7 +402,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow DialogWindow.Show(new PrinterCalibrationWizard(printer, theme)); }); }), - Icon = StaticData.Instance.LoadIcon("compass.png", 16, 16).SetToColor(theme.TextColor) + Icon = StaticData.Instance.LoadIcon("compass.png", 16, 16).GrayToColor(theme.TextColor) }); menuActions.Add(new ActionSeparator()); menuActions.Add(new NamedAction() @@ -412,7 +412,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { DialogWindow.Show(new UpdateSettingsPage(printer)); }, - Icon = StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).SetToColor(theme.TextColor) + Icon = StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).GrayToColor(theme.TextColor) }); menuActions.Add(new NamedAction() { diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs index 5eb84ea61..3b4afb253 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs @@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.ActionBar connectButton = new ThemedTextIconButton( "Connect".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(theme.TextColor), + StaticData.Instance.LoadIcon("connect.png", 14, 14).GrayToColor(theme.TextColor), theme) { Name = "Connect to printer button", @@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.ActionBar // add the cancel stop button cancelConnectButton = new ThemedTextIconButton( "Cancel".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(theme.TextColor), + StaticData.Instance.LoadIcon("connect.png", 14, 14).GrayToColor(theme.TextColor), theme) { ToolTipText = "Stop trying to connect to the printer.".Localize(), @@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl.ActionBar disconnectButton = new ThemedTextIconButton( "Disconnect".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(theme.TextColor), + StaticData.Instance.LoadIcon("connect.png", 14, 14).GrayToColor(theme.TextColor), theme) { Name = "Disconnect from printer button", diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs index 2666dd3ac..e07d56227 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs @@ -47,8 +47,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.VAnchor = VAnchor.Fit | VAnchor; this.BackgroundColor = theme.ResolveColor(theme.BackgroundColor, theme.PrimaryAccentColor.WithAlpha(30)); - var errorImage = StaticData.Instance.LoadIcon("SettingsGroupError_16x.png", 16, 16).SetToColor(theme.TextColor); - var warningImage = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16).SetToColor(theme.TextColor); + var errorImage = StaticData.Instance.LoadIcon("SettingsGroupError_16x.png", 16, 16).GrayToColor(theme.TextColor); + var warningImage = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16).GrayToColor(theme.TextColor); var infoImage = StaticData.Instance.LoadIcon("StatusInfoTip_16x.png", 16, 16); foreach (var validationError in errors.OrderByDescending(e => e.ErrorLevel)) diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs index 7afbc88b0..f78796bc6 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -248,7 +248,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow titleAndTreeView.AddChild(treeView); workspaceName.ActionArea.AddChild( - new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).SetToColor(theme.TextColor), theme) + new ThemedIconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).GrayToColor(theme.TextColor), theme) { Enabled = false }, @@ -356,7 +356,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // add the view controls var buttonGroupA = new ObservableCollection(); - partSelectButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "partSelect.png"), 16, 16).SetToColor(theme.TextColor), theme) + partSelectButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "partSelect.png"), 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupA, ToolTipText = "Select Parts".Localize(), @@ -368,7 +368,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow partSelectButton.Click += (s, e) => viewControls3D.ActiveButton = ViewControls3DButtons.PartSelect; buttonGroupA.Add(partSelectButton); - rotateButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "rotate.png"), 16, 16).SetToColor(theme.TextColor), theme) + rotateButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "rotate.png"), 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupA, ToolTipText = "Rotate View".Localize(), @@ -379,7 +379,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow rotateButton.Click += (s, e) => viewControls3D.ActiveButton = ViewControls3DButtons.Rotate; buttonGroupA.Add(rotateButton); - translateButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "translate.png"), 16, 16).SetToColor(theme.TextColor), theme) + translateButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "translate.png"), 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupA, ToolTipText = "Move View".Localize(), @@ -390,7 +390,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow translateButton.Click += (s, e) => viewControls3D.ActiveButton = ViewControls3DButtons.Translate; buttonGroupA.Add(translateButton); - zoomButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "scale.png"), 16, 16).SetToColor(theme.TextColor), theme) + zoomButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "scale.png"), 16, 16).GrayToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroupA, ToolTipText = "Zoom View".Localize(), @@ -462,7 +462,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; // add the home button - var homeButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16).SetToColor(theme.TextColor), theme) + var homeButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Reset View".Localize(), Margin = theme.ButtonSpacing @@ -470,7 +470,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow homeButton.MouseEnterBounds += (s1, e1) => homeButton.SetActiveUiHint("W Key"); AddRoundButton(homeButton, RotatedMargin(homeButton, MathHelper.Tau * .3)).Click += (s, e) => viewControls3D.NotifyResetView(); - var zoomToSelectionButton = new ThemedIconButton(StaticData.Instance.LoadIcon("select.png", 16, 16).SetToColor(theme.TextColor), theme) + var zoomToSelectionButton = new ThemedIconButton(StaticData.Instance.LoadIcon("select.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Zoom to selection button", ToolTipText = "Zoom to Selection".Localize(), @@ -491,7 +491,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var turntableEnabled = UserSettings.Instance.get(UserSettingsKey.TurntableMode) != "False"; TrackballTumbleWidget.TurntableEnabled = turntableEnabled; - var turnTableButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("spin.png", 16, 16).SetToColor(theme.TextColor), theme) + var turnTableButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("spin.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Turntable Mode".Localize(), Margin = theme.ButtonSpacing, @@ -518,7 +518,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var perspectiveEnabled = UserSettings.Instance.get(UserSettingsKey.PerspectiveMode) != false.ToString(); TrackballTumbleWidget.ChangeProjectionMode(perspectiveEnabled, false); - var projectionButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("perspective.png", 16, 16).SetToColor(theme.TextColor), theme) + var projectionButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("perspective.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Projection mode button", ToolTipText = "Perspective Mode".Localize(), @@ -548,7 +548,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow cubeCenterFromRightTop.X -= bottomButtonOffset; // put in the bed and build volume buttons - var bedButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor), theme) + var bedButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("bed.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Bed Button", ToolTipText = "Show Print Bed".Localize(), @@ -559,7 +559,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow bedButton.MouseEnterBounds += (s, e) => bedButton.SetActiveUiHint("Hide and show the bed".Localize()); AddRoundButton(bedButton, new Vector2((cubeCenterFromRightTop.X + 18 * scale - bedButton.Width / 2) / scale, startHeight)); - var printAreaButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("print_area.png", 16, 16).SetToColor(theme.TextColor), theme) + var printAreaButton = new ThemedRadioIconButton(StaticData.Instance.LoadIcon("print_area.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Bed Button", ToolTipText = BuildHeightValid() ? "Show Print Area".Localize() : "Define printer build height to enable", diff --git a/MatterControlLib/PartPreviewWindow/ViewToolBarControls.cs b/MatterControlLib/PartPreviewWindow/ViewToolBarControls.cs index 5d4923d25..9e1d35b80 100644 --- a/MatterControlLib/PartPreviewWindow/ViewToolBarControls.cs +++ b/MatterControlLib/PartPreviewWindow/ViewToolBarControls.cs @@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(new ToolbarSeparator(theme.GetBorderColor(50), theme.SeparatorMargin)); - bedMenuButton = new PopupMenuButton("Bed".Localize(), StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor), theme) + bedMenuButton = new PopupMenuButton("Bed".Localize(), StaticData.Instance.LoadIcon("bed.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Bed Options Menu", Enabled = true, @@ -123,7 +123,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(new ToolbarSeparator(theme.GetBorderColor(50), theme.SeparatorMargin)); - undoButton = new ThemedIconButton(StaticData.Instance.LoadIcon("undo.png", 16, 16).SetToColor(theme.TextColor), theme) + undoButton = new ThemedIconButton(StaticData.Instance.LoadIcon("undo.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "3D View Undo", ToolTipText = "Undo".Localize(), @@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; this.AddChild(undoButton); - redoButton = new ThemedIconButton(StaticData.Instance.LoadIcon("redo.png", 16, 16).SetToColor(theme.TextColor), theme) + redoButton = new ThemedIconButton(StaticData.Instance.LoadIcon("redo.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "3D View Redo", Margin = theme.ButtonSpacing, @@ -480,7 +480,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonGroup.AddChild(operationButton); } - var collapseButton = buttonGroup.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("collapse_single.png", 8, 16).SetToColor(theme.TextColor), theme)); + var collapseButton = buttonGroup.AddChild(new ThemedIconButton(StaticData.Instance.LoadIcon("collapse_single.png", 8, 16).GrayToColor(theme.TextColor), theme)); collapseButton.Width = 16 * DeviceScale; collapseButton.ToolTipText = "Collapse".Localize(); @@ -552,7 +552,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }); } - var expandMenuItem = popupMenu.CreateMenuItem("Expand".Localize(), StaticData.Instance.LoadIcon("expand_single.png", 8, 16).SetToColor(theme.TextColor)); + var expandMenuItem = popupMenu.CreateMenuItem("Expand".Localize(), StaticData.Instance.LoadIcon("expand_single.png", 8, 16).GrayToColor(theme.TextColor)); expandMenuItem.Click += (s, e) => UiThread.RunOnIdle(() => { @@ -689,7 +689,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { ID = "Export", Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(menuTheme.TextColor), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(menuTheme.TextColor), Action = () => { ApplicationController.Instance.ExportLibraryItems( @@ -746,7 +746,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var openMenuItems = new PopupMenu(ApplicationController.Instance.MenuTheme); popupMenu.PopupContent = openMenuItems; - var openFileButton = openMenuItems.CreateMenuItem("Add System File to Bed".Localize(), StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(theme.TextColor)); + var openFileButton = openMenuItems.CreateMenuItem("Add System File to Bed".Localize(), StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).GrayToColor(theme.TextColor)); openFileButton.Click += (s, e) => { @@ -795,7 +795,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var openColor = theme.ResolveColor(theme.BackgroundColor, theme.SlightShade); PopupMenuButton libraryPopup = null; - libraryPopup = new PopupMenuButton("Add to Bed".Localize(), StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(theme.TextColor), theme) + libraryPopup = new PopupMenuButton("Add to Bed".Localize(), StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { MakeScrollable = false, Name = "Add Content Menu", @@ -897,7 +897,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow minimumSupportHeight = sceneContext.Printer.Settings.GetValue(SettingsKey.layer_height) / 2; } - toggleSupportButton = new PopupMenuButton(StaticData.Instance.LoadIcon("edit_support.png", 16, 16).SetToColor(theme.TextColor), theme) + toggleSupportButton = new PopupMenuButton(StaticData.Instance.LoadIcon("edit_support.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Support SplitButton", ToolTipText = "Generate Support".Localize(), @@ -921,7 +921,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { ButtonText = "Save".Localize(), ButtonName = "Save", - Icon = StaticData.Instance.LoadIcon("save_grey_16x.png", 16, 16).SetToColor(theme.TextColor), + Icon = StaticData.Instance.LoadIcon("save_grey_16x.png", 16, 16).GrayToColor(theme.TextColor), ButtonAction = (menuButton) => { ApplicationController.Instance.Tasks.Execute("Saving".Localize(), sceneContext.Printer, async (progress, cancellationToken) => @@ -968,7 +968,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow sceneContext.SaveAs(container, newName); })); }); - var export = popupMenu.CreateMenuItem("Export".Localize(), StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor)); + var export = popupMenu.CreateMenuItem("Export".Localize(), StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor)); export.Click += (s, e) => UiThread.RunOnIdle(() => { ApplicationController.Instance.ExportLibraryItems( diff --git a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs index 07df9a225..943d41c7a 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.PrinterControls null, theme)); - var runWizardButton = new ThemedIconButton(StaticData.Instance.LoadIcon("compass.png", 16, 16).SetToColor(theme.TextColor), theme) + var runWizardButton = new ThemedIconButton(StaticData.Instance.LoadIcon("compass.png", 16, 16).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, diff --git a/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs index ee87935be..4f0cfa18f 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs @@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.PrinterControls { var widget = new MacroControls(printer, theme); - var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme); + var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme); editButton.Click += (s, e) => { DialogWindow.Show(new MacroListPage(printer.Settings)); diff --git a/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs index 5ad151db3..d3132b952 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs @@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.PrinterControls { var widget = new MovementControls(printer, new XYZColors(theme), theme); - var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme); + var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme); editButton.Click += (s, e) => widget.EditOptions(); return new SectionWidget( @@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl.PrinterControls Margin = new BorderDouble(bottom: 10) }; - var homeIcon = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16).SetToColor(theme.TextColor), theme) + var homeIcon = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Home X, Y and Z".Localize(), BackgroundColor = theme.MinimalShade, diff --git a/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs b/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs index 539f67931..a72791533 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs @@ -168,7 +168,7 @@ namespace MatterHackers.MatterControl MinimumSize = new Vector2(125, 0) }); - var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) + var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme) { Name = "Edit Leveling Data Button", ToolTipText = "Edit Leveling Data".Localize(), diff --git a/MatterControlLib/PrinterControls/JogControls.cs b/MatterControlLib/PrinterControls/JogControls.cs index d473cb861..638af22bb 100644 --- a/MatterControlLib/PrinterControls/JogControls.cs +++ b/MatterControlLib/PrinterControls/JogControls.cs @@ -287,7 +287,7 @@ namespace MatterHackers.MatterControl Margin = new BorderDouble(left: 10) }; - keyboardImage = new ThemedIconButton(StaticData.Instance.LoadIcon("hot_key_small_white.png", 19, 12).SetToColor(theme.TextColor), theme) + keyboardImage = new ThemedIconButton(StaticData.Instance.LoadIcon("hot_key_small_white.png", 19, 12).GrayToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, Margin = new BorderDouble(5), diff --git a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs index 7c613b157..9b05a667a 100644 --- a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs +++ b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs @@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl VAnchor = VAnchor.Fit, }; - var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor); + var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).GrayToColor(theme.TextColor); var generalSection = new SectionWidget("General".Localize(), generalPanel, theme, expandingContent: false) { @@ -148,7 +148,7 @@ namespace MatterHackers.MatterControl } }, configureNotificationsButton, - StaticData.Instance.LoadIcon("notify-24x24.png", 16, 16).SetToColor(theme.TextColor)), + StaticData.Instance.LoadIcon("notify-24x24.png", 16, 16).GrayToColor(theme.TextColor)), generalPanel); // LanguageControl @@ -351,7 +351,7 @@ namespace MatterHackers.MatterControl true, false); - var openCacheButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(theme.TextColor), theme) + var openCacheButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Open Folder".Localize(), }; @@ -367,7 +367,7 @@ namespace MatterHackers.MatterControl theme), advancedPanel); - var clearCacheButton = new ThemedHoverIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), theme) + var clearCacheButton = new ThemedHoverIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Clear Cache".Localize(), }; @@ -384,7 +384,7 @@ namespace MatterHackers.MatterControl advancedPanel); #if DEBUG - var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor); + var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).GrayToColor(theme.TextColor); var configurePluginsButton = new ThemedIconButton(configureIcon, theme) { diff --git a/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs b/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs index b17c3f40b..f65eed889 100644 --- a/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs +++ b/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs @@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl Text = "Printers".Localize(), HAnchor = HAnchor.Stretch, AlwaysExpandable = true, - Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).SetToColor(theme.TextColor) + Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).GrayToColor(theme.TextColor) }; rootPrintersNode.TreeView = treeView; treeView.AddChild(rootPrintersNode); diff --git a/MatterControlLib/SetupWizard/TourPopover.cs b/MatterControlLib/SetupWizard/TourPopover.cs index 7975fd835..b5b1ea3ec 100644 --- a/MatterControlLib/SetupWizard/TourPopover.cs +++ b/MatterControlLib/SetupWizard/TourPopover.cs @@ -263,7 +263,7 @@ namespace MatterHackers.MatterControl.Tour public ArrowButton(string text, ArrowDirection arrowDirection, ThemeConfig theme, double pointSize = -1) : base(text, theme, pointSize) { - var rightArrow = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 10, 10).SetToColor(theme.TextColor); + var rightArrow = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 10, 10).GrayToColor(theme.TextColor); if (arrowDirection == ArrowDirection.Right) { diff --git a/MatterControlLib/SetupWizard/WizardStageRow.cs b/MatterControlLib/SetupWizard/WizardStageRow.cs index 6c1eca91a..96cdb37d8 100644 --- a/MatterControlLib/SetupWizard/WizardStageRow.cs +++ b/MatterControlLib/SetupWizard/WizardStageRow.cs @@ -57,10 +57,10 @@ namespace MatterHackers.MatterControl this.stage = stage; this.Cursor = Cursors.Hand; - completedIcon = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16).SetToColor(theme.TextColor).AjustAlpha(0.3); - recommendedIcon = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16).SetToColor(theme.TextColor); - setupIcon = StaticData.Instance.LoadIcon("SettingsGroupError_16x.png", 16, 16).SetToColor(theme.TextColor); - hoverIcon = StaticData.Instance.LoadIcon("expand.png", 16, 16).SetToColor(theme.TextColor); + completedIcon = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16).GrayToColor(theme.TextColor).AjustAlpha(0.3); + recommendedIcon = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16).GrayToColor(theme.TextColor); + setupIcon = StaticData.Instance.LoadIcon("SettingsGroupError_16x.png", 16, 16).GrayToColor(theme.TextColor); + hoverIcon = StaticData.Instance.LoadIcon("expand.png", 16, 16).GrayToColor(theme.TextColor); } public bool Active { get; set; } diff --git a/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs b/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs index af8192201..f9084bb9c 100644 --- a/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs +++ b/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs @@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration Name = "Preset Pulldown Container" }; - editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) + editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme) { ToolTipText = "Edit Selected Setting".Localize(), Enabled = dropDownList.SelectedIndex != -1, @@ -267,7 +267,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var addString = layerType == NamedSettingsLayers.Material ? "New Material".Localize() : "New Quality Setting".Localize(); MenuItem addNewPreset = dropDownList.AddItem( - StaticData.Instance.LoadIcon("icon_plus.png", 16, 16).SetToColor(theme.TextColor), + StaticData.Instance.LoadIcon("icon_plus.png", 16, 16).GrayToColor(theme.TextColor), addString + "...", "new", pointSize: theme.DefaultFontSize); diff --git a/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs index 215af7d53..02bf9c3fa 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs @@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (ShowPortWizardButton) { - var configureIcon = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor), theme) + var configureIcon = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, diff --git a/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs b/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs index 66ef6fa76..cbd0cd74d 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs @@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (enumDisplayAttibute.IconWidth > 0) { // If the attribute allows invert, use the theme.InvertIcons state - iconImage = StaticData.Instance.LoadIcon(iconPath, enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight).SetToColor(theme.TextColor); + iconImage = StaticData.Instance.LoadIcon(iconPath, enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight).GrayToColor(theme.TextColor); } else { diff --git a/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs index 1fc5c7319..da2d1344f 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs @@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var widget = new FlowLayoutWidget(); widget.AddChild(dropdownList); - refreshButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).SetToColor(theme.TextColor), theme) + refreshButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).GrayToColor(theme.TextColor), theme) { Margin = new BorderDouble(left: 5) }; diff --git a/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs index 8ec466b8f..1b46efa9d 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs @@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.Content.AddChild(inlineEdit); } - var addItem = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).SetToColor(theme.TextColor), theme) + var addItem = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).GrayToColor(theme.TextColor), theme) { HAnchor = HAnchor.Right | HAnchor.Absolute, Width = theme.ButtonHeight, diff --git a/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs b/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs index 590033fe0..74eaecded 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs @@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public override void Initialize(int tabIndex) { - var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) + var editButton = new ThemedIconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor), theme) { VAnchor = VAnchor.Top, ToolTipText = "Edit".Localize(), diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ccb6fd617..b11a638eb 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ccb6fd61762931e024e0517e287925560c835c9e +Subproject commit b11a638ebf5efd5e448f988d06d6e408431c3381