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

Refactoring and creating new RemovePreMultipliedProcess

Browse source
This commit is contained in:
Lars Brubaker 2023-10-03 16:17:01 -07:00
parent f6511395ad
commit 569d016d30
61 changed files with 183 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,7 +251,7 @@ namespace MatterHackers.MatterControl
{
theme = AppContext.Theme;
defaultIcon = StaticData.Instance.LoadIcon("mesh.png").SetToColor(theme.TextColor); //.AnyAlphaToColor(theme.PrimaryAccentColor);
defaultIcon = StaticData.Instance.LoadIcon("mesh.png").GrayToColor(theme.TextColor); //.AnyAlphaToColor(theme.PrimaryAccentColor);
}
return defaultIcon;

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

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.Library
{
return Task.FromResult(
StaticData.Instance.LoadIcon(
Path.Combine((width > 50 || height > 50) ? "icon_sd_card_115x115.png" : "icon_sd_card_50x50.png")).SetToColor(ApplicationController.Instance.Theme.TextColor));
Path.Combine((width > 50 || height > 50) ? "icon_sd_card_115x115.png" : "icon_sd_card_50x50.png")).GrayToColor(ApplicationController.Instance.Theme.TextColor));
}
public override void Load()

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

@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
// Must come before pathButton.Click definition
RadioButton copyAndCalibrateOption = null;
var openButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).SetToColor(theme.TextColor), theme)
var openButton = new ThemedIconButton(StaticData.Instance.LoadIcon("fa-folder-open_16.png", 16, 16).GrayToColor(theme.TextColor), theme)
{
BackgroundColor = theme.MinimalShade,
Margin = new BorderDouble(left: 8),

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

@ -55,8 +55,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
public ExpandCheckboxButton(string text, ThemeConfig theme, int pointSize = 11, bool expandable = true)
{
arrowRight = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).SetToColor(theme.TextColor);
arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12).SetToColor(theme.TextColor);
arrowRight = StaticData.Instance.LoadIcon("fa-angle-right_12.png", 12, 12).GrayToColor(theme.TextColor);
arrowDown = StaticData.Instance.LoadIcon("fa-angle-down_12.png", 12, 12).GrayToColor(theme.TextColor);
imageButton = new ThemedIconButton(arrowRight, theme)
{

8
MatterControlLib/Library/Widgets/HardwareTreeView.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
Text = "Printers".Localize(),
HAnchor = HAnchor.Stretch,
AlwaysExpandable = true,
Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).SetToColor(theme.TextColor)
Image = StaticData.Instance.LoadIcon("printer.png", 16, 16).GrayToColor(theme.TextColor)
};
printersNode.TreeView = this;
@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
mainRow.AddChild(new HorizontalSpacer());
// add in the create pulse button
var createPulse = new ThemedIconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).SetToColor(theme.TextColor), theme)
var createPulse = new ThemedIconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).GrayToColor(theme.TextColor), theme)
{
Name = "Setup Pulse",
VAnchor = VAnchor.Center,
@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
mainRow.AddChild(createPulse);
// add in the create printer button
var createPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).SetToColor(theme.TextColor), theme)
var createPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-add-circle_18.png", 18, 18).GrayToColor(theme.TextColor), theme)
{
Name = "Create Printer",
VAnchor = VAnchor.Center,
@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
mainRow.AddChild(createPrinter);
// add in the import printer button
var importPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-import_18.png", 18, 18).SetToColor(theme.TextColor), theme)
var importPrinter = new ThemedIconButton(StaticData.Instance.LoadIcon("md-import_18.png", 18, 18).GrayToColor(theme.TextColor), theme)
{
VAnchor = VAnchor.Center,
Margin = theme.ButtonSpacing,

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

@ -224,7 +224,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
public static GuiWidget CreateSortingMenuButton(ThemeConfig theme, LibraryListView libraryView)
{
var viewOptionsButton = new PopupMenuButton(
new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor)), theme)
new ImageWidget(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).GrayToColor(theme.TextColor)), theme)
{
AlignToRightEdge = true,
Name = "Print Library View Options",
@ -293,7 +293,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
Func<bool> containersShown)
{
var viewMenuButton = new PopupMenuButton(
new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32).SetToColor(theme.TextColor))
new ImageWidget(StaticData.Instance.LoadIcon("mi-view-list_10.png", 32, 32).GrayToColor(theme.TextColor))
{
// VAnchor = VAnchor.Center
},
@ -574,7 +574,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
{
menuActions.Add(new LibraryAction(ActionScope.ListView)
{
Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(theme.TextColor),
Title = "Add".Localize(),
ToolTipText = "Add an.stl, .obj, .3mf, .amf, .gcode or.zip file to the Library".Localize(),
Action = (selectedLibraryItems, listView) =>
@ -602,7 +602,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListView)
{
Title = "Create Folder".Localize() + "...",
Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("fa-folder-new_16.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
DialogWindow.Show(
@ -634,7 +634,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListView)
{
Title = "Enter Share Code".Localize() + "...",
Icon = StaticData.Instance.LoadIcon("enter-code.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("enter-code.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
UiThread.RunOnIdle(() =>
@ -712,7 +712,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Open".Localize(),
Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("cube.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
listView.SelectedItems.FirstOrDefault()?.OnDoubleClick(null);
@ -746,7 +746,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Open a copy".Localize(),
Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("cube_add.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
ApplicationController.Instance.OpenIntoNewTab(selectedLibraryItems);
@ -771,7 +771,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Add to Bed".Localize(),
Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("bed_add.png", 16, 16).GrayToColor(theme.TextColor),
Action = async (selectedLibraryItems, listView) =>
{
var activeContext = ApplicationController.Instance.DragDropData;
@ -827,7 +827,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Export".Localize(),
Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
ApplicationController.Instance.ExportLibraryItems(libraryView.SelectedItems.Select(item => item.Model));
@ -844,7 +844,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Share".Localize() + "...",
Icon = StaticData.Instance.LoadIcon("share.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("share.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
// Previously - shareFromLibraryButton_Click
@ -868,7 +868,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Rename".Localize(),
Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("icon_edit.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
if (libraryView.SelectedItems.Count == 1)
@ -972,7 +972,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
menuActions.Add(new LibraryAction(ActionScope.ListItem)
{
Title = "Remove".Localize(),
Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).SetToColor(theme.TextColor),
Icon = StaticData.Instance.LoadIcon("remove.png", 16, 16).GrayToColor(theme.TextColor),
Action = (selectedLibraryItems, listView) =>
{
// Previously - deleteFromLibraryButton_Click

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

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.thumbWidth = width;
this.thumbHeight = height;
overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).SetToColor(theme.TextColor);
overflowIcon = StaticData.Instance.LoadIcon(Path.Combine("ViewTransformControls", "overflow.png"), 32, 32).GrayToColor(theme.TextColor);
}
public bool HasMenu { get; set; } = false;

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

@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
allControls.AddChild(navBar);
theme.ApplyBottomBorder(navBar);
var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).SetToColor(theme.TextColor), theme)
var toolbar = new OverflowBar(StaticData.Instance.LoadIcon("fa-sort_16.png", 32, 32).GrayToColor(theme.TextColor), theme)
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,

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

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
this.theme = theme;
this.TreeLoaded = false;
var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(theme.TextColor).AjustAlpha(0.3);
var searchIcon = StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).GrayToColor(theme.TextColor).AjustAlpha(0.3);
searchBox = new TextEditWithInlineCancel(theme)
{