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

All buttons switch to agg themed buttons

Browse source
This commit is contained in:
LarsBrubaker 2022-07-16 07:46:44 -07:00 • committed by Lars Brubaker
parent 02be841100
commit 3307e204ee
79 changed files with 218 additions and 881 deletions
Download patch file Download diff file Expand all files Collapse all files

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 IconButton(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).SetToColor(theme.TextColor), theme)
{
BackgroundColor = theme.MinimalShade,
Margin = new BorderDouble(left: 8),

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

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
public event EventHandler CheckedStateChanged;
private IconButton imageButton;
private ThemedIconButton imageButton;
private ImageBuffer arrowRight;
@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
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)
imageButton = new ThemedIconButton(arrowRight, theme)
{
MinimumSize = new Vector2(theme.ButtonHeight, theme.ButtonHeight),
VAnchor = VAnchor.Center,

2
MatterControlLib/Library/Widgets/HardwarePage/PrinterDetails.cs
View file

@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
if (showOpenButton)
{
var openButton = new TextButton("Open".Localize(), theme)
var openButton = new ThemedTextButton("Open".Localize(), theme)
{
BackgroundColor = theme.AccentMimimalOverlay,
Margin = Margin.Clone(right: 17)

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

@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
mainRow.AddChild(new HorizontalSpacer());
// add in the create pulse button
var createPulse = new IconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).SetToColor(theme.TextColor), theme)
var createPulse = new ThemedIconButton(StaticData.Instance.LoadIcon("pulse_logo.png", 18, 18).SetToColor(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 IconButton(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).SetToColor(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 IconButton(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).SetToColor(theme.TextColor), theme)
{
VAnchor = VAnchor.Center,
Margin = theme.ButtonSpacing,

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

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
DoubleClickBehavior = LibraryListView.DoubleClickBehaviors.PreviewItem
};
navBar = new OverflowBar(theme)
navBar = new OverflowBar(theme, "File".Localize())
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,

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

@ -1,5 +1,5 @@
/*
Copyright (c) 2019, Kevin Pope, John Lewin
Copyright (c) 2022, Kevin Pope, John Lewin, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.Library.Widgets
Border = new BorderDouble(top: 1)
};
navBar = new OverflowBar(theme)
navBar = new OverflowBar(theme, "File".Localize())
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Fit,

2
MatterControlLib/Library/Widgets/StorePage/ArticleSection.cs
View file

@ -95,7 +95,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
if (content.group_items.Count > maxStuff)
{
var moreButton = new TextButton("More".Localize() + "...", theme)
var moreButton = new ThemedTextButton("More".Localize() + "...", theme)
{
BackgroundColor = theme.MinimalShade,
Margin = new BorderDouble(right: leftRightMargin),

4
MatterControlLib/Library/Widgets/StorePage/ExplorePanel.cs
View file

@ -222,7 +222,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
{
// add the article group button to the button group
// add a content section connected to the button
var sectionButton = new TextButton(content.group_title, theme);
var sectionButton = new ThemedTextButton(content.group_title, theme);
sectionSelectButtons.AddChild(sectionButton);
var articleSection = new ArticleSection(content, theme)
{
@ -242,7 +242,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
case "product_group":
{
var sectionButton = new TextButton(content.group_title, theme);
var sectionButton = new ThemedTextButton(content.group_title, theme);
sectionSelectButtons.AddChild(sectionButton);
var exploreSection = new ProductSection(content, theme)
{

2
MatterControlLib/Library/Widgets/StorePage/ProductSection.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
private List<ProductItem> allIconViews = new List<ProductItem>();
private FeedSectionData content;
private ThemeConfig theme;
private TextButton moreButton;
private ThemedTextButton moreButton;
public ProductSection(FeedSectionData content, ThemeConfig theme)
{