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