From fe406720f26c9868cec139cc70f0b2060c0fa409 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 21 May 2021 15:23:25 -0700 Subject: [PATCH] Got rid of invert icons --- MatterControlLib/AboutPage/AboutPage.cs | 3 ++- .../AboutPage/UpdateControlView.cs | 3 ++- .../ActionBar/TemperatureWidgetBase.cs | 3 ++- .../ActionBar/TemperatureWidgetBed.cs | 3 ++- .../ApplicationView/ApplicationController.cs | 6 ++--- .../ApplicationView/BrandMenuButton.cs | 19 +++++++------- .../Config/ThumbnailsConfig.cs | 3 ++- .../ApplicationView/Themes/ThemeConfig.cs | 17 +++---------- .../CustomWidgets/DockingTabControl.cs | 9 ++++--- .../CustomWidgets/HelpArticleHeader.cs | 3 ++- .../CustomWidgets/InlineListItemEdit.cs | 3 ++- .../CustomWidgets/InlineStringEdit.cs | 5 ++-- .../LibrarySelector/FolderBreadCrumbWidget.cs | 3 ++- .../CustomWidgets/TreeView/TreeNode.cs | 5 ++-- .../DesignTools/PublicPropertyEditor.cs | 5 ++-- .../History/PrintHistoryEditor.cs | 7 ++--- .../ContentProviders/MeshContentProvider.cs | 2 +- .../Providers/Printer/SDCardContainer.cs | 4 +-- .../Library/Widgets/CloneSettingsPage.cs | 3 ++- .../Library/Widgets/ExpandCheckboxButton.cs | 5 ++-- .../Library/Widgets/LibraryWidget.cs | 24 +++++++++--------- .../Widgets/ListView/ListViewItemBase.cs | 3 ++- .../Library/Widgets/PrintLibraryWidget.cs | 3 ++- .../Library/Widgets/SearchableTreePanel.cs | 2 +- .../GCodeDetails/GCodeOptionsPanel.cs | 7 ++--- .../PartPreviewWindow/ItemColorButton.cs | 3 ++- .../PartPreviewWindow/MainViewWidget.cs | 9 ++++--- .../PartPreviewWindow/PartTabPage.cs | 5 ++-- .../PartPreviewWindow/PopupMenu.cs | 2 +- .../PartPreviewWindow/PrinterTabPage.cs | 7 ++--- .../PartPreviewWindow/RenderOptionsButton.cs | 3 ++- .../PartPreviewWindow/RunningTaskRow.cs | 5 ++-- .../RunningTaskStatusPanel.cs | 3 ++- .../PartPreviewWindow/SaveAsPage.cs | 5 ++-- MatterControlLib/PartPreviewWindow/Tabs.cs | 3 ++- .../View3D/Actions/ImageEditor.cs | 3 ++- .../View3D/PrinterBar/OverflowBar.cs | 3 ++- .../View3D/PrinterBar/PrintPopupMenu.cs | 3 ++- .../View3D/PrinterBar/PrinterActionsBar.cs | 10 ++++---- .../View3D/PrinterBar/PrinterConnectButton.cs | 7 ++--- .../PrinterBar/ValidationErrorsPanel.cs | 5 ++-- .../PartPreviewWindow/View3D/View3DWidget.cs | 6 ++--- .../PartPreviewWindow/ViewControls3D.cs | 19 +++++++------- .../PartPreviewWindow/ViewStyleButton.cs | 13 +++++----- .../ControlWidgets/CalibrationControls.cs | 3 ++- .../ControlWidgets/MacroControls.cs | 3 ++- .../ControlWidgets/MovementControls.cs | 5 ++-- .../PrinterCalibrationWizard.cs | 3 ++- .../PrinterControls/JogControls.cs | 3 ++- .../ApplicationSettingsPage.cs | 13 +++++----- .../SetupWizard/Printer/OpenPrinterPage.cs | 3 ++- MatterControlLib/SetupWizard/TourPopover.cs | 3 ++- .../SetupWizard/WizardStageRow.cs | 8 +++--- .../PresetSelectorWidget.cs | 3 ++- .../UIFields/ComPortField.cs | 3 ++- .../UIFields/EnumDisplayField.cs | 5 ++-- .../UIFields/IpAddessField.cs | 3 ++- .../UIFields/ListStringField.cs | 3 ++- .../UIFields/MarkdownEditField.cs | 3 ++- .../Utilities/MarkdigAgg/AggListRenderer.cs | 3 ++- Program.cs | 1 - StaticData/Icons/Pushpin.png | Bin 0 -> 5205 bytes StaticData/Icons/PushpinUnpin.png | Bin 0 -> 5191 bytes StaticData/Icons/PushpinUnpin_16x.png | Bin 245 -> 0 bytes StaticData/Icons/Pushpin_16x.png | Bin 247 -> 0 bytes StaticData/Icons/cube_add.png | Bin 809 -> 5602 bytes StaticData/Icons/cube_export.png | Bin 908 -> 6833 bytes Submodules/agg-sharp | 2 +- 68 files changed, 186 insertions(+), 148 deletions(-) create mode 100644 StaticData/Icons/Pushpin.png create mode 100644 StaticData/Icons/PushpinUnpin.png delete mode 100644 StaticData/Icons/PushpinUnpin_16x.png delete mode 100644 StaticData/Icons/Pushpin_16x.png diff --git a/MatterControlLib/AboutPage/AboutPage.cs b/MatterControlLib/AboutPage/AboutPage.cs index eb02f9774..f4d51919e 100644 --- a/MatterControlLib/AboutPage/AboutPage.cs +++ b/MatterControlLib/AboutPage/AboutPage.cs @@ -34,6 +34,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.VectorMath; @@ -120,7 +121,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, theme.InvertIcons); + var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(theme.TextColor); SectionWidget section = null; diff --git a/MatterControlLib/AboutPage/UpdateControlView.cs b/MatterControlLib/AboutPage/UpdateControlView.cs index 6b3f9dcb0..39eff96da 100644 --- a/MatterControlLib/AboutPage/UpdateControlView.cs +++ b/MatterControlLib/AboutPage/UpdateControlView.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.VectorMath; @@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl this.AddChild(new HorizontalSpacer()); - checkUpdateButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14, theme.InvertIcons), theme) + checkUpdateButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).SetToColor(theme.TextColor), theme) { ToolTipText = "Check for Update".Localize(), BackgroundColor = theme.MinimalShade, diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs index c0a7fd9ee..71885a34e 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetBase.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetBase.cs @@ -33,6 +33,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.PartPreviewWindow; namespace MatterHackers.MatterControl.ActionBar @@ -65,7 +66,7 @@ namespace MatterHackers.MatterControl.ActionBar this.MakeScrollable = false; this.AlignToRightEdge = true; - ImageWidget = new ImageWidget(StaticData.Instance.LoadIcon("hotend.png", 14, 14, theme.InvertIcons)) + ImageWidget = new ImageWidget(StaticData.Instance.LoadIcon("hotend.png", 14, 14).SetToColor(theme.TextColor)) { VAnchor = VAnchor.Center, Margin = new BorderDouble(right: 5) diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs index 5d2fe1cda..69758a996 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs @@ -33,6 +33,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage; using MatterHackers.MatterControl.CustomWidgets; @@ -56,7 +57,7 @@ namespace MatterHackers.MatterControl.ActionBar this.DisplayCurrentTemperature(); this.ToolTipText = "Bed Temperature".Localize(); - this.ImageWidget.Image = StaticData.Instance.LoadIcon("bed.png", 16, 16, theme.InvertIcons); + this.ImageWidget.Image = StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor); this.PopupContent = this.GetPopupContent(ApplicationController.Instance.MenuTheme); diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 15cd5b1b6..b2979bb1c 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -196,7 +196,7 @@ namespace MatterHackers.MatterControl { ID = "Export", Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, menuTheme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(MenuTheme.TextColor), Action = () => { ApplicationController.Instance.ExportLibraryItems( @@ -575,7 +575,6 @@ namespace MatterHackers.MatterControl var printer = sceneContext.Printer; var theme = Instance.MenuTheme; - bool invertIcons = theme.InvertIcons; // Build workspace actions, each having a unique ID var actions = new[] @@ -1278,7 +1277,6 @@ namespace MatterHackers.MatterControl var theme = ApplicationController.Instance.Theme; SingleWindowProvider.SetWindowTheme(theme.TextColor, theme.DefaultFontSize - 1, - theme.InvertIcons, () => theme.CreateSmallResetButton(), theme.ToolbarPadding, theme.TabBarBackground, @@ -2330,7 +2328,7 @@ namespace MatterHackers.MatterControl VAnchor = VAnchor.Stretch }; - var icon = StaticData.Instance.LoadIcon("help_page.png", 16, 16, theme.InvertIcons); + var icon = StaticData.Instance.LoadIcon("help_page.png", 16, 16).SetToColor(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 1613c5591..e7960e6b4 100644 --- a/MatterControlLib/ApplicationView/BrandMenuButton.cs +++ b/MatterControlLib/ApplicationView/BrandMenuButton.cs @@ -33,6 +33,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.Transform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage; using MatterHackers.MatterControl.CustomWidgets; @@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl }; this.AddChild(row); - row.AddChild(new IconButton(StaticData.Instance.LoadIcon("mh-app-logo.png", 16, 16, theme.InvertIcons), theme) + row.AddChild(new IconButton(StaticData.Instance.LoadIcon("mh-app-logo.png", 16, 16).SetToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, @@ -87,14 +88,14 @@ namespace MatterHackers.MatterControl MinimumSize = new Vector2(300, 0) }; - var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16, menuTheme.InvertIcons); + var linkIcon = StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(menuTheme.TextColor); PopupMenu.MenuItem menuItem; - menuItem = popupMenu.CreateMenuItem("Help".Localize(), StaticData.Instance.LoadIcon("help_page.png", 16, 16, menuTheme.InvertIcons)); + menuItem = popupMenu.CreateMenuItem("Help".Localize(), StaticData.Instance.LoadIcon("help_page.png", 16, 16).SetToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => ApplicationController.Instance.ShowApplicationHelp("Docs"); - menuItem = popupMenu.CreateMenuItem("Interface Tour".Localize(), StaticData.Instance.LoadIcon("tour.png", 16, 16, menuTheme.InvertIcons)); + menuItem = popupMenu.CreateMenuItem("Interface Tour".Localize(), StaticData.Instance.LoadIcon("tour.png", 16, 16).SetToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => { UiThread.RunOnIdle(() => @@ -107,7 +108,7 @@ namespace MatterHackers.MatterControl { popupMenu.CreateSeparator(); - menuItem = popupMenu.CreateMenuItem("Check For Update".Localize(), StaticData.Instance.LoadIcon("update.png", 16, 16, menuTheme.InvertIcons)); + menuItem = popupMenu.CreateMenuItem("Check For Update".Localize(), StaticData.Instance.LoadIcon("update.png", 16, 16).SetToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => UiThread.RunOnIdle(() => { UpdateControlData.Instance.CheckForUpdate(); @@ -117,7 +118,7 @@ namespace MatterHackers.MatterControl popupMenu.CreateSeparator(); - menuItem = popupMenu.CreateMenuItem("Settings".Localize(), StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16, menuTheme.InvertIcons)); + menuItem = popupMenu.CreateMenuItem("Settings".Localize(), StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => DialogWindow.Show(); menuItem.Name = "Settings MenuItem"; @@ -127,7 +128,7 @@ namespace MatterHackers.MatterControl if (IntPtr.Size == 8) { - indicatorIcon = StaticData.Instance.LoadIcon("x64.png", 16, 16, menuTheme.InvertIcons); + indicatorIcon = StaticData.Instance.LoadIcon("x64.png", 16, 16).SetToColor(menuTheme.TextColor); } popupMenu.CreateSubMenu("Community".Localize(), menuTheme, (modifyMenu) => @@ -146,9 +147,9 @@ namespace MatterHackers.MatterControl modifyMenu.CreateSeparator(); - menuItem = modifyMenu.CreateMenuItem("Report a Bug".Localize(), StaticData.Instance.LoadIcon("feedback.png", 16, 16, menuTheme.InvertIcons)); + menuItem = modifyMenu.CreateMenuItem("Report a Bug".Localize(), StaticData.Instance.LoadIcon("feedback.png", 16, 16).SetToColor(menuTheme.TextColor)); menuItem.Click += (s, e) => ApplicationController.LaunchBrowser("https://github.com/MatterHackers/MatterControl/issues"); - }, StaticData.Instance.LoadIcon("feedback.png", 16, 16, menuTheme.InvertIcons)); + }, StaticData.Instance.LoadIcon("feedback.png", 16, 16).SetToColor(menuTheme.TextColor)); popupMenu.CreateSeparator(); diff --git a/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs b/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs index 15d14b7f0..1af1e1e7b 100644 --- a/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs +++ b/MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs @@ -36,6 +36,7 @@ using System.Threading.Tasks; using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.Library; namespace MatterHackers.MatterControl @@ -61,7 +62,7 @@ namespace MatterHackers.MatterControl { } - public ImageBuffer DefaultThumbnail() => StaticData.Instance.LoadIcon("cube.png", 16, 16, Theme.InvertIcons); + public ImageBuffer DefaultThumbnail() => StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(Theme.TextColor); public ImageBuffer LoadCachedImage(string cacheId, int width, int height) { diff --git a/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs b/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs index 883a69dcb..6422fa594 100644 --- a/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs +++ b/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs @@ -33,6 +33,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PartPreviewWindow; @@ -78,11 +79,6 @@ namespace MatterHackers.MatterControl private readonly int defaultScrollBarWidth = 120; - /// - /// Gets a value indicating whether icons should be inverted due to black source images on a dark theme - /// - public bool InvertIcons => this?.IsDarkTheme ?? false; - public void MakeRoundedButton(GuiWidget button, Color? boarderColor = null) { if (button is TextButton textButton) @@ -255,12 +251,7 @@ namespace MatterHackers.MatterControl internal void EnsureDefaults() { - // if (this.BedColor == Color.Transparent) - // { - // this.BedColor = this.ResolveColor(this.BackgroundColor, Color.Gray.WithAlpha(60)); - // } - - // EnsureDefaults is called after deserialization and at a point when state should be fully loaded. Invoking RebuildTheme here ensures icons are inverted correctly + // EnsureDefaults is called after deserialization and at a point when state should be fully loaded. Invoking RebuildTheme here ensures icons shaded correctly this.RebuildTheme(); } @@ -291,7 +282,7 @@ namespace MatterHackers.MatterControl public GuiWidget CreateSearchButton() { - return new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16, this.InvertIcons), this) + return new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(TextColor), this) { ToolTipText = "Search".Localize(), }; @@ -317,7 +308,7 @@ namespace MatterHackers.MatterControl restoreNormal = ColorCircle(size, (AggContext.OperatingSystem == OSType.Android) ? new Color(200, 0, 0) : Color.Transparent); restoreHover = ColorCircle(size, new Color("#DB4437")); - this.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40, this.InvertIcons); + this.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40).SetToColor(TextColor); ScrollBar.DefaultThumbView.ThumbColor = new Color(this.TextColor, 30); } diff --git a/MatterControlLib/CustomWidgets/DockingTabControl.cs b/MatterControlLib/CustomWidgets/DockingTabControl.cs index 9bc3cad94..6457aaa0c 100644 --- a/MatterControlLib/CustomWidgets/DockingTabControl.cs +++ b/MatterControlLib/CustomWidgets/DockingTabControl.cs @@ -36,6 +36,8 @@ using MatterHackers.Agg.Platform; using MatterHackers.Agg.Transform; using MatterHackers.Agg.UI; using MatterHackers.Agg.VertexSource; +using MatterHackers.ImageProcessing; +using MatterHackers.Localizations; using MatterHackers.MatterControl.PartPreviewWindow; using MatterHackers.VectorMath; @@ -163,11 +165,12 @@ namespace MatterHackers.MatterControl.CustomWidgets private GuiWidget CreatePinButton() { - string imageFile = this.ControlIsPinned ? "Pushpin_16x.png" : "PushpinUnpin_16x.png"; + string imageFile = this.ControlIsPinned ? "Pushpin.png" : "PushpinUnpin.png"; - var pinTabButton = new IconButton(StaticData.Instance.LoadIcon(imageFile, 16, 16, theme.InvertIcons), theme) + var pinTabButton = new IconButton(StaticData.Instance.LoadIcon(imageFile, 16, 16).SetToColor(theme.TextColor), theme) { - Name = "Pin Settings Button" + Name = "Pin Settings Button", + ToolTipText = this.ControlIsPinned ? "Unpin".Localize() : "Pin".Localize() }; pinTabButton.Click += (s, e) => { diff --git a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs index c1b6723f9..3cd719d51 100644 --- a/MatterControlLib/CustomWidgets/HelpArticleHeader.cs +++ b/MatterControlLib/CustomWidgets/HelpArticleHeader.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.PartPreviewWindow; using MatterHackers.VectorMath; @@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.ActionArea.VAnchor = VAnchor.Stretch; this.ActionArea.MinimumSize = new Vector2(0, titleText.Height); - var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme) + var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = editToolTipText ?? "Edit".Localize(), Name = helpArticle.Name + " Edit" diff --git a/MatterControlLib/CustomWidgets/InlineListItemEdit.cs b/MatterControlLib/CustomWidgets/InlineListItemEdit.cs index f80bcfe8a..398979d99 100644 --- a/MatterControlLib/CustomWidgets/InlineListItemEdit.cs +++ b/MatterControlLib/CustomWidgets/InlineListItemEdit.cs @@ -30,6 +30,7 @@ either expressed or implied, of the FreeBSD Project. using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; namespace MatterHackers.MatterControl.CustomWidgets @@ -41,7 +42,7 @@ namespace MatterHackers.MatterControl.CustomWidgets public InlineListItemEdit(string title, ThemeConfig theme, string automationName, bool boldFont = false) : base(title, theme, automationName, boldFont) { - var removeButton = new IconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16, theme.InvertIcons), theme) + var removeButton = new IconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Delete".Localize(), Visible = true, diff --git a/MatterControlLib/CustomWidgets/InlineStringEdit.cs b/MatterControlLib/CustomWidgets/InlineStringEdit.cs index 3898dcc2c..7d940f3f4 100644 --- a/MatterControlLib/CustomWidgets/InlineStringEdit.cs +++ b/MatterControlLib/CustomWidgets/InlineStringEdit.cs @@ -32,6 +32,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.PartPreviewWindow; using MatterHackers.MatterControl.PrintLibrary; @@ -73,7 +74,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.ActionArea.VAnchor = VAnchor.Stretch; this.ActionArea.MinimumSize = new Vector2(0, titleText.Height); - saveButton = new IconButton(StaticData.Instance.LoadIcon("fa-save_16.png", 16, 16, theme.InvertIcons), theme) + saveButton = new IconButton(StaticData.Instance.LoadIcon("fa-save_16.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Save".Localize(), Visible = false, @@ -104,7 +105,7 @@ namespace MatterHackers.MatterControl.CustomWidgets rightPanel = new FlowLayoutWidget(); - var icon = editable ? StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons) : new ImageBuffer(16, 16); + var icon = editable ? StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor) : new ImageBuffer(16, 16); editButton = new IconButton(icon, theme) { diff --git a/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs b/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs index 24696be1b..5bb2fd424 100644 --- a/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs +++ b/MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs @@ -34,6 +34,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.Library; using MatterHackers.VectorMath; @@ -59,7 +60,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { this.CloseChildren(); - var upbutton = new IconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "back.png"), 20, 20, theme.InvertIcons), theme) + var upbutton = new IconButton(StaticData.Instance.LoadIcon(Path.Combine("Library", "back.png"), 20, 20).SetToColor(theme.TextColor), theme) { VAnchor = VAnchor.Fit | VAnchor.Center, Enabled = currentContainer.Parent != null, diff --git a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs index 78c81b573..70edcc705 100644 --- a/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs +++ b/MatterControlLib/CustomWidgets/TreeView/TreeNode.cs @@ -36,6 +36,7 @@ using MatterHackers.Agg.Font; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.CustomWidgets @@ -513,8 +514,8 @@ namespace MatterHackers.MatterControl.CustomWidgets public TreeExpandWidget(ThemeConfig theme) { - arrowRight = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12, theme.InvertIcons); - arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12, theme.InvertIcons); + 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); placeholder = new ImageBuffer(16, 16); this.Margin = new BorderDouble(right: 4); diff --git a/MatterControlLib/DesignTools/PublicPropertyEditor.cs b/MatterControlLib/DesignTools/PublicPropertyEditor.cs index 973d28251..e4e411e6a 100644 --- a/MatterControlLib/DesignTools/PublicPropertyEditor.cs +++ b/MatterControlLib/DesignTools/PublicPropertyEditor.cs @@ -39,6 +39,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.DataConverters3D; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.DesignTools.EditableTypes; @@ -1093,7 +1094,7 @@ namespace MatterHackers.MatterControl.DesignTools public static GuiWidget GetUnlockRow(ThemeConfig theme, string url) { - var detailsLink = new TextIconButton("Unlock".Localize(), StaticData.Instance.LoadIcon("locked.png", 16, 16, theme.InvertIcons), theme) + var detailsLink = new TextIconButton("Unlock".Localize(), StaticData.Instance.LoadIcon("locked.png", 16, 16).SetToColor(theme.TextColor), theme) { Margin = 5, ToolTipText = "Visit MatterHackers.com to Purchase".Localize() @@ -1111,7 +1112,7 @@ namespace MatterHackers.MatterControl.DesignTools { if (context.item.GetType().GetCustomAttributes(typeof(WebPageLinkAttribute), true).FirstOrDefault() is WebPageLinkAttribute unlockLink) { - var detailsLink = new TextIconButton(unlockLink.ButtonName.Localize(), StaticData.Instance.LoadIcon("internet.png", 16, 16, theme.InvertIcons), theme) + var detailsLink = new TextIconButton(unlockLink.ButtonName.Localize(), StaticData.Instance.LoadIcon("internet.png", 16, 16).SetToColor(theme.TextColor), theme) { BackgroundColor = theme.MinimalShade, ToolTipText = unlockLink.Url, diff --git a/MatterControlLib/History/PrintHistoryEditor.cs b/MatterControlLib/History/PrintHistoryEditor.cs index dbb99f4b8..39019cfba 100644 --- a/MatterControlLib/History/PrintHistoryEditor.cs +++ b/MatterControlLib/History/PrintHistoryEditor.cs @@ -34,6 +34,7 @@ using Markdig.Agg; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.DataStorage; using MatterHackers.MatterControl.PartPreviewWindow; @@ -114,9 +115,9 @@ namespace MatterHackers.MatterControl.PrintHistory var size = (int)(buttonFontSize * GuiWidget.DeviceScale); - var star = StaticData.Instance.LoadIcon("star.png", size, size, theme.InvertIcons); - var openStar = StaticData.Instance.LoadIcon("open_star.png", size, size, theme.InvertIcons); - var failure = StaticData.Instance.LoadIcon("failure.png", size, size, theme.InvertIcons); + 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); content.AddChild(new GuiWidget(size, 1)); diff --git a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs index 308abd562..d93fbe022 100644 --- a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs +++ b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs @@ -189,7 +189,7 @@ namespace MatterHackers.MatterControl { theme = AppContext.Theme; - defaultIcon = StaticData.Instance.LoadIcon("mesh.png", theme.InvertIcons); //.AnyAlphaToColor(theme.PrimaryAccentColor); + defaultIcon = StaticData.Instance.LoadIcon("mesh.png").SetToColor(theme.TextColor); //.AnyAlphaToColor(theme.PrimaryAccentColor); } return defaultIcon; diff --git a/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs b/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs index aab21f276..eff834c86 100644 --- a/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs +++ b/MatterControlLib/Library/Providers/Printer/SDCardContainer.cs @@ -36,6 +36,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; @@ -90,8 +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"), - ApplicationController.Instance.Theme.InvertIcons)); + Path.Combine((width > 50 || height > 50) ? "icon_sd_card_115x115.png" : "icon_sd_card_50x50.png")).SetToColor(ApplicationController.Instance.Theme.TextColor)); } public override void Load() diff --git a/MatterControlLib/Library/Widgets/CloneSettingsPage.cs b/MatterControlLib/Library/Widgets/CloneSettingsPage.cs index 3ef5cec41..c5bc524eb 100644 --- a/MatterControlLib/Library/Widgets/CloneSettingsPage.cs +++ b/MatterControlLib/Library/Widgets/CloneSettingsPage.cs @@ -32,6 +32,7 @@ using System.IO; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.SlicerConfiguration; @@ -75,7 +76,7 @@ namespace MatterHackers.MatterControl.PrintLibrary // Must come before pathButton.Click definition RadioButton copyAndCalibrateOption = null; - var openButton = new IconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16, theme.InvertIcons), theme) + var openButton = new IconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(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 0aa1a5c76..0ad461abc 100644 --- a/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs +++ b/MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs @@ -32,6 +32,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.CustomWidgets @@ -54,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, theme.InvertIcons); - arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12, theme.InvertIcons); + 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); imageButton = new IconButton(arrowRight, theme) { diff --git a/MatterControlLib/Library/Widgets/LibraryWidget.cs b/MatterControlLib/Library/Widgets/LibraryWidget.cs index 8644eae58..8c494b50e 100644 --- a/MatterControlLib/Library/Widgets/LibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/LibraryWidget.cs @@ -226,7 +226,7 @@ namespace MatterHackers.MatterControl.PrintLibrary public static GuiWidget CreateSortingMenuButton(ThemeConfig theme, LibraryListView libraryView) { var viewOptionsButton = new PopupMenuButton( - new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32, theme.InvertIcons)), theme) + new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor)), theme) { AlignToRightEdge = true, Name = "Print Library View Options", @@ -295,7 +295,7 @@ namespace MatterHackers.MatterControl.PrintLibrary Func containersShown) { var viewMenuButton = new PopupMenuButton( - new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32, theme.InvertIcons)) + new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32).SetToColor(theme.TextColor)) { // VAnchor = VAnchor.Center }, @@ -587,7 +587,7 @@ namespace MatterHackers.MatterControl.PrintLibrary { menuActions.Add(new LibraryAction(ActionScope.ListView) { - Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16, ApplicationController.Instance.MenuTheme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor), Title = "Add".Localize(), ToolTipText = "Add an.stl, .obj, .amf, .gcode or.zip file to the Library".Localize(), Action = (selectedLibraryItems, listView) => @@ -615,7 +615,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListView) { Title = "Create Folder".Localize() + "...", - Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16, ApplicationController.Instance.MenuTheme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { DialogWindow.Show( @@ -725,7 +725,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Open".Localize(), - Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { listView.SelectedItems.FirstOrDefault()?.OnDoubleClick(); @@ -754,7 +754,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Open a copy".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { ApplicationController.Instance.OpenIntoNewTab(selectedLibraryItems); @@ -774,7 +774,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Add to Bed".Localize(), - Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { var activeContext = ApplicationController.Instance.DragDropData; @@ -820,7 +820,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { ApplicationController.Instance.ExportLibraryItems(libraryView.SelectedItems.Select(item => item.Model)); @@ -837,7 +837,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Share".Localize() + "...", - Icon = StaticData.Instance.LoadIcon("share.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("share.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { // Previously - shareFromLibraryButton_Click @@ -861,7 +861,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Rename".Localize(), - Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { if (libraryView.SelectedItems.Count == 1) @@ -925,7 +925,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Show in Explorer".Localize(), - // Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16, theme.InvertIcons), + // Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), Action = (selectedLibraryItems, listView) => { if (AggContext.OperatingSystem == OSType.Windows) @@ -965,7 +965,7 @@ namespace MatterHackers.MatterControl.PrintLibrary menuActions.Add(new LibraryAction(ActionScope.ListItem) { Title = "Remove".Localize(), - Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(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 00f0b5f24..178dd8d25 100644 --- a/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs +++ b/MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs @@ -35,6 +35,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.Library; using MatterHackers.MatterControl.PartPreviewWindow; using MatterHackers.MatterControl.PrintQueue; @@ -64,7 +65,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.thumbWidth = width; this.thumbHeight = height; - overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32, theme.InvertIcons); + overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).SetToColor(theme.TextColor); } public bool HasMenu { get; set; } = false; diff --git a/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs b/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs index 8c17c6119..f207d3993 100644 --- a/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs +++ b/MatterControlLib/Library/Widgets/PrintLibraryWidget.cs @@ -35,6 +35,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.Library; @@ -92,7 +93,7 @@ namespace MatterHackers.MatterControl.PrintLibrary allControls.AddChild(navBar); theme.ApplyBottomBorder(navBar); - var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32, theme.InvertIcons), theme) + var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor), theme) { HAnchor = HAnchor.Stretch, VAnchor = VAnchor.Fit, diff --git a/MatterControlLib/Library/Widgets/SearchableTreePanel.cs b/MatterControlLib/Library/Widgets/SearchableTreePanel.cs index a5a9980e4..dc81bb5f1 100644 --- a/MatterControlLib/Library/Widgets/SearchableTreePanel.cs +++ b/MatterControlLib/Library/Widgets/SearchableTreePanel.cs @@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.PrintLibrary this.theme = theme; this.TreeLoaded = false; - var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16, theme.InvertIcons).AjustAlpha(0.3); + var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor).AjustAlpha(0.3); searchBox = new TextEditWithInlineCancel(theme) { diff --git a/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs index 2c5dbadf4..daef87665 100644 --- a/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs @@ -33,6 +33,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage; using MatterHackers.MatterControl.CustomWidgets; @@ -60,7 +61,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var buttonGroup = new ObservableCollection(); - speedsButton = new RadioIconButton(StaticData.Instance.LoadIcon("speeds.png", 16, 16, theme.InvertIcons), theme) + speedsButton = new RadioIconButton(StaticData.Instance.LoadIcon("speeds.png", 16, 16).SetToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "Speeds Button", @@ -73,7 +74,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonPanel.AddChild(speedsButton); - materialsButton = new RadioIconButton(StaticData.Instance.LoadIcon("materials.png", 16, 16, theme.InvertIcons), theme) + materialsButton = new RadioIconButton(StaticData.Instance.LoadIcon("materials.png", 16, 16).SetToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "Materials Button", @@ -86,7 +87,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow buttonPanel.AddChild(materialsButton); - noColorButton = new RadioIconButton(StaticData.Instance.LoadIcon("no-color.png", 16, 16, theme.InvertIcons), theme) + noColorButton = new RadioIconButton(StaticData.Instance.LoadIcon("no-color.png", 16, 16).SetToColor(theme.TextColor), theme) { SiblingRadioButtonList = buttonGroup, Name = "No Color Button", diff --git a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs index 35c55879e..5f148dd36 100644 --- a/MatterControlLib/PartPreviewWindow/ItemColorButton.cs +++ b/MatterControlLib/PartPreviewWindow/ItemColorButton.cs @@ -34,6 +34,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.DataConverters3D; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.CustomWidgets.ColorPicker; @@ -208,7 +209,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow picker.SetColorWithoutChangeEvent(Color.White); }; - var selectButton = rightContent.AddChild(new TextIconButton("Select".Localize(), StaticData.Instance.LoadIcon("eye_dropper.png", 16, 16, theme.InvertIcons), theme) + var selectButton = rightContent.AddChild(new TextIconButton("Select".Localize(), StaticData.Instance.LoadIcon("eye_dropper.png", 16, 16).SetToColor(theme.TextColor), theme) { Margin = 0, HAnchor = HAnchor.Fit | HAnchor.Left, diff --git a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs index 44ae81e34..c31798030 100644 --- a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs +++ b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs @@ -39,6 +39,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.DataConverters3D; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.Library; @@ -625,7 +626,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; themePanel.AddChild( - new ImageWidget(StaticData.Instance.LoadIcon("theme.png", 16, 16, theme.InvertIcons), false) + new ImageWidget(StaticData.Instance.LoadIcon("theme.png", 16, 16), false) { HAnchor = HAnchor.Center | HAnchor.Absolute, VAnchor = VAnchor.Center | VAnchor.Absolute, @@ -785,7 +786,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; moveButtons.AddChild(textWidget); var buttonSize = 24 * DeviceScale; - var moveLeftButton = new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14, theme.InvertIcons).MirrorX(), theme) + var moveLeftButton = new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).SetToColor(theme.TextColor).MirrorX(), theme) { Width = buttonSize, Height = buttonSize, @@ -801,7 +802,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; moveButtons.AddChild(moveLeftButton); - var moveRightButton = new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14, theme.InvertIcons), theme) + var moveRightButton = new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 14, 14).SetToColor(theme.TextColor), theme) { Width = buttonSize, Height = buttonSize, @@ -855,7 +856,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow tabControl, new PartTabPage(workspace, theme, ""), theme, - StaticData.Instance.LoadIcon("cube.png", 16, 16, theme.InvertIcons)) + StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor)) { Name = "newPart" + tabControl.AllTabs.Count(), }; diff --git a/MatterControlLib/PartPreviewWindow/PartTabPage.cs b/MatterControlLib/PartPreviewWindow/PartTabPage.cs index a2035160f..14a254030 100644 --- a/MatterControlLib/PartPreviewWindow/PartTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/PartTabPage.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.Library; @@ -179,8 +180,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow favoritesBar.VerticalScrollBar.Show = ScrollBar.ShowState.Never; - var expandedImage = StaticData.Instance.LoadIcon("expand.png", 16, 16, theme.InvertIcons); - var collapsedImage = StaticData.Instance.LoadIcon("collapse.png", 16, 16, theme.InvertIcons); + 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 expandBarButton = new IconButton(expanded ? collapsedImage : expandedImage, theme) { diff --git a/MatterControlLib/PartPreviewWindow/PopupMenu.cs b/MatterControlLib/PartPreviewWindow/PopupMenu.cs index f1cca55d3..560e8782e 100644 --- a/MatterControlLib/PartPreviewWindow/PopupMenu.cs +++ b/MatterControlLib/PartPreviewWindow/PopupMenu.cs @@ -165,7 +165,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow public CheckboxMenuItem(GuiWidget widget, ThemeConfig theme) : base(widget, theme) { - faChecked = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16, theme.InvertIcons); + faChecked = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16).SetToColor(theme.TextColor); } public override void OnLoad(EventArgs args) diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs index 018e39d70..7415a068f 100644 --- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs @@ -32,6 +32,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.CustomWidgets; @@ -688,7 +689,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // add in the move up button var babyStepAmount = .02; - var upButton = babySteppingControls.AddChild(new IconButton(StaticData.Instance.LoadIcon("Up Arrow.png", 32, 32, theme.InvertIcons), theme) + var upButton = babySteppingControls.AddChild(new IconButton(StaticData.Instance.LoadIcon("Up Arrow.png", 32, 32).SetToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, VAnchor = VAnchor.Absolute, @@ -727,7 +728,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }); // add in the move down button - var downButton = babySteppingControls.AddChild(new IconButton(StaticData.Instance.LoadIcon("Down Arrow.png", 32, 32, theme.InvertIcons), theme) + var downButton = babySteppingControls.AddChild(new IconButton(StaticData.Instance.LoadIcon("Down Arrow.png", 32, 32).SetToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, VAnchor = VAnchor.Absolute, @@ -895,7 +896,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - timeContainer.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("fa-clock_24.png", 24, 24, theme.InvertIcons)) + timeContainer.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("fa-clock_24.png", 24, 24).SetToColor(theme.TextColor)) { VAnchor = VAnchor.Center }); diff --git a/MatterControlLib/PartPreviewWindow/RenderOptionsButton.cs b/MatterControlLib/PartPreviewWindow/RenderOptionsButton.cs index 0d7800ef4..32402b720 100644 --- a/MatterControlLib/PartPreviewWindow/RenderOptionsButton.cs +++ b/MatterControlLib/PartPreviewWindow/RenderOptionsButton.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.CustomWidgets; namespace MatterHackers.MatterControl.PartPreviewWindow @@ -43,7 +44,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.HAnchor = HAnchor.Fit; this.VAnchor = VAnchor.Fit; - this.AddChild(new IconButton(StaticData.Instance.LoadIcon("web.png", 16, 16, theme.InvertIcons), theme) + this.AddChild(new IconButton(StaticData.Instance.LoadIcon("web.png", 16, 16), theme) { Selectable = false }); diff --git a/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs b/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs index ad510ab50..eef73355e 100644 --- a/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs +++ b/MatterControlLib/PartPreviewWindow/RunningTaskRow.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.VectorMath; @@ -225,7 +226,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { if (string.IsNullOrEmpty(buttonText)) { - return new IconButton(StaticData.Instance.LoadIcon(iconFilename, 12, 12, theme.InvertIcons), theme) + return new IconButton(StaticData.Instance.LoadIcon(iconFilename, 12, 12).SetToColor(theme.TextColor), theme) { Margin = theme.ButtonSpacing, Enabled = clickAction != null, @@ -237,7 +238,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var oldSize = theme.DefaultFontSize; theme.DefaultFontSize = 8; - var pauseButton = new TextIconButton(buttonText, StaticData.Instance.LoadIcon(iconFilename, 12, 12, theme.InvertIcons), theme) + var pauseButton = new TextIconButton(buttonText, StaticData.Instance.LoadIcon(iconFilename, 12, 12).SetToColor(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 38e476fe7..c158efb0d 100644 --- a/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs +++ b/MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.VectorMath; namespace MatterHackers.MatterControl.PartPreviewWindow @@ -49,7 +50,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.theme = theme; this.Padding = new BorderDouble(3, 0); - this.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("wait.png", 14, 14, theme.InvertIcons)) + this.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("wait.png", 14, 14).SetToColor(theme.TextColor)) { VAnchor = VAnchor.Center, HAnchor = HAnchor.Left diff --git a/MatterControlLib/PartPreviewWindow/SaveAsPage.cs b/MatterControlLib/PartPreviewWindow/SaveAsPage.cs index d70b87f0a..5fa3e4951 100644 --- a/MatterControlLib/PartPreviewWindow/SaveAsPage.cs +++ b/MatterControlLib/PartPreviewWindow/SaveAsPage.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.Library; @@ -73,7 +74,7 @@ namespace MatterHackers.MatterControl }; contentRow.AddChild(itemNameWidget); - var icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16, ApplicationController.Instance.MenuTheme.InvertIcons); + var icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).SetToColor(ApplicationController.Instance.MenuTheme.TextColor); var isEnabled = false; if (librarySelectorWidget.ActiveContainer is ILibraryWritableContainer writableContainer) { @@ -96,7 +97,7 @@ namespace MatterHackers.MatterControl createFolderButton.Name = "Create Folder In Button"; folderButtonRow.AddChild(createFolderButton); - var refreshButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16, theme.InvertIcons), theme) + var refreshButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Refresh Folder".Localize(), Enabled = isEnabled, diff --git a/MatterControlLib/PartPreviewWindow/Tabs.cs b/MatterControlLib/PartPreviewWindow/Tabs.cs index a8afb62c6..54e96d8ce 100644 --- a/MatterControlLib/PartPreviewWindow/Tabs.cs +++ b/MatterControlLib/PartPreviewWindow/Tabs.cs @@ -35,6 +35,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.Agg.VertexSource; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.VectorMath; @@ -267,7 +268,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.TabBar.ActionArea.AddChild(tabTrailer); - var plusTabButton = new NewTabButton(StaticData.Instance.LoadIcon("fa-plus_12.png", 12, 12, theme.InvertIcons), theme) + var plusTabButton = new NewTabButton(StaticData.Instance.LoadIcon("fa-plus_12.png", 12, 12).SetToColor(theme.TextColor), theme) { Height = 20 * GuiWidget.DeviceScale, }; diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs index d2e7fc75e..987a0ac14 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs @@ -43,6 +43,7 @@ namespace MatterHackers.MatterControl.DesignTools using CustomWidgets; using DataConverters3D; using MatterHackers.Agg.Platform; + using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.DataStorage; public class ImageEditor : IObject3DEditor @@ -78,7 +79,7 @@ namespace MatterHackers.MatterControl.DesignTools VAnchor = VAnchor.Center }; searchRow.AddChild(searchField); - var searchButton = new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16, theme.InvertIcons), theme) + var searchButton = new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Search".Localize(), }; diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs index 60ab40e4e..77b5208f1 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs @@ -36,6 +36,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.ImageProcessing; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrintLibrary; @@ -186,7 +187,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private static ImageBuffer CreateOverflowIcon(ThemeConfig theme) { - return StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32, theme.InvertIcons); + return StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).SetToColor(theme.TextColor); } } } diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs index 2cc9b73ed..4a88221e9 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs @@ -34,6 +34,7 @@ using System.Threading; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.Library; @@ -221,7 +222,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.CloseMenu(); }; }, - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(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 14929247e..58667534b 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 TextIconButton( "Reset".Localize(), - StaticData.Instance.LoadIcon("e_stop.png", 14, 14, theme.InvertIcons), + StaticData.Instance.LoadIcon("e_stop.png", 14, 14).SetToColor(theme.TextColor), theme) { ToolTipText = "Reboots the firmware on the controller".Localize(), @@ -314,7 +314,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { new NamedAction() { - Icon = StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("memory_16x16.png", 16, 16).SetToColor(theme.TextColor), Title = "Configure EEProm".Localize(), Action = configureEePromButton_Click, IsEnabled = () => printer.Connection.IsConnected @@ -369,7 +369,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { ApplicationController.Instance.ExportAsMatterControlConfig(printer); }), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor), }); menuActions.Add(new ActionSeparator()); menuActions.Add(new NamedAction() @@ -382,7 +382,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow DialogWindow.Show(new PrinterCalibrationWizard(printer, theme)); }); }), - Icon = StaticData.Instance.LoadIcon("compass.png", 16, 16, theme.InvertIcons) + Icon = StaticData.Instance.LoadIcon("compass.png", 16, 16).SetToColor(theme.TextColor) }); menuActions.Add(new ActionSeparator()); menuActions.Add(new NamedAction() @@ -392,7 +392,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { DialogWindow.Show(new UpdateSettingsPage(printer)); }, - Icon = StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16, theme.InvertIcons) + Icon = StaticData.Instance.LoadIcon("fa-refresh_14.png", 16, 16).SetToColor(theme.TextColor) }); menuActions.Add(new NamedAction() { diff --git a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs index 3e357a0c4..be39f2479 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrinterCommunication; @@ -55,7 +56,7 @@ namespace MatterHackers.MatterControl.ActionBar connectButton = new TextIconButton( "Connect".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14, theme.InvertIcons), + StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(theme.TextColor), theme) { Name = "Connect to printer button", @@ -76,7 +77,7 @@ namespace MatterHackers.MatterControl.ActionBar // add the cancel stop button cancelConnectButton = new TextIconButton( "Cancel".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14, theme.InvertIcons), + StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(theme.TextColor), theme) { ToolTipText = "Stop trying to connect to the printer.".Localize(), @@ -93,7 +94,7 @@ namespace MatterHackers.MatterControl.ActionBar disconnectButton = new TextIconButton( "Disconnect".Localize(), - StaticData.Instance.LoadIcon("connect.png", 14, 14, theme.InvertIcons), + StaticData.Instance.LoadIcon("connect.png", 14, 14).SetToColor(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 87f36832e..58b985e98 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs @@ -32,6 +32,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; @@ -46,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, theme.InvertIcons); - var warningImage = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16, theme.InvertIcons); + 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 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 f28850cc7..4ad2cffca 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow titleAndTreeView.AddChild(treeView); workspaceName.ActionArea.AddChild( - new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12, theme.InvertIcons), theme) + new IconButton(StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).SetToColor(theme.TextColor), theme) { Enabled = false }, @@ -475,7 +475,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var ySpacing = 40; // put in the bed and build volume buttons - var bedButton = new RadioIconButton(StaticData.Instance.LoadIcon("bed.png", 16, 16, theme.InvertIcons), theme) + var bedButton = new RadioIconButton(StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "Bed Button", ToolTipText = "Show Print Bed".Localize(), @@ -491,7 +491,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow bool BuildHeightValid() => sceneContext.BuildHeight > 0; - var printAreaButton = new RadioIconButton(StaticData.Instance.LoadIcon("print_area.png", 16, 16, theme.InvertIcons), theme) + var printAreaButton = new RadioIconButton(StaticData.Instance.LoadIcon("print_area.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "Bed Button", ToolTipText = BuildHeightValid() ? "Show Print Area".Localize() : "Define printer build height to enable", diff --git a/MatterControlLib/PartPreviewWindow/ViewControls3D.cs b/MatterControlLib/PartPreviewWindow/ViewControls3D.cs index 304464358..6d3abdf00 100644 --- a/MatterControlLib/PartPreviewWindow/ViewControls3D.cs +++ b/MatterControlLib/PartPreviewWindow/ViewControls3D.cs @@ -37,6 +37,7 @@ using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.DataConverters3D; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.DataStorage; @@ -134,7 +135,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(new ToolbarSeparator(theme.GetBorderColor(50), theme.SeparatorMargin)); - bedMenuButton = new PopupMenuButton(StaticData.Instance.LoadIcon("bed.png", 16, 16, theme.InvertIcons), theme) + bedMenuButton = new PopupMenuButton(StaticData.Instance.LoadIcon("bed.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "Bed Options Menu", ToolTipText = "Bed", @@ -154,7 +155,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.AddChild(new ToolbarSeparator(theme.GetBorderColor(50), theme.SeparatorMargin)); - undoButton = new IconButton(StaticData.Instance.LoadIcon("Undo_grey_16x.png", 16, 16, theme.InvertIcons), theme) + undoButton = new IconButton(StaticData.Instance.LoadIcon("Undo_grey_16x.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "3D View Undo", ToolTipText = "Undo".Localize(), @@ -169,7 +170,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }; this.AddChild(undoButton); - redoButton = new IconButton(StaticData.Instance.LoadIcon("Redo_grey_16x.png", 16, 16, theme.InvertIcons), theme) + redoButton = new IconButton(StaticData.Instance.LoadIcon("Redo_grey_16x.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "3D View Redo", Margin = theme.ButtonSpacing, @@ -471,7 +472,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { ID = "Export", Title = "Export".Localize(), - Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, menuTheme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(menuTheme.TextColor), Action = () => { ApplicationController.Instance.ExportLibraryItems( @@ -512,7 +513,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private IconButton CreateOpenButton(ThemeConfig theme) { - var openButton = new IconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16, theme.InvertIcons), theme) + var openButton = new IconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(theme.TextColor), theme) { Margin = theme.ButtonSpacing, ToolTipText = "Open File".Localize(), @@ -581,7 +582,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { var buttonView = new TextIconButton( "", - StaticData.Instance.LoadIcon("cube_add.png", 16, 16, theme.InvertIcons), + StaticData.Instance.LoadIcon("cube_add.png", 16, 16).SetToColor(theme.TextColor), theme); // Remove right Padding for drop style @@ -699,7 +700,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow minimumSupportHeight = sceneContext.Printer.Settings.GetValue(SettingsKey.layer_height) / 2; } - toggleSupportButton = new PopupMenuButton(StaticData.Instance.LoadIcon("support.png", 16, 16, theme.InvertIcons), theme) + toggleSupportButton = new PopupMenuButton(StaticData.Instance.LoadIcon("support.png", 16, 16).SetToColor(theme.TextColor), theme) { Name = "Support SplitButton", ToolTipText = "Generate Support".Localize(), @@ -722,7 +723,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return theme.CreateSplitButton(new SplitButtonParams() { ButtonName = "Save", - Icon = StaticData.Instance.LoadIcon("save_grey_16x.png", 16, 16, theme.InvertIcons), + Icon = StaticData.Instance.LoadIcon("save_grey_16x.png", 16, 16).SetToColor(theme.TextColor), ButtonAction = (menuButton) => { ApplicationController.Instance.Tasks.Execute("Saving".Localize(), sceneContext.Printer, async (progress, cancellationToken) => @@ -767,7 +768,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } })); }); - var export = popupMenu.CreateMenuItem("Export".Localize(), StaticData.Instance.LoadIcon("cube_export.png", 16, 16, theme.InvertIcons)); + var export = popupMenu.CreateMenuItem("Export".Localize(), StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor)); export.Click += (s, e) => UiThread.RunOnIdle(() => { ApplicationController.Instance.ExportLibraryItems( diff --git a/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs b/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs index 1b4a7f747..eea6472d6 100644 --- a/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs +++ b/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs @@ -33,6 +33,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.RenderOpenGl; @@ -56,12 +57,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewIcons = new Dictionary() { - [RenderTypes.Shaded] = StaticData.Instance.LoadIcon("view_shaded.png", 16, 16, theme.InvertIcons), - [RenderTypes.Outlines] = StaticData.Instance.LoadIcon("view_outlines.png", 16, 16, theme.InvertIcons), - [RenderTypes.Polygons] = StaticData.Instance.LoadIcon("view_polygons.png", 16, 16, theme.InvertIcons), - [RenderTypes.NonManifold] = StaticData.Instance.LoadIcon("view_polygons.png", 16, 16, theme.InvertIcons), - [RenderTypes.Materials] = StaticData.Instance.LoadIcon("view_materials.png", 16, 16, theme.InvertIcons), - [RenderTypes.Overhang] = StaticData.Instance.LoadIcon("view_overhang.png", 16, 16, theme.InvertIcons), + [RenderTypes.Shaded] = StaticData.Instance.LoadIcon("view_shaded.png", 16, 16), + [RenderTypes.Outlines] = StaticData.Instance.LoadIcon("view_outlines.png", 16, 16), + [RenderTypes.Polygons] = StaticData.Instance.LoadIcon("view_polygons.png", 16, 16), + [RenderTypes.NonManifold] = StaticData.Instance.LoadIcon("view_polygons.png", 16, 16), + [RenderTypes.Materials] = StaticData.Instance.LoadIcon("view_materials.png", 16, 16), + [RenderTypes.Overhang] = StaticData.Instance.LoadIcon("view_overhang.png", 16, 16), }; this.AddChild(iconButton = new TextIconButton("View".Localize(), viewIcons[sceneContext.ViewState.RenderType], theme) diff --git a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs index a78513f30..c86d6763c 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.CustomWidgets; @@ -58,7 +59,7 @@ namespace MatterHackers.MatterControl.PrinterControls null, theme)); - var runWizardButton = new IconButton(StaticData.Instance.LoadIcon("compass.png", 16, 16, theme.InvertIcons), theme) + var runWizardButton = new IconButton(StaticData.Instance.LoadIcon("compass.png", 16, 16).SetToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, diff --git a/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs b/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs index ac9c8dc49..2dc17b04c 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs @@ -32,6 +32,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.SlicerConfiguration; @@ -106,7 +107,7 @@ namespace MatterHackers.MatterControl.PrinterControls { var widget = new MacroControls(printer, theme); - var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme); + var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(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 83bb6a058..a984a817c 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs @@ -32,6 +32,7 @@ using System.Collections.Generic; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.DataStorage; @@ -83,7 +84,7 @@ namespace MatterHackers.MatterControl.PrinterControls { var widget = new MovementControls(printer, new XYZColors(theme), theme); - var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme); + var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme); editButton.Click += (s, e) => widget.EditOptions(); return new SectionWidget( @@ -129,7 +130,7 @@ namespace MatterHackers.MatterControl.PrinterControls Margin = new BorderDouble(bottom: 10) }; - var homeIcon = new IconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16, theme.InvertIcons), theme) + var homeIcon = new IconButton(StaticData.Instance.LoadIcon("fa-home_16.png", 16, 16).SetToColor(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 63cb928e4..d08d4381f 100644 --- a/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs +++ b/MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs @@ -33,6 +33,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling; using MatterHackers.MatterControl.CustomWidgets; @@ -167,7 +168,7 @@ namespace MatterHackers.MatterControl MinimumSize = new Vector2(125, 0) }); - var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme) + var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(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 8b4acf41d..86d08530b 100644 --- a/MatterControlLib/PrinterControls/JogControls.cs +++ b/MatterControlLib/PrinterControls/JogControls.cs @@ -33,6 +33,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrinterCommunication; @@ -286,7 +287,7 @@ namespace MatterHackers.MatterControl Margin = new BorderDouble(left: 10) }; - keyboardImage = new IconButton(StaticData.Instance.LoadIcon("hot_key_small_white.png", 19, 12, theme.InvertIcons), theme) + keyboardImage = new IconButton(StaticData.Instance.LoadIcon("hot_key_small_white.png", 19, 12).SetToColor(theme.TextColor), theme) { HAnchor = HAnchor.Center, Margin = new BorderDouble(5), diff --git a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs index a16e1b5f2..dadf10c9f 100644 --- a/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs +++ b/MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs @@ -34,6 +34,7 @@ using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.ConfigurationPage; using MatterHackers.MatterControl.CustomWidgets; @@ -103,7 +104,7 @@ namespace MatterHackers.MatterControl VAnchor = VAnchor.Fit, }; - var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16, theme.InvertIcons); + var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor); var generalSection = new SectionWidget("General".Localize(), generalPanel, theme, expandingContent: false) { @@ -186,7 +187,7 @@ namespace MatterHackers.MatterControl } }, configureNotificationsButton, - StaticData.Instance.LoadIcon("notify-24x24.png", 16, 16, theme.InvertIcons)), + StaticData.Instance.LoadIcon("notify-24x24.png", 16, 16).SetToColor(theme.TextColor)), generalPanel); // LanguageControl @@ -391,7 +392,7 @@ namespace MatterHackers.MatterControl true, false); - var openCacheButton = new IconButton(StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16, theme.InvertIcons), theme) + var openCacheButton = new IconButton(StaticData.Instance.LoadIcon("fa-link_16.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Open Folder".Localize(), }; @@ -407,7 +408,7 @@ namespace MatterHackers.MatterControl theme), advancedPanel); - var clearCacheButton = new HoverIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16, theme.InvertIcons), theme) + var clearCacheButton = new HoverIconButton(StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Clear Cache".Localize(), }; @@ -424,7 +425,7 @@ namespace MatterHackers.MatterControl advancedPanel); #if DEBUG - var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16, theme.InvertIcons); + var configureIcon = StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor); var configurePluginsButton = new IconButton(configureIcon, theme) { @@ -598,7 +599,7 @@ namespace MatterHackers.MatterControl Margin = 0 }; - themeSection.SetNonExpandableIcon(StaticData.Instance.LoadIcon("theme.png", 16, 16, theme.InvertIcons)); + themeSection.SetNonExpandableIcon(StaticData.Instance.LoadIcon("theme.png", 16, 16)); return themeSection; } diff --git a/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs b/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs index 9cbda5a32..4bbeae063 100644 --- a/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs +++ b/MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs @@ -31,6 +31,7 @@ using System; using System.Linq; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrintLibrary; @@ -160,7 +161,7 @@ namespace MatterHackers.MatterControl Text = "Printers".Localize(), HAnchor = HAnchor.Stretch, AlwaysExpandable = true, - Image = StaticData.Instance.LoadIcon("printer.png", 16, 16, theme.InvertIcons) + Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).SetToColor(theme.TextColor) }; rootPrintersNode.TreeView = treeView; treeView.AddChild(rootPrintersNode); diff --git a/MatterControlLib/SetupWizard/TourPopover.cs b/MatterControlLib/SetupWizard/TourPopover.cs index 7200c84e0..611af5a93 100644 --- a/MatterControlLib/SetupWizard/TourPopover.cs +++ b/MatterControlLib/SetupWizard/TourPopover.cs @@ -31,6 +31,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PartPreviewWindow; @@ -262,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, theme.InvertIcons); + var rightArrow = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 10, 10).SetToColor(theme.TextColor); if (arrowDirection == ArrowDirection.Right) { diff --git a/MatterControlLib/SetupWizard/WizardStageRow.cs b/MatterControlLib/SetupWizard/WizardStageRow.cs index 775093d2e..6c1eca91a 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, theme.InvertIcons).AjustAlpha(0.3); - recommendedIcon = StaticData.Instance.LoadIcon("SettingsGroupWarning_16x.png", 16, 16, theme.InvertIcons); - setupIcon = StaticData.Instance.LoadIcon("SettingsGroupError_16x.png", 16, 16, theme.InvertIcons); - hoverIcon = StaticData.Instance.LoadIcon("expand.png", 16, 16, theme.InvertIcons); + 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); } public bool Active { get; set; } diff --git a/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs b/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs index 1f47074dd..6d78f6c3a 100644 --- a/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs +++ b/MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs @@ -35,6 +35,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.Agg.VertexSource; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.VectorMath; @@ -100,7 +101,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration Name = "Preset Pulldown Container" }; - editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme) + editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) { ToolTipText = "Edit Selected Setting".Localize(), Enabled = dropDownList.SelectedIndex != -1, diff --git a/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs index 4e32411dd..fd0a3308e 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs @@ -31,6 +31,7 @@ using System; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.PrinterCommunication; @@ -106,7 +107,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (ShowPortWizardButton) { - var configureIcon = new IconButton(StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16, theme.InvertIcons), theme) + var configureIcon = new IconButton(StaticData.Instance.LoadIcon("fa-cog_16.png", 16, 16).SetToColor(theme.TextColor), theme) { VAnchor = VAnchor.Center, Margin = theme.ButtonSpacing, diff --git a/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs b/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs index d9ed5a050..007ce27d6 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs @@ -35,6 +35,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.Image; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.MatterControl.DesignTools; using MatterHackers.VectorMath; @@ -229,9 +230,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (enumDisplayAttibute.IconWidth > 0) { // If the attribute allows invert, use the theme.InvertIcons state - bool invertIcons = enumDisplayAttibute.InvertIcons ? theme.InvertIcons : false; - - iconImage = StaticData.Instance.LoadIcon(iconPath, enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight, invertIcons); + iconImage = StaticData.Instance.LoadIcon(iconPath, enumDisplayAttibute.IconWidth, enumDisplayAttibute.IconHeight).SetToColor(theme.TextColor); } else { diff --git a/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs b/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs index d0f54f9c3..492d570b4 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs @@ -11,6 +11,7 @@ using MatterHackers.SerialPortCommunication.FrostedSerial; using Zeroconf; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.Agg.Platform; +using MatterHackers.ImageProcessing; namespace MatterHackers.MatterControl.SlicerConfiguration { @@ -64,7 +65,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration var widget = new FlowLayoutWidget(); widget.AddChild(dropdownList); - refreshButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14, theme.InvertIcons), theme) + refreshButton = new IconButton(StaticData.Instance.LoadIcon("fa-refresh_14.png", 14, 14).SetToColor(theme.TextColor), theme) { Margin = new BorderDouble(left: 5) }; diff --git a/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs b/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs index fff047b90..44fbe471a 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs @@ -32,6 +32,7 @@ using System.Collections.Generic; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl.CustomWidgets; namespace MatterHackers.MatterControl.SlicerConfiguration @@ -95,7 +96,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.Content.AddChild(inlineEdit); } - var addItem = new IconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18, theme.InvertIcons), theme) + var addItem = new IconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).SetToColor(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 22cf48f0e..2239fd6b6 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs @@ -32,6 +32,7 @@ using Markdig.Agg; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.Localizations; using MatterHackers.MatterControl.CustomWidgets; @@ -50,7 +51,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration public override void Initialize(int tabIndex) { - var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16, theme.InvertIcons), theme) + var editButton = new IconButton(StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor), theme) { VAnchor = VAnchor.Top, ToolTipText = "Edit".Localize(), diff --git a/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs b/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs index 86aa69c8c..ae748d2a3 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs @@ -6,6 +6,7 @@ using Markdig.Syntax; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; +using MatterHackers.ImageProcessing; using MatterHackers.MatterControl; namespace Markdig.Renderers.Agg @@ -39,7 +40,7 @@ namespace Markdig.Renderers.Agg this.VAnchor = VAnchor.Fit; this.HAnchor = HAnchor.Stretch; - base.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("bullet.png", 16, 16, theme.InvertIcons)) + base.AddChild(new ImageWidget(StaticData.Instance.LoadIcon("bullet.png", 16, 16).SetToColor(theme.TextColor)) { Margin = new BorderDouble(top: 1, left: 10), VAnchor = VAnchor.Top, diff --git a/Program.cs b/Program.cs index 2c346338f..554219494 100644 --- a/Program.cs +++ b/Program.cs @@ -311,7 +311,6 @@ namespace MatterHackers.MatterControl var theme = ApplicationController.Instance.Theme; SingleWindowProvider.SetWindowTheme(theme.TextColor, theme.DefaultFontSize - 1, - theme.InvertIcons, () => theme.CreateSmallResetButton(), theme.ToolbarPadding, theme.TabBarBackground, diff --git a/StaticData/Icons/Pushpin.png b/StaticData/Icons/Pushpin.png new file mode 100644 index 0000000000000000000000000000000000000000..8c25ae4702605cb3af82d4e7cf56a03a52f15cf4 GIT binary patch literal 5205 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 G2~7awQ>Z5Z literal 0 HcmV?d00001 diff --git a/StaticData/Icons/PushpinUnpin_16x.png b/StaticData/Icons/PushpinUnpin_16x.png deleted file mode 100644 index 5ac71ccf68cae322b532c6b744e7adfb5eb4659f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=qM&(O>zbNyEa28L8m7sn6_|FvftIU5XkTrQrQ_HuWxmE)2dEPLl|T*x-> z(8B#IUI|&HT`+uHb>M2$)i0fK5(0w#dw%k`$Te19z0v-=j3?tjox^3u7R4+3J~G_P uZ~WHR!gyJ|N-o0jIFD7@g~EB$gjLU#tt_4X$AE!>fx*+&&t;ucLK6T@@>h}o diff --git a/StaticData/Icons/Pushpin_16x.png b/StaticData/Icons/Pushpin_16x.png deleted file mode 100644 index 35e12fef00f7819053d3b53af1b6394a3840ff56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=qM&(O>zbNyEa28MJ`7sn6_|F=Dkd<_m9%-?hO%)7rr-yu^$GtX>d#m9un zmI1f;jH{34!~}&#Km0%GIkOv2#|f9}g!_CS_)XYtrZAU(I{q`LEbQr%iwu)h+dePl uX+FZ7=%{+0o#&D{+oTN(COu!=-z&VKw``^8ULBCP7(8A5T-G@yGywo;hErw$ diff --git a/StaticData/Icons/cube_add.png b/StaticData/Icons/cube_add.png index f9e96958d2410f2f82b6be20969f618a83536b43..2a20d373688bcfe6b53a7249eeac4c5be46c8b9e 100644 GIT binary patch literal 5602 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 E08!AzZU6uP delta 800 zcmaE)y^^iIGr-TCmrII^fq{Y7)59f*fq_8)ggMw47#QR~|4(FKU~J5Eb`B^Ga(7bj zbagf}v@|o*HPSO=V9+=}b>ePsW=DZ``}^xVn#449_&S>ej4Tq2ux8Ry%*(U(tP3SJrD) zYkSGzGo1aL{yNWj+PAmN{yIfW*iP`<>`x94rQQ2?{drSx>8XFauc^qCTT-o4pYZqn zOR!B%Ygt-UGqe87q_~Ry;7;{XyIy-jb7j_K$Xd z{ur#|wMK9CK`u3J70-!>^F@UMkefa;?dZ$@@ApM@?u#?utlp~eDV4m(V{db2C%zh#5dUiWIZ+1ad;FU$U3%2pyGpu$t-nu75Eo_#@ zfzyUp+!ws$%6fihp6EHtUCgDS`(6o^l`V{YXMU!h*~35mhW)j78z<)oNz_Y}xJHx& z=ckpFCl;kL6eMQmmFVTAmMEC$8R{7(Yt8XyU|`hpba4!^@Sl3g*86aP#L!^%Z`>x1b6D)$c@&58V4pZ6|Tesb9B zMtR?PHkQ8eF+TI2$A?MyC$F;jqg=l$^JCUMZr15Lj?11iY|47G`&LtjsO?dyxQ*?0 zTaxp2xLGG3T_$}%FmA(=Mt^=*=c8%bn|~acW`8*-CBG+P=7;WcR|`7SV-_@qNj+ss z(~g|B_v5Pf38KDl7R%3GAr_H2t4_sp(IV-Xv6Q7ZTC4Z zbwTpk65p2*8=5V3G6aOUlS+K8Z~YD2&=`H@$L6wAtX*YWcE3CCbLCG*GEbI6PGg#S zMMK%{H0kpff{!xEzLsB+ZM(G3cn|w>iDUbX?|=6^#C2=k`4R>O1_n=8KbLh* G2~7ascVP4Y diff --git a/StaticData/Icons/cube_export.png b/StaticData/Icons/cube_export.png index 0a51cb6df3e93a0e7a062746ab604d83f1389c9f..80cfbae08a86642b4dbcf707799eacc5abfd9c07 100644 GIT binary patch literal 6833 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 II;Vst0Qy^yfB*mh diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 6633bc2a9..ecf30ee57 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 6633bc2a9efc7971009cf6c72a6a2e6fa4274b43 +Subproject commit ecf30ee57ee6d272291c7f7a3321179cf1f196fe