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

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