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

Got rid of invert icons

Browse source
This commit is contained in:
Lars Brubaker 2021-05-21 15:23:25 -07:00
parent 005efad10a
commit fe406720f2
68 changed files with 186 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlLib/AboutPage/AboutPage.cs
View file

@ -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<List<LibraryLicense>>(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;

3
MatterControlLib/AboutPage/UpdateControlView.cs
View file

@ -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,

3
MatterControlLib/ActionBar/TemperatureWidgetBase.cs
View file

@ -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)

3
MatterControlLib/ActionBar/TemperatureWidgetBed.cs
View file

@ -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);

6
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -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)
{

19
MatterControlLib/ApplicationView/BrandMenuButton.cs
View file

@ -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<ApplicationSettingsPage>();
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();

3
MatterControlLib/ApplicationView/Config/ThumbnailsConfig.cs
View file

@ -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)
{

17
MatterControlLib/ApplicationView/Themes/ThemeConfig.cs
View file

@ -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;
/// <summary>
/// Gets a value indicating whether icons should be inverted due to black source images on a dark theme
/// </summary>
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);
}

9
MatterControlLib/CustomWidgets/DockingTabControl.cs
View file

@ -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) =>
{

3
MatterControlLib/CustomWidgets/HelpArticleHeader.cs
View file

@ -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"

3
MatterControlLib/CustomWidgets/InlineListItemEdit.cs
View file

@ -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,

5
MatterControlLib/CustomWidgets/InlineStringEdit.cs
View file

@ -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)
{

3
MatterControlLib/CustomWidgets/LibrarySelector/FolderBreadCrumbWidget.cs
View file

@ -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,

5
MatterControlLib/CustomWidgets/TreeView/TreeNode.cs
View file

@ -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);

5
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -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,

7
MatterControlLib/History/PrintHistoryEditor.cs
View file

@ -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));

2
MatterControlLib/Library/ContentProviders/MeshContentProvider.cs
View file

@ -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;

4
MatterControlLib/Library/Providers/Printer/SDCardContainer.cs
View file

@ -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()

3
MatterControlLib/Library/Widgets/CloneSettingsPage.cs
View file

@ -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),

5
MatterControlLib/Library/Widgets/ExpandCheckboxButton.cs
View file

@ -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)
{

24
MatterControlLib/Library/Widgets/LibraryWidget.cs
View file

@ -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<bool> 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

3
MatterControlLib/Library/Widgets/ListView/ListViewItemBase.cs
View file

@ -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;

3
MatterControlLib/Library/Widgets/PrintLibraryWidget.cs
View file

@ -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,

2
MatterControlLib/Library/Widgets/SearchableTreePanel.cs
View file

@ -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)
{

7
MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeOptionsPanel.cs
View file

@ -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<GuiWidget>();
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",

3
MatterControlLib/PartPreviewWindow/ItemColorButton.cs
View file

@ -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,

9
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -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(),
};

5
MatterControlLib/PartPreviewWindow/PartTabPage.cs
View file

@ -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)
{

2
MatterControlLib/PartPreviewWindow/PopupMenu.cs
View file

@ -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)

7
MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
View file

@ -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
});

3
MatterControlLib/PartPreviewWindow/RenderOptionsButton.cs
View file

@ -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
});

5
MatterControlLib/PartPreviewWindow/RunningTaskRow.cs
View file

@ -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),

3
MatterControlLib/PartPreviewWindow/RunningTaskStatusPanel.cs
View file

@ -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

5
MatterControlLib/PartPreviewWindow/SaveAsPage.cs
View file

@ -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,

3
MatterControlLib/PartPreviewWindow/Tabs.cs
View file

@ -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,
};

3
MatterControlLib/PartPreviewWindow/View3D/Actions/ImageEditor.cs
View file

@ -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(),
};

3
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/OverflowBar.cs
View file

@ -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);
}
}
}

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

@ -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) =>

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

@ -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()
{

7
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterConnectButton.cs
View file

@ -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",

5
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
View file

@ -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))

6
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -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",

19
MatterControlLib/PartPreviewWindow/ViewControls3D.cs
View file

@ -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<double>(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(

13
MatterControlLib/PartPreviewWindow/ViewStyleButton.cs
View file

@ -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, ImageBuffer>()
{
[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)

3
MatterControlLib/PrinterControls/ControlWidgets/CalibrationControls.cs
View file

@ -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,

3
MatterControlLib/PrinterControls/ControlWidgets/MacroControls.cs
View file

@ -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));

5
MatterControlLib/PrinterControls/ControlWidgets/MovementControls.cs
View file

@ -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,

3
MatterControlLib/PrinterControls/ControlWidgets/PrinterCalibrationWizard.cs
View file

@ -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(),

3
MatterControlLib/PrinterControls/JogControls.cs
View file

@ -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),

13
MatterControlLib/SettingsManagement/ApplicationSettingsPage.cs
View file

@ -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;
}

3
MatterControlLib/SetupWizard/Printer/OpenPrinterPage.cs
View file

@ -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);

3
MatterControlLib/SetupWizard/TourPopover.cs
View file

@ -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)
{

8
MatterControlLib/SetupWizard/WizardStageRow.cs
View file

@ -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; }

3
MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs
View file

@ -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,

3
MatterControlLib/SlicerConfiguration/UIFields/ComPortField.cs
View file

@ -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,

5
MatterControlLib/SlicerConfiguration/UIFields/EnumDisplayField.cs
View file

@ -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
{

3
MatterControlLib/SlicerConfiguration/UIFields/IpAddessField.cs
View file

@ -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)
};

3
MatterControlLib/SlicerConfiguration/UIFields/ListStringField.cs
View file

@ -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,

3
MatterControlLib/SlicerConfiguration/UIFields/MarkdownEditField.cs
View file

@ -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(),

3
MatterControlLib/Utilities/MarkdigAgg/AggListRenderer.cs
View file

@ -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,

1
Program.cs
View file

@ -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,

BIN
StaticData/Icons/Pushpin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
StaticData/Icons/PushpinUnpin.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
StaticData/Icons/PushpinUnpin_16x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 245 B

BIN
StaticData/Icons/Pushpin_16x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 247 B

BIN
StaticData/Icons/cube_add.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 5.5 KiB

Before After
Before After

BIN
StaticData/Icons/cube_export.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 908 B

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 6633bc2a9efc7971009cf6c72a6a2e6fa4274b43
Subproject commit ecf30ee57ee6d272291c7f7a3321179cf1f196fe