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

Move theme.Colors.PrimaryTextColor into theme, remove unneeded types

Browse source 
- Issue MatterHackers/MCCentral#4490
This commit is contained in:
John Lewin 2018-11-03 09:13:07 -07:00
parent c279f8a511
commit 8d4974dc32
103 changed files with 245 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MatterControlLib/AboutPage/AboutPage.cs
View file

@ -73,8 +73,8 @@ namespace MatterHackers.MatterControl
{
HAnchor = HAnchor.Center | HAnchor.Fit
};
productTitle.AddChild(new TextWidget("MatterControl".Localize(), textColor: theme.Colors.PrimaryTextColor, pointSize: 20) { Margin = new BorderDouble(right: 3) });
productTitle.AddChild(new TextWidget("TM".Localize(), textColor: theme.Colors.PrimaryTextColor, pointSize: 7) { VAnchor = VAnchor.Top });
productTitle.AddChild(new TextWidget("MatterControl".Localize(), textColor: theme.TextColor, pointSize: 20) { Margin = new BorderDouble(right: 3) });
productTitle.AddChild(new TextWidget("TM".Localize(), textColor: theme.TextColor, pointSize: 7) { VAnchor = VAnchor.Top });
altHeadingRow.AddChild(productInfo);
productInfo.AddChild(productTitle);
@ -103,13 +103,13 @@ namespace MatterHackers.MatterControl
};
productInfo.AddChild(
new TextWidget("Version".Localize() + " " + VersionInfo.Instance.BuildVersion, textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
new TextWidget("Version".Localize() + " " + VersionInfo.Instance.BuildVersion, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
HAnchor = HAnchor.Center
});
productInfo.AddChild(
new TextWidget("Developed By".Localize() + ": " + "MatterHackers", textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
new TextWidget("Developed By".Localize() + ": " + "MatterHackers", textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
HAnchor = HAnchor.Center
});
@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl
new WrappedTextWidget(
"MatterControl is made possible by the team at MatterHackers and other open source software".Localize() + ":",
pointSize: theme.DefaultFontSize,
textColor: theme.Colors.PrimaryTextColor)
textColor: theme.TextColor)
{
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 15)
@ -182,7 +182,7 @@ namespace MatterHackers.MatterControl
this.AddPageAction(feedbackButton, highlightFirstAction: false);
ContentRow.AddChild(
new TextWidget("Copyright © 2018 MatterHackers, Inc.", textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
new TextWidget("Copyright © 2018 MatterHackers, Inc.", textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
HAnchor = HAnchor.Center,
});
@ -190,7 +190,7 @@ namespace MatterHackers.MatterControl
var siteLink = new LinkLabel("www.matterhackers.com", theme)
{
HAnchor = HAnchor.Center,
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
siteLink.Click += (s, e) => UiThread.RunOnIdle(() =>
{
@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl
{
string content = AggContext.StaticData.ReadAllText(filePath);
this.AddChild(new WrappedTextWidget(content, theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
this.AddChild(new WrappedTextWidget(content, theme.DefaultFontSize, textColor: theme.TextColor)
{
HAnchor = HAnchor.Stretch
});

12
MatterControlLib/AboutPage/CheckForUpdatesPage.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl
{
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(left: 5, bottom: 15, top: 20),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
contentPanel.AddChild(currentBuildInfo);
@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl
var feedLabel = new TextWidget("Update Channel".Localize(), pointSize: 12)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Center,
Margin = new BorderDouble(left: 5)
};
@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl
additionalInfoContainer.AddChild(
new WrappedTextWidget("Changing your update channel will change the version of MatterControl that you receive when updating".Localize() + ":")
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(bottom: 20)
});
@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl
additionalInfoContainer.AddChild(
new WrappedTextWidget("Stable: The current release version of MatterControl (recommended)".Localize())
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(bottom: 10)
});
@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl
additionalInfoContainer.AddChild(
new WrappedTextWidget("Beta: The release candidate version of MatterControl".Localize())
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(bottom: 10)
});
@ -171,7 +171,7 @@ namespace MatterHackers.MatterControl
additionalInfoContainer.AddChild(
new WrappedTextWidget("Alpha: The in development version of MatterControl".Localize())
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(bottom: 10)
});

4
MatterControlLib/AboutPage/ContactFormPage.cs
View file

@ -102,7 +102,7 @@ namespace MatterHackers.MatterControl.ContactForm
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(0, 5),
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Left
};
@ -150,7 +150,7 @@ namespace MatterHackers.MatterControl.ContactForm
labelContainer.AddChild(new TextWidget(labelText, pointSize: fontSize)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Bottom,
HAnchor = HAnchor.Left,
Margin = new BorderDouble(bottom: 2)

2
MatterControlLib/AboutPage/UpdateControlView.cs
View file

@ -52,7 +52,7 @@ namespace MatterHackers.MatterControl
this.BackgroundColor = theme.MinimalShade;
this.Padding = theme.ToolbarPadding.Clone(left: 8);
this.AddChild(updateStatusText = new TextWidget(string.Format(""), textColor: theme.Colors.PrimaryTextColor)
this.AddChild(updateStatusText = new TextWidget(string.Format(""), textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center

8
MatterControlLib/ActionBar/TemperatureWidgetBase.cs
View file

@ -86,17 +86,17 @@ namespace MatterHackers.MatterControl.ActionBar
CurrentTempIndicator = new TextWidget(textValue, pointSize: 11)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true
};
container.AddChild(CurrentTempIndicator);
container.AddChild(new TextWidget("/") { TextColor = theme.Colors.PrimaryTextColor });
container.AddChild(new TextWidget("/") { TextColor = theme.TextColor });
goalTempIndicator = new TextWidget(textValue, pointSize: 11)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true
};
@ -104,7 +104,7 @@ namespace MatterHackers.MatterControl.ActionBar
DirectionIndicator = new TextWidget(textValue, pointSize: 11)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true,
Margin = new BorderDouble(left: 5)

2
MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
View file

@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl.ActionBar
break;
}
moveButtonsContainer.AddChild(new TextWidget("mm", textColor: theme.Colors.PrimaryTextColor, pointSize: 8)
moveButtonsContainer.AddChild(new TextWidget("mm", textColor: theme.TextColor, pointSize: 8)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(3, 0)

12
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -180,8 +180,7 @@ namespace MatterHackers.MatterControl
themeset = themeProvider.GetTheme("Modern-Dark");
}
DefaultThumbView.ThumbColor = new Color(themeset.Theme.Colors.PrimaryTextColor, 30);
ActiveTheme.Instance = themeset.Theme.Colors;
DefaultThumbView.ThumbColor = new Color(themeset.Theme.TextColor, 30);
}
public static ThemeConfig LoadTheme(string themeName)
@ -227,9 +226,6 @@ namespace MatterHackers.MatterControl
{
UserSettings.Instance.set(UserSettingsKey.ActiveThemeName, themeset.Name);
//Set new user selected Default
ActiveTheme.Instance = themeset.Theme.Colors;
// Explicitly fire ReloadAll in response to user interaction
ApplicationController.Instance.ReloadAll();
});
@ -814,7 +810,7 @@ namespace MatterHackers.MatterControl
var theme = this.Theme;
if (tab is GuiWidget guiWidget)
{
guiWidget.Descendants<TextWidget>().FirstOrDefault().FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
guiWidget.Descendants<TextWidget>().FirstOrDefault().FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.TextColor, 6).ToColor());
}
}
@ -2217,7 +2213,7 @@ If you experience adhesion problems, please re-run leveling."
{
var hideGCodeWarningCheckBox = new CheckBox(doNotAskAgainMessage)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = this.Theme.TextColor,
Margin = new BorderDouble(top: 6, left: 6),
HAnchor = Agg.UI.HAnchor.Left
};
@ -2833,7 +2829,7 @@ If you experience adhesion problems, please re-run leveling."
};
overlay.AddChild(progressPanel);
progressPanel.AddChild(statusText = new TextWidget("", textColor: AppContext.Theme.Colors.PrimaryTextColor)
progressPanel.AddChild(statusText = new TextWidget("", textColor: AppContext.Theme.TextColor)
{
MinimumSize = new Vector2(200, 30),
HAnchor = HAnchor.Center,

4
MatterControlLib/ApplicationView/BrandMenuButton.cs
View file

@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl
Selectable = false
});
row.AddChild(new TextWidget(ApplicationController.Instance.ShortProductName, textColor: theme.Colors.PrimaryTextColor)
row.AddChild(new TextWidget(ApplicationController.Instance.ShortProductName, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center
});
@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl
VAnchor = VAnchor.Fit,
};
themeRow.AddChild(new TextWidget("Theme".Localize(), pointSize: menuTheme.DefaultFontSize, textColor: menuTheme.Colors.PrimaryTextColor)
themeRow.AddChild(new TextWidget("Theme".Localize(), pointSize: menuTheme.DefaultFontSize, textColor: menuTheme.TextColor)
{
VAnchor = VAnchor.Center,
});

65
MatterControlLib/ApplicationView/Themes/ActiveTheme.cs
View file

@ -1,65 +0,0 @@
/*
Copyright (c) 2018, Kevin Pope, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.MatterControl;
namespace MatterHackers.Agg.UI
{
public static class ActiveTheme
{
public static RootedObjectEventHandler ThemeChanged = new RootedObjectEventHandler();
private static IThemeColors activeTheme;
static ActiveTheme()
{
Color accentColor;
(activeTheme, accentColor) = ThemeColors.Create(new Color(172, 25, 61) /* Classic Red */);
}
public static IThemeColors Instance
{
get => activeTheme;
set
{
if (value != activeTheme)
{
activeTheme = value;
OnThemeChanged();
}
}
}
private static void OnThemeChanged()
{
ThemeChanged?.CallEvents(null, null);
}
}
}

38
MatterControlLib/ApplicationView/Themes/IThemeColors.cs
View file

@ -1,38 +0,0 @@
/*
Copyright (c) 2016, Kevin Pope, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
namespace MatterHackers.Agg.UI
{
public interface IThemeColors
{
Color PrimaryTextColor { get; }
}
}

55
MatterControlLib/ApplicationView/Themes/ThemeColors.cs
View file

@ -1,55 +0,0 @@
/*
Copyright (c) 2016, Kevin Pope, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
namespace MatterHackers.Agg.UI
{
public class ThemeColors: IThemeColors
{
public Color PrimaryTextColor { get; set; }
public static (ThemeColors ThemeColors, Color AccentColor) Create(Color accentColor, bool darkTheme = true)
{
var primaryBackgroundColor = new Color(darkTheme ? "#444" : "#D0D0D0");
return (
new ThemeColors
{
PrimaryTextColor = new Color(darkTheme ? "#FFFFFF" : "#222"),
},
GetAdjustedAccentColor(accentColor, primaryBackgroundColor));
}
public static Color GetAdjustedAccentColor(Color accentColor, Color backgroundColor)
{
return accentColor.WithContrast(backgroundColor).ToColor();
}
}
}

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

@ -138,7 +138,8 @@ namespace MatterHackers.MatterControl
}
}
public ThemeColors Colors { get; set; } = new ThemeColors();
public Color TextColor { get; set; } = Color.Black;
public PresetColors PresetColors { get; set; } = new PresetColors();
public bool IsDarkTheme { get; set; }
@ -155,7 +156,7 @@ namespace MatterHackers.MatterControl
public TextWidget CreateHeading(string text)
{
return new TextWidget(text, pointSize: this.H1PointSize, textColor: this.Colors.PrimaryTextColor, bold: true)
return new TextWidget(text, pointSize: this.H1PointSize, textColor: this.TextColor, bold: true)
{
Margin = new BorderDouble(0, 5)
};
@ -241,7 +242,7 @@ namespace MatterHackers.MatterControl
this.GeneratingThumbnailIcon = AggContext.StaticData.LoadIcon("building_thumbnail_40x40.png", 40, 40, this.InvertIcons);
DefaultThumbView.ThumbColor = new Color(this.Colors.PrimaryTextColor, 30);
DefaultThumbView.ThumbColor = new Color(this.TextColor, 30);
}
public JogControls.MoveButton CreateMoveButton(PrinterConfig printer, string label, PrinterConnection.Axis axis, double movementFeedRate, bool levelingButtons = false)
@ -438,7 +439,7 @@ namespace MatterHackers.MatterControl
{
double scrollBarWidth = 10;
wordOptionContainer.AddChild(new TextWidget(header, textColor: this.Colors.PrimaryTextColor)
wordOptionContainer.AddChild(new TextWidget(header, textColor: this.TextColor)
{
Margin = new BorderDouble(10, 3, 3, 5),
HAnchor = HAnchor.Left

2
MatterControlLib/ApplicationView/Themes/ThemeSet.cs
View file

@ -34,7 +34,7 @@ namespace MatterHackers.MatterControl
{
public class ThemeSet
{
public static int LatestSchemeVersion { get; } = 20181030;
public static int LatestSchemeVersion { get; } = 20181103;
/// <summary>
/// The identifier to use for this combination of accent colors, theme and menu theme

2
MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
View file

@ -160,7 +160,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
name = themeset.ThemesetID.Replace("-", " ");
}
previewColumn.AddChild(new TextWidget(name, pointSize: theme.FontSize7, textColor: theme.Colors.PrimaryTextColor)
previewColumn.AddChild(new TextWidget(name, pointSize: theme.FontSize7, textColor: theme.TextColor)
{
HAnchor = HAnchor.Left,
Margin = new BorderDouble(12, 2)

4
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -189,11 +189,11 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
};
var progressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
var progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),

2
MatterControlLib/ConfigurationPage/PrintLeveling/PrinterSetupWizardPage.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl
return new WrappedTextWidget(text)
{
Margin = new BorderDouble(left: 10, top: 10),
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch
};
}

2
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
View file

@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
zButtonsAndInfo.AddChild(new GuiWidget(15, 10));
//textFields
TextWidget zPosition = new TextWidget("Z: 0.0 ", pointSize: 12, textColor: ActiveTheme.Instance.PrimaryTextColor)
TextWidget zPosition = new TextWidget("Z: 0.0 ", pointSize: 12, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(10, 0),

16
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
View file

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
// put in bar name
ContentRow.AddChild(new TextWidget("Hotend Temperature:".Localize(), pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
ContentRow.AddChild(new TextWidget("Hotend Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 5, 5),
@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
hotEndProgressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 0),
VAnchor = VAnchor.Center
@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
hotEndProgressHolder.AddChild(hotEndProgressBar);
// put in the status
hotEndProgressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
hotEndProgressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 5, 5),
@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
hotEndProgressHolder.AddChild(hotEndProgressBarText);
// message to show when done
hotEndDoneText = new TextWidget("Done!", textColor: ActiveTheme.Instance.PrimaryTextColor)
hotEndDoneText = new TextWidget("Done!", textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Visible = false,
@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
};
// put in bar name
ContentRow.AddChild(new TextWidget("Bed Temperature:".Localize(), pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
ContentRow.AddChild(new TextWidget("Bed Temperature:".Localize(), pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 5, 5),
@ -120,7 +120,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
bedProgressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 0),
VAnchor = VAnchor.Center
@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
bedProgressHolder.AddChild(bedProgressBar);
// put in status
bedProgressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
bedProgressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),
@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
bedProgressHolder.AddChild(bedProgressBarText);
// message to show when done
bedDoneText = new TextWidget("Done!", textColor: ActiveTheme.Instance.PrimaryTextColor)
bedDoneText = new TextWidget("Done!", textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Visible = false,

4
MatterControlLib/ConfigurationPage/RunningMacroPage.cs
View file

@ -96,11 +96,11 @@ namespace MatterHackers.MatterControl.PrinterControls
progressBar = new ProgressBar((int)(150 * GuiWidget.DeviceScale), (int)(15 * GuiWidget.DeviceScale))
{
FillColor = theme.PrimaryAccentColor,
BorderColor = ActiveTheme.Instance.PrimaryTextColor,
BorderColor = theme.TextColor,
BackgroundColor = Color.White,
Margin = new BorderDouble(3, 0, 0, 10),
};
progressBarText = new TextWidget("", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
progressBarText = new TextWidget("", pointSize: 10, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(5, 0, 0, 0),

4
MatterControlLib/ControlElements/MHDropDownList.cs
View file

@ -43,9 +43,9 @@ namespace MatterHackers.MatterControl
var menuTheme = AppContext.MenuTheme;
this.MenuItemsBackgroundColor = menuTheme.ActiveTabColor;
this.MenuItemsTextColor = menuTheme.Colors.PrimaryTextColor;
this.MenuItemsTextColor = menuTheme.TextColor;
this.MenuItemsBackgroundHoverColor = menuTheme.AccentMimimalOverlay;
this.MenuItemsTextHoverColor = menuTheme.Colors.PrimaryTextColor;
this.MenuItemsTextHoverColor = menuTheme.TextColor;
this.MenuItemsBorderColor = menuTheme.DropList.Open.BackgroundColor;
this.theme = theme;

3
MatterControlLib/ControlElements/StyledMessageBoxWindow.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
responseCallback = callback;
unwrappedMessage = message;
ContentRow.AddChild(messageContainer = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12 * DeviceScale)
ContentRow.AddChild(messageContainer = new TextWidget(message, textColor: theme.TextColor, pointSize: 12 * DeviceScale)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Left
@ -164,4 +164,3 @@ namespace MatterHackers.MatterControl
}
}

4
MatterControlLib/CustomWidgets/DockingTabControl.cs
View file

@ -344,7 +344,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
});
buttonView.AfterDraw += (s, e) =>
{
e.Graphics2D.Render(rotatedLabel, theme.Colors.PrimaryTextColor);
e.Graphics2D.Render(rotatedLabel, theme.TextColor);
};
}
@ -380,7 +380,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
BackgroundColor = theme.TabBarBackground,
};
titleBar.AddChild(new TextWidget(title, textColor: theme.Colors.PrimaryTextColor)
titleBar.AddChild(new TextWidget(title, textColor: theme.TextColor)
{
Margin = new BorderDouble(left: 8),
VAnchor = VAnchor.Center

2
MatterControlLib/CustomWidgets/EditableNumberDisplay.cs
View file

@ -33,7 +33,7 @@ namespace MatterHackers.MatterControl
}
public EditableNumberDisplay(double startingValue, string largestPossibleValue, ThemeConfig theme)
: this(startingValue, largestPossibleValue, ActiveTheme.Instance.PrimaryTextColor, theme)
: this(startingValue, largestPossibleValue, theme.TextColor, theme)
{
}

4
MatterControlLib/CustomWidgets/ExportPrintItemPage.cs
View file

@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl
}
// Create export button for each plugin
var pluginButton = new RadioButton(new RadioImageWidget(plugin.ButtonText, theme.Colors.PrimaryTextColor, plugin.Icon))
var pluginButton = new RadioButton(new RadioImageWidget(plugin.ButtonText, theme.TextColor, plugin.Icon))
{
HAnchor = HAnchor.Left,
Margin = commonMargin,
@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl
if (AggContext.OperatingSystem == OSType.Windows
|| AggContext.OperatingSystem == OSType.X11)
{
showInFolderAfterSave = new CheckBox("Show file in folder after save".Localize(), ActiveTheme.Instance.PrimaryTextColor, 10)
showInFolderAfterSave = new CheckBox("Show file in folder after save".Localize(), theme.TextColor, 10)
{
HAnchor = HAnchor.Left,
Cursor = Cursors.Hand

2
MatterControlLib/CustomWidgets/HelpArticleHeader.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.HAnchor = HAnchor.Stretch;
this.VAnchor = VAnchor.Fit;
var titleText = new TextWidget(helpArticle.Name, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: pointSize > 0 ? pointSize : theme.DefaultFontSize, bold: boldFont)
var titleText = new TextWidget(helpArticle.Name, textColor: theme.TextColor, pointSize: pointSize > 0 ? pointSize : theme.DefaultFontSize, bold: boldFont)
{
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true,

2
MatterControlLib/CustomWidgets/InlineStringEdit.cs
View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.HAnchor = HAnchor.Stretch;
this.VAnchor = VAnchor.Fit;
titleText = new TextWidget(stringValue, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: theme.DefaultFontSize, bold: boldFont)
titleText = new TextWidget(stringValue, textColor: theme.TextColor, pointSize: theme.DefaultFontSize, bold: boldFont)
{
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true,

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

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
Name = "Bread Crumb Button " + listView.ActiveContainer.Name,
VAnchor = VAnchor.Center,
Margin = theme.ButtonSpacing,
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
this.AddChild(containerButton);
}
@ -100,7 +100,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
if (!firstItem)
{
// Add path separator
this.AddChild(new TextWidget("/", pointSize: theme.DefaultFontSize + 1, textColor: ActiveTheme.Instance.PrimaryTextColor)
this.AddChild(new TextWidget("/", pointSize: theme.DefaultFontSize + 1, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = extraSpacing.Clone(top: 2)
@ -113,7 +113,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
Name = "Bread Crumb Button " + container.Name,
VAnchor = VAnchor.Center,
Margin = theme.ButtonSpacing.Clone(top: 1),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
containerButton.Click += (s, e) =>
{
@ -133,7 +133,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
// lets take out the > and put in a ...
this.RemoveChild(1);
var separator = new TextWidget("...", textColor: ActiveTheme.Instance.PrimaryTextColor)
var separator = new TextWidget("...", textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(right: 5)

6
MatterControlLib/CustomWidgets/PrintingWindow/ProgressDial.cs
View file

@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
primaryAccentColor = theme.PrimaryAccentColor;
primaryAccentShade = theme.PrimaryAccentColor.WithLightnessAdjustment(0.7).ToColor();
percentCompleteWidget = new TextWidget("", pointSize: 22, textColor: ActiveTheme.Instance.PrimaryTextColor)
percentCompleteWidget = new TextWidget("", pointSize: 22, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center,
@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
CompletedRatio = 0;
layerCountWidget = new TextWidget("", pointSize: 12, textColor: ActiveTheme.Instance.PrimaryTextColor)
layerCountWidget = new TextWidget("", pointSize: 12, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center,
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.AddChild(percentCompleteWidget);
this.AddChild(layerCountWidget);
borderColor = ActiveTheme.Instance.PrimaryTextColor;
borderColor = theme.TextColor;
borderColor.Alpha0To1 = 0.3f;
}

10
MatterControlLib/CustomWidgets/PrintingWindow/TemperatureStatusWidget.cs
View file

@ -45,7 +45,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
public TemperatureStatusWidget(PrinterConfig printer, string dispalyName, ThemeConfig theme)
{
this.printer = printer;
var extruderName = new TextWidget(dispalyName, pointSize: fontSize, textColor: ActiveTheme.Instance.PrimaryTextColor)
var extruderName = new TextWidget(dispalyName, pointSize: fontSize, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center,
@ -59,12 +59,12 @@ namespace MatterHackers.MatterControl.CustomWidgets
FillColor = theme.PrimaryAccentColor,
Margin = new BorderDouble(right: 10),
BorderColor = Color.Transparent,
BackgroundColor = new Color(ActiveTheme.Instance.PrimaryTextColor, 50),
BackgroundColor = new Color(theme.TextColor, 50),
VAnchor = VAnchor.Center,
};
this.AddChild(progressBar);
actualTemp = new TextWidget("", pointSize: fontSize, textColor: ActiveTheme.Instance.PrimaryTextColor)
actualTemp = new TextWidget("", pointSize: fontSize, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center,
@ -75,11 +75,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.AddChild(new VerticalLine()
{
BackgroundColor = ActiveTheme.Instance.PrimaryTextColor,
BackgroundColor = theme.TextColor,
Margin = new BorderDouble(8, 0)
});
targetTemp = new TextWidget("", pointSize: fontSize, textColor: ActiveTheme.Instance.PrimaryTextColor)
targetTemp = new TextWidget("", pointSize: fontSize, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center,

2
MatterControlLib/CustomWidgets/SavePartsSheetFeedbackWindow.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl
private TextWidget CreateNextLine(string startText)
{
return new TextWidget(startText, textColor: ActiveTheme.Instance.PrimaryTextColor)
return new TextWidget(startText, textColor: AppContext.Theme.TextColor)
{
Margin = new BorderDouble(0, 2),
HAnchor = Agg.UI.HAnchor.Left,

6
MatterControlLib/CustomWidgets/SimpleButton.cs
View file

@ -410,11 +410,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
this.VAnchor = VAnchor.Absolute | VAnchor.Center;
this.Height = theme.ButtonHeight;
this.Padding = theme.TextButtonPadding;
this.TextColor = theme.Colors.PrimaryTextColor;
this.TextColor = theme.TextColor;
var textSize = (pointSize != -1) ? pointSize : theme.DefaultFontSize;
this.AddChild(textWidget = new TextWidget(text, pointSize: textSize, textColor: theme.Colors.PrimaryTextColor)
this.AddChild(textWidget = new TextWidget(text, pointSize: textSize, textColor: theme.TextColor)
{
HAnchor = HAnchor.Center,
VAnchor = VAnchor.Center,
@ -472,7 +472,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
};
this.AddChild(textContainer);
textContainer.AddChild(textWidget = new TextWidget(text, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor));
textContainer.AddChild(textWidget = new TextWidget(text, pointSize: theme.DefaultFontSize, textColor: theme.TextColor));
}
public ImageWidget ImageWidget { get; }

2
MatterControlLib/CustomWidgets/SingleWindowProvider.cs
View file

@ -102,7 +102,7 @@ namespace MatterHackers.Agg.UI
VAnchor = VAnchor.Center
});
titleBarRow.ActionArea.AddChild(new TextWidget(systemWindow.Title ?? "", pointSize: theme.DefaultFontSize - 1, textColor: theme.Colors.PrimaryTextColor)
titleBarRow.ActionArea.AddChild(new TextWidget(systemWindow.Title ?? "", pointSize: theme.DefaultFontSize - 1, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
});

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

@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
});
};
this.HighlightRegion.AddChild(textWidget = new TextWidget(this.Text, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
this.HighlightRegion.AddChild(textWidget = new TextWidget(this.Text, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Selectable = false,
AutoExpandBoundsToText = true,

8
MatterControlLib/DesignTools/PublicPropertyEditor.cs
View file

@ -197,7 +197,7 @@ namespace MatterHackers.MatterControl.DesignTools
ToolTipText = toolTipText
};
var label = new TextWidget(labelText + ":", pointSize: 11, textColor: ActiveTheme.Instance.PrimaryTextColor)
var label = new TextWidget(labelText + ":", pointSize: 11, textColor: AppContext.Theme.TextColor)
{
Margin = new BorderDouble(0, 0, 3, 0),
VAnchor = VAnchor.Center
@ -241,7 +241,7 @@ namespace MatterHackers.MatterControl.DesignTools
ToolTipText = toolTipText
};
var label = new TextWidget(labelText + ":", pointSize: 11, textColor: ActiveTheme.Instance.PrimaryTextColor)
var label = new TextWidget(labelText + ":", pointSize: 11, textColor: AppContext.Theme.TextColor)
{
Margin = new BorderDouble(0, 3, 0, 0),
HAnchor = HAnchor.Left
@ -655,7 +655,7 @@ namespace MatterHackers.MatterControl.DesignTools
var radioButton = new RadioButton(string.IsNullOrWhiteSpace(child.Name) ? $"{itemIndex}" : $"{child.Name}")
{
Checked = childSelector.Contains(child.ID),
TextColor = ActiveTheme.Instance.PrimaryTextColor
TextColor = theme.TextColor
};
radioSiblings.Add(radioButton);
radioButton.SiblingRadioButtonList = radioSiblings;
@ -666,7 +666,7 @@ namespace MatterHackers.MatterControl.DesignTools
selectWidget = new CheckBox(string.IsNullOrWhiteSpace(child.Name) ? $"{itemIndex}" : $"{child.Name}")
{
Checked = childSelector.Contains(child.ID),
TextColor = ActiveTheme.Instance.PrimaryTextColor
TextColor = theme.TextColor
};
}

4
MatterControlLib/EeProm/EePromMarlinWindow.cs
View file

@ -287,7 +287,7 @@ namespace MatterHackers.MatterControl.EeProm
private GuiWidget CreateTextField(string label)
{
var textWidget = new TextWidget(label, pointSize: theme.FontSize10, textColor: ActiveTheme.Instance.PrimaryTextColor)
var textWidget = new TextWidget(label, pointSize: theme.FontSize10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
HAnchor = HAnchor.Right
@ -311,7 +311,7 @@ namespace MatterHackers.MatterControl.EeProm
HAnchor = HAnchor.Stretch
};
var labelWidget = new TextWidget(label, pointSize: theme.FontSize10, textColor: ActiveTheme.Instance.PrimaryTextColor);
var labelWidget = new TextWidget(label, pointSize: theme.FontSize10, textColor: theme.TextColor);
maxWidthOfLeftStuff = Math.Max(maxWidthOfLeftStuff, labelWidget.Width);
var holder = new GuiWidget(labelWidget.Width, labelWidget.Height)

4
MatterControlLib/EeProm/EePromRepetierWindow.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.EeProm
CreateSpacer(row);
row.AddChild(new TextWidget("Value".Localize(), pointSize: theme.FontSize10, textColor: ActiveTheme.Instance.PrimaryTextColor)
row.AddChild(new TextWidget("Value".Localize(), pointSize: theme.FontSize10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(left: 5, right: 60)
@ -319,7 +319,7 @@ namespace MatterHackers.MatterControl.EeProm
private GuiWidget AddDescription(string description)
{
var holder = new GuiWidget(340, 40);
holder.AddChild(new TextWidget(description, pointSize: theme.DefaultFontSize, textColor: ActiveTheme.Instance.PrimaryTextColor)
holder.AddChild(new TextWidget(description, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center
});

6
MatterControlLib/Library/Export/GCodeExport.cs
View file

@ -84,7 +84,9 @@ namespace MatterHackers.MatterControl.Library.Export
Margin = new BorderDouble(left: 40, bottom: 10),
};
var spiralVaseCheckbox = new CheckBox("Spiral Vase".Localize(), ActiveTheme.Instance.PrimaryTextColor, 10)
var theme = AppContext.Theme;
var spiralVaseCheckbox = new CheckBox("Spiral Vase".Localize(), theme.TextColor, 10)
{
Checked = false,
Cursor = Cursors.Hand,
@ -98,7 +100,7 @@ namespace MatterHackers.MatterControl.Library.Export
// If print leveling is enabled then add in a check box 'Apply Leveling During Export' and default checked.
if (printer.Settings.GetValue<bool>(SettingsKey.print_leveling_enabled))
{
var levelingCheckbox = new CheckBox("Apply leveling to G-Code during export".Localize(), ActiveTheme.Instance.PrimaryTextColor, 10)
var levelingCheckbox = new CheckBox("Apply leveling to G-Code during export".Localize(), theme.TextColor, 10)
{
Checked = true,
Cursor = Cursors.Hand,

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

@ -64,7 +64,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
_expandable = expandable;
this.AddChild(textWidget = new TextWidget(text, pointSize: pointSize, textColor: theme.Colors.PrimaryTextColor)
this.AddChild(textWidget = new TextWidget(text, pointSize: pointSize, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
AutoExpandBoundsToText = true

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

@ -325,7 +325,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
row.AddChild(
new TextWidget(
text,
textColor: theme.Colors.PrimaryTextColor,
textColor: theme.TextColor,
pointSize: theme.DefaultFontSize)
{
VAnchor = VAnchor.Center
@ -344,7 +344,7 @@ namespace MatterHackers.MatterControl.Library.Widgets.HardwarePage
row.AddChild(
new TextWidget(
text,
textColor: theme.Colors.PrimaryTextColor,
textColor: theme.TextColor,
pointSize: theme.DefaultFontSize));
return row;

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

@ -310,7 +310,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
};
container.AddChild(imageWidget);
text = new TextWidget(item.Model.Name, 0, 0, 9, textColor: ActiveTheme.Instance.PrimaryTextColor)
text = new TextWidget(item.Model.Name, 0, 0, 9, textColor: theme.TextColor)
{
AutoExpandBoundsToText = false,
EllipsisIfClipped = true,

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

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
Name = "List Item Thumbnail",
});
row.AddChild(new TextWidget(listViewItem.Model.Name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
row.AddChild(new TextWidget(listViewItem.Model.Name, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(10, 0)

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

@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
whiteBackground.AddChild(imageWidget);
}
var wrappedText = new WrappedTextWidget(item.title, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: theme.DefaultFontSize)
var wrappedText = new WrappedTextWidget(item.title, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
Selectable = false,
VAnchor = VAnchor.Center | VAnchor.Fit,

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

@ -178,7 +178,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
graphics2D.DrawString(content.text, image.Width/2, image.Height/2 + printer.TypeFaceStyle.EmSizeInPixels / 2, goalPointSize,
Justification.Center, Baseline.BoundsTop,
theme.Colors.PrimaryTextColor);
theme.TextColor);
if (content.link != null)
{

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

@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
if (content.group_title != null)
{
this.AddChild(new TextWidget(content.group_title, pointSize: theme.H1PointSize, textColor: ActiveTheme.Instance.PrimaryTextColor, bold: true)
this.AddChild(new TextWidget(content.group_title, pointSize: theme.H1PointSize, textColor: theme.TextColor, bold: true)
{
HAnchor = HAnchor.Left,
Margin = new BorderDouble(leftRightMargin, 5)

2
MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeDetailsView.cs
View file

@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
TextWidget AddSetting(string title, string value)
{
var textWidget = new TextWidget(value, textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
var textWidget = new TextWidget(value, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center

2
MatterControlLib/PartPreviewWindow/GCodeDetails/GCodeLayerDetailsView.cs
View file

@ -72,7 +72,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
TextWidget AddSetting(string title, string value)
{
var textWidget = new TextWidget(value, textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
var textWidget = new TextWidget(value, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center

4
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -115,7 +115,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ToolTipText = "See what's new in this version of MatterControl".Localize(),
VAnchor = VAnchor.Center,
Margin = new BorderDouble(10, 0),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
seeWhatsNewButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
@ -178,7 +178,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double pulseTime = 1;
double totalSeconds = 0;
var textWidgets = updateAvailableButton.Descendants<TextWidget>().Where((w) => w.Visible == true).ToArray();
Color startColor = theme.Colors.PrimaryTextColor;
Color startColor = theme.TextColor;
// Show a highlight on the button as the user did not click it
Animation flashBackground = null;
flashBackground = new Animation()

6
MatterControlLib/PartPreviewWindow/MaterialControls.cs
View file

@ -77,14 +77,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
DrawGrid = true,
});
buttonView.AddChild(new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
buttonView.AddChild(new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center
});
var radioButtonView = new RadioButtonView(buttonView)
{
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
radioButtonView.RadioCircle.Margin = radioButtonView.RadioCircle.Margin.Clone(right: 5);
@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Checked = extruderIndex == initialMaterialIndex
};
materialButtons.Add(radioButton);

4
MatterControlLib/PartPreviewWindow/Object3DTreeBuilder.cs
View file

@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
Text = "Loading".Localize(),
Tag = item.Source,
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
PointSize = theme.DefaultFontSize,
};
}
@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
Text = GetName(item),
Tag = item.Source,
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
PointSize = theme.DefaultFontSize,
};

16
MatterControlLib/PartPreviewWindow/PopupMenu.cs
View file

@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
GuiWidget content;
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Padding = MenuPadding,
};
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Fit
};
content.AddChild(new TextWidget(shortCut, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
content.AddChild(new TextWidget(shortCut, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
HAnchor = HAnchor.Right
});
@ -141,7 +141,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
arrow.LineTo(x - 3, y + 5);
arrow.LineTo(x - 3, y - 5);
graphics2D.Render(arrow, theme.Colors.PrimaryTextColor);
graphics2D.Render(arrow, theme.TextColor);
}
public bool KeepMenuOpen
@ -223,14 +223,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
RadioImage.DrawCircle(
radioIconChecked.NewGraphics2D(),
rect.Center,
theme.Colors.PrimaryTextColor,
theme.TextColor,
isChecked: true,
isActive: false);
RadioImage.DrawCircle(
radioIconUnchecked.NewGraphics2D(),
rect.Center,
theme.Colors.PrimaryTextColor,
theme.TextColor,
isChecked: false,
isActive: false);
}
@ -279,7 +279,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public void CreateSubMenu(string menuTitle, ThemeConfig menuTheme, Action<PopupMenu> populateSubMenu, ImageBuffer icon = null)
{
var content = new TextWidget(menuTitle, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
var content = new TextWidget(menuTitle, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Padding = MenuPadding,
};
@ -332,7 +332,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public MenuItem CreateBoolMenuItem(string name, Func<bool> getter, Action<bool> setter, bool useRadioStyle = false, IList<GuiWidget> siblingRadioButtonList = null)
{
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Padding = MenuPadding,
};
@ -348,7 +348,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
row.AddChild(new IconButton(icon, theme));
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
var textWidget = new TextWidget(name, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Padding = MenuPadding,
VAnchor = VAnchor.Center

2
MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
View file

@ -587,7 +587,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Center
});
var timeWidget = new TextWidget("", pointSize: 22, textColor: theme.Colors.PrimaryTextColor)
var timeWidget = new TextWidget("", pointSize: 22, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
Margin = new BorderDouble(10, 0, 0, 0),

2
MatterControlLib/PartPreviewWindow/SaveAsPage.cs
View file

@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl
{
var fileNameHeader = new TextWidget("Design Name".Localize(), pointSize: 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5),
HAnchor = HAnchor.Left
};

6
MatterControlLib/PartPreviewWindow/SliceLayerSelector.cs
View file

@ -73,7 +73,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
currentLayerInfo = new InlineEditControl("1000")
{
Name = "currentLayerInfo",
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
GetDisplayString = (value) => $"{value}",
HAnchor = HAnchor.Right | HAnchor.Fit,
VAnchor = VAnchor.Absolute | VAnchor.Fit,
@ -147,7 +147,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
this.sceneContext = sceneContext;
layerCountText = new TextWidget("", pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)
layerCountText = new TextWidget("", pointSize: 9, textColor: theme.TextColor)
{
MinimumSize = new Vector2(20, 20),
AutoExpandBoundsToText = true,
@ -176,7 +176,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
};
this.AddChild(layerSlider);
layerStartText = new TextWidget("1", pointSize: 9, textColor: ActiveTheme.Instance.PrimaryTextColor)
layerStartText = new TextWidget("1", pointSize: 9, textColor: theme.TextColor)
{
AutoExpandBoundsToText = true,
HAnchor = HAnchor.Center

2
MatterControlLib/PartPreviewWindow/SpeedsLegend.cs
View file

@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
});
this.AddChild(
new TextWidget($"{millimetersPerSecond} mm/s", pointSize: pointSize, textColor: ActiveTheme.Instance.PrimaryTextColor)
new TextWidget($"{millimetersPerSecond} mm/s", pointSize: pointSize, textColor: AppContext.Theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(8, 0),

4
MatterControlLib/PartPreviewWindow/Tabs.cs
View file

@ -370,11 +370,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (iconImage != null)
{
tabPill = new TabPill(tabLabel, ActiveTheme.Instance.PrimaryTextColor, iconImage, pointSize);
tabPill = new TabPill(tabLabel, theme.TextColor, iconImage, pointSize);
}
else
{
tabPill = new TabPill(tabLabel, ActiveTheme.Instance.PrimaryTextColor, tabImageUrl, pointSize);
tabPill = new TabPill(tabLabel, theme.TextColor, tabImageUrl, pointSize);
}
tabPill.Margin = (hasClose) ? new BorderDouble(right: 16) : 0;

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

@ -185,7 +185,7 @@ namespace MatterHackers.MatterControl.DesignTools
imageSection.ContentPanel.AddChild(row);
// Invert checkbox
var invertCheckbox = new CheckBox(new CheckBoxViewText("Invert".Localize(), textColor: theme.Colors.PrimaryTextColor))
var invertCheckbox = new CheckBox(new CheckBoxViewText("Invert".Localize(), textColor: theme.TextColor))
{
Checked = imageObject.Invert,
Margin = new BorderDouble(0),

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

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BackgroundColor = menuTheme.ActiveTabColor
};
column.AddChild(new TextWidget("Options".Localize(), textColor: menuTheme.Colors.PrimaryTextColor)
column.AddChild(new TextWidget("Options".Localize(), textColor: menuTheme.TextColor)
{
HAnchor = HAnchor.Left
});

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

@ -199,7 +199,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (!buttonIsBeingClicked)
{
activeButton.FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
activeButton.FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.TextColor, 6).ToColor());
}
}
};

2
MatterControlLib/PartPreviewWindow/ViewStyleButton.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
iconButton.SetIcon(viewIcons[sceneContext.ViewState.RenderType]);
if (!this.MenuVisible)
{
iconButton.FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.Colors.PrimaryTextColor, 6).ToColor());
iconButton.FlashBackground(theme.PrimaryAccentColor.WithContrast(theme.TextColor, 6).ToColor());
}
}
}

2
MatterControlLib/PrinterControls/ControlWidgets/FanControls.cs
View file

@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.PrinterControls
container.Selectable = true;
// put in %
container.AddChild(new TextWidget("%", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("%", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center
});

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

@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.PrinterControls
if (!printer.Settings.Macros.Any())
{
var noMacrosFound = new TextWidget("No macros are currently set up for this printer.".Localize(), pointSize: 10, textColor: theme.Colors.PrimaryTextColor);
var noMacrosFound = new TextWidget("No macros are currently set up for this printer.".Localize(), pointSize: 10, textColor: theme.TextColor);
this.AddChild(noMacrosFound);
}
else

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

@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl.PrinterControls
// Display the current baby step offset stream values
var offsetStreamLabel = new TextWidget("Z Offset".Localize() + ":", pointSize: 8)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(left: 10),
AutoExpandBoundsToText = true,
VAnchor = VAnchor.Center
@ -191,9 +191,9 @@ namespace MatterHackers.MatterControl.PrinterControls
Padding = 0
};
var xPosition = new TextWidget("X: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var yPosition = new TextWidget("Y: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var zPosition = new TextWidget("Z: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor);
var xPosition = new TextWidget("X: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
var yPosition = new TextWidget("Y: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
var zPosition = new TextWidget("Z: 0.0 ", pointSize: theme.DefaultFontSize, textColor: theme.TextColor);
hwDestinationBar.AddChild(xPosition);
hwDestinationBar.AddChild(yPosition);
@ -284,7 +284,7 @@ namespace MatterHackers.MatterControl.PrinterControls
zOffsetStreamDisplay = new TextWidget(zoffset.ToString("0.##"), pointSize: theme.DefaultFontSize)
{
AutoExpandBoundsToText = true,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5, 0, 8, 0),
VAnchor = VAnchor.Center
};

4
MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs
View file

@ -88,7 +88,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch
};
var positionLabel = new TextWidget("{0} {1,-5}".FormatWith("Position".Localize(), row + 1), textColor: ActiveTheme.Instance.PrimaryTextColor);
var positionLabel = new TextWidget("{0} {1,-5}".FormatWith("Position".Localize(), row + 1), textColor: theme.TextColor);
positionLabel.VAnchor = VAnchor.Center;
leftRightEdit.AddChild(positionLabel);
@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl
}
leftRightEdit.AddChild(
new TextWidget($" {axisName}: ", textColor: ActiveTheme.Instance.PrimaryTextColor)
new TextWidget($" {axisName}: ", textColor: theme.TextColor)
{
VAnchor = VAnchor.Center
});

8
MatterControlLib/PrinterControls/JogControls.cs
View file

@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl
moveRadioButtons.Margin = new BorderDouble(0, 3);
setMoveDistanceControl.AddChild(moveRadioButtons);
moveRadioButtons.AddChild(new TextWidget("mm", textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 8)
moveRadioButtons.AddChild(new TextWidget("mm", textColor: theme.TextColor, pointSize: 8)
{
Margin = new BorderDouble(left: 10),
VAnchor = VAnchor.Center
@ -457,7 +457,7 @@ namespace MatterHackers.MatterControl
TextWidget eMinusControlLabel = new TextWidget("Retract".Localize(), pointSize: 11)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Center
};
eMinusButtonAndText.AddChild(eMinusControlLabel);
@ -506,7 +506,7 @@ namespace MatterHackers.MatterControl
}
TextWidget ePlusControlLabel = new TextWidget("Extrude".Localize(), pointSize: 11);
ePlusControlLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
ePlusControlLabel.TextColor = theme.TextColor;
ePlusControlLabel.VAnchor = VAnchor.Center;
ePlusButtonAndText.AddChild(ePlusControlLabel);
eButtons.AddChild(ePlusButtonAndText);
@ -563,7 +563,7 @@ namespace MatterHackers.MatterControl
}
setMoveDistanceControl.AddChild(
new TextWidget("mm", textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 8)
new TextWidget("mm", textColor: theme.TextColor, pointSize: 8)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(left: 10)

8
MatterControlLib/PrinterControls/MacroDetailPage.cs
View file

@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(new TextWidget("Macro Name".Localize() + ":", 0, 0, 12)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 0, 0, 1)
});
@ -71,14 +71,14 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(macroNameError = new TextWidget("Give the macro a name".Localize() + ".", 0, 0, 10)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
});
ContentRow.AddChild(new TextWidget("Macro Commands".Localize() + ":", 0, 0, 12)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 0, 0, 1)
});
@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(macroCommandError = new TextWidget("This should be in 'G-Code'".Localize() + ".", 0, 0, 10)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
});

6
MatterControlLib/PrinterControls/MacroListPage.cs
View file

@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
Padding = new BorderDouble(3),
};
macroRow.AddChild(new TextWidget(GCodeMacro.FixMacroName(macro.Name), textColor: theme.Colors.PrimaryTextColor));
macroRow.AddChild(new TextWidget(GCodeMacro.FixMacroName(macro.Name), textColor: theme.TextColor));
macroRow.AddChild(new HorizontalSpacer());
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
var editLink = new LinkLabel("edit".Localize(), theme)
{
Margin = new BorderDouble(right: 5),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
editLink.Click += (s, e) =>
{
@ -100,7 +100,7 @@ namespace MatterHackers.MatterControl
var removeLink = new LinkLabel("remove".Localize(), theme)
{
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
removeLink.Click += (sender, e) =>
{

8
MatterControlLib/PrinterControls/MovementSpeedsPage.cs
View file

@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl
this.WindowSize = new Vector2(500 * GuiWidget.DeviceScale, 320 * GuiWidget.DeviceScale);
var rightLabel = new TextWidget("mm/s".Localize(), textColor: theme.Colors.PrimaryTextColor, pointSize: theme.FontSize10)
var rightLabel = new TextWidget("mm/s".Localize(), textColor: theme.TextColor, pointSize: theme.FontSize10)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(right: 20)
@ -66,7 +66,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch
};
headerBar.AddChild(new TextWidget(this.WindowTitle, textColor: theme.Colors.PrimaryTextColor, pointSize: theme.FontSize10));
headerBar.AddChild(new TextWidget(this.WindowTitle, textColor: theme.TextColor, pointSize: theme.FontSize10));
ContentRow.AddChild(headerBar);
@ -87,11 +87,11 @@ namespace MatterHackers.MatterControl
if (settingsArray[i].StartsWith("e"))
{
axisLabel = new TextWidget(string.Format("{0}(s)", "Extruder".Localize()), textColor: ActiveTheme.Instance.PrimaryTextColor);
axisLabel = new TextWidget(string.Format("{0}(s)", "Extruder".Localize()), textColor: theme.TextColor);
}
else
{
axisLabel = new TextWidget(string.Format("{0} {1}", "Axis".Localize(), settingsArray[i].ToUpper()), textColor: ActiveTheme.Instance.PrimaryTextColor);
axisLabel = new TextWidget(string.Format("{0} {1}", "Axis".Localize(), settingsArray[i].ToUpper()), textColor: theme.TextColor);
}
axisLabel.VAnchor = VAnchor.Center;
row.AddChild(axisLabel);

10
MatterControlLib/PrinterControls/PrinterConnections/SetupStepBaudRate.cs
View file

@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
string baudRateLabelTextFull = string.Format("{0}:", baudRateLabelText);
TextWidget baudRateLabel = new TextWidget(baudRateLabelTextFull, 0, 0, 12);
baudRateLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
baudRateLabel.TextColor = theme.TextColor;
baudRateLabel.Margin = new BorderDouble(0, 0, 0, 10);
baudRateLabel.HAnchor = HAnchor.Stretch;
@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
baudRateMessageContainer.HAnchor = HAnchor.Stretch;
printerBaudRateError = new TextWidget("Select the baud rate.".Localize(), 0, 0, 10);
printerBaudRateError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerBaudRateError.TextColor = theme.TextColor;
printerBaudRateError.AutoExpandBoundsToText = true;
printerBaudRateHelpLink = new LinkLabel("What's this?".Localize(), theme)
@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerBaudRateHelpLink.Click += printerBaudRateHelp_Click;
printerBaudRateHelpMessage = new TextWidget("The term 'Baud Rate' roughly means the speed at which\ndata is transmitted. Baud rates may differ from printer to\nprinter. Refer to your printer manual for more info.\n\nTip: If you are uncertain - try 250000.".Localize(), 0, 0, 10);
printerBaudRateHelpMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerBaudRateHelpMessage.TextColor = theme.TextColor;
printerBaudRateHelpMessage.Margin = new BorderDouble(top: 10);
printerBaudRateHelpMessage.Visible = false;
@ -143,7 +143,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
RadioButton baudOption = new RadioButton(baudRate);
BaudRateButtonsList.Add(baudOption);
baudOption.Margin = baudRateMargin;
baudOption.TextColor = ActiveTheme.Instance.PrimaryTextColor;
baudOption.TextColor = theme.TextColor;
if (printer.Settings.GetValue(SettingsKey.baud_rate) == baudRate)
{
baudOption.Checked = true;
@ -153,7 +153,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
otherBaudRateRadioButton = new RadioButton("Other".Localize());
otherBaudRateRadioButton.Margin = baudRateMargin;
otherBaudRateRadioButton.TextColor = ActiveTheme.Instance.PrimaryTextColor;
otherBaudRateRadioButton.TextColor = theme.TextColor;
baudRateContainer.AddChild(otherBaudRateRadioButton);

16
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -83,10 +83,10 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
try
{
printerComPortHelpLink.Visible = false;
printerComPortError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerComPortError.TextColor = theme.TextColor;
printerComPortError.Text = "Attempting to connect".Localize() + "...";
printerComPortError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerComPortError.TextColor = theme.TextColor;
printer.Settings.Helpers.SetComPort(GetSelectedSerialPort());
printer.Connection.Connect();
@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var comPortLabel = new TextWidget("Serial Port".Localize() + ":", 0, 0, 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(0, 0, 0, 10),
HAnchor = HAnchor.Stretch
};
@ -155,7 +155,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerComPortError = new TextWidget("Currently available serial ports.".Localize(), 0, 0, 10)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
AutoExpandBoundsToText = true
};
@ -168,7 +168,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerComPortHelpMessage = new TextWidget("The 'Serial Port' section lists all available serial\nports on your device. Changing which USB port the printer\nis connected to may change the associated serial port.\n\nTip: If you are uncertain, unplug/plug in your printer\nand hit refresh. The new port that appears should be\nyour printer.".Localize(), 0, 0, 10)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(top: 10),
Visible = false
};
@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
if (printer.Connection.IsConnected)
{
printerComPortHelpLink.Visible = false;
printerComPortError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerComPortError.TextColor = theme.TextColor;
printerComPortError.Text = "Connection succeeded".Localize() + "!";
nextButton.Visible = true;
connectButton.Visible = false;
@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var comPortOption = new TextWidget("No COM ports available".Localize())
{
Margin = new BorderDouble(3, 6, 5, 6),
TextColor = ActiveTheme.Instance.PrimaryTextColor
TextColor = theme.TextColor
};
comPortContainer.AddChild(comPortOption);
}
@ -255,7 +255,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
HAnchor = HAnchor.Left,
Margin = new BorderDouble(3, 3, 5, 3),
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Checked = isActivePrinterPort
};
}

14
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var printerMessageOne = new TextWidget("MatterControl will now attempt to auto-detect printer.".Localize(), 0, 0, 10)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};
@ -61,7 +61,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var printerMessageTwo = new TextWidget(string.Format("1.) {0} ({1}).", "Disconnect printer".Localize(), "if currently connected".Localize()), 0, 0, 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};
@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var printerMessageThree = new TextWidget(string.Format("2.) {0} '{1}'.", "Press".Localize(), "Continue".Localize()), 0, 0, 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var setupManualConfigurationOrSkipConnectionWidget = new TextWidget("You can also".Localize() + ":", 0, 0, 10)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};
@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var manualLink = new LinkLabel("Manually Configure Connection".Localize(), theme)
{
Margin = new BorderDouble(0, 5),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
manualLink.Click += (s, e) => UiThread.RunOnIdle(() =>
{
@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var printerMessageFour = new TextWidget("or".Localize(), 0, 0, 10)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};
@ -117,7 +117,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var skipConnectionLink = new LinkLabel("Skip Connection Setup".Localize(), theme)
{
Margin = new BorderDouble(0, 8),
TextColor = theme.Colors.PrimaryTextColor
TextColor = theme.TextColor
};
skipConnectionLink.Click += (s, e) => UiThread.RunOnIdle(() =>
{

10
MatterControlLib/PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
}
else
{
printerErrorMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerErrorMessage.TextColor = theme.TextColor;
printerErrorMessage.Text = "Attempting to connect".Localize() + "...";
printer.Settings.Helpers.SetComPort(candidatePort);
@ -120,14 +120,14 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
string printerMessageOneText = "MatterControl will now attempt to auto-detect printer.".Localize();
TextWidget printerMessageOne = new TextWidget(printerMessageOneText, 0, 0, 10);
printerMessageOne.Margin = new BorderDouble(0, 10, 0, 5);
printerMessageOne.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerMessageOne.TextColor = theme.TextColor;
printerMessageOne.HAnchor = HAnchor.Stretch;
printerMessageOne.Margin = elementMargin;
string printerMessageFourBeg = "Connect printer (make sure it is on)".Localize();
string printerMessageFourFull = string.Format("1.) {0}.", printerMessageFourBeg);
TextWidget printerMessageFour = new TextWidget(printerMessageFourFull, 0, 0, 12);
printerMessageFour.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerMessageFour.TextColor = theme.TextColor;
printerMessageFour.HAnchor = HAnchor.Stretch;
printerMessageFour.Margin = elementMargin;
@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
string printerMessageFiveTxtEnd = "Connect".Localize();
string printerMessageFiveTxtFull = string.Format("2.) {0} '{1}'.", printerMessageFiveTxtBeg, printerMessageFiveTxtEnd);
TextWidget printerMessageFive = new TextWidget(printerMessageFiveTxtFull, 0, 0, 12);
printerMessageFive.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerMessageFive.TextColor = theme.TextColor;
printerMessageFive.HAnchor = HAnchor.Stretch;
printerMessageFive.Margin = elementMargin;
@ -172,7 +172,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
if (printer.Connection.IsConnected)
{
printerErrorMessage.TextColor = ActiveTheme.Instance.PrimaryTextColor;
printerErrorMessage.TextColor = theme.TextColor;
printerErrorMessage.Text = "Connection succeeded".Localize() + "!";
nextButton.Visible = true;
connectButton.Visible = false;

10
MatterControlLib/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -126,7 +126,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
var commonMargin = new BorderDouble(4, 2);
// Create export button for each plugin
signInRadioButton = new RadioButton(new RadioButtonViewText("Sign in to access your existing printers".Localize(), theme.Colors.PrimaryTextColor))
signInRadioButton = new RadioButton(new RadioButtonViewText("Sign in to access your existing printers".Localize(), theme.TextColor))
{
HAnchor = HAnchor.Left,
Margin = commonMargin.Clone(bottom: 10),
@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
};
ContentRow.AddChild(signInRadioButton);
createPrinterRadioButton = new RadioButton(new RadioButtonViewText("Create a new printer", theme.Colors.PrimaryTextColor))
createPrinterRadioButton = new RadioButton(new RadioButtonViewText("Create a new printer", theme.TextColor))
{
HAnchor = HAnchor.Left,
Margin = commonMargin,
@ -218,7 +218,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
TextWidget printerNameLabel = new TextWidget("Name".Localize() + ":", 0, 0, 12)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(0, 4, 0, 1)
};
@ -231,7 +231,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
printerNameError = new TextWidget("", 0, 0, 10)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = new BorderDouble(top: 3)
};
@ -252,7 +252,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
var sectionLabel = new TextWidget(labelText, 0, 0, 12)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
Margin = elementMargin
};

6
MatterControlLib/PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl
filterOutput = new CheckBox("Filter Output".Localize(), textSize: theme.DefaultFontSize)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Bottom,
};
filterOutput.CheckedStateChanged += (s, e) =>
@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl
{
Margin = new BorderDouble(left: 25),
Checked = UserSettings.Instance.Fields.GetBool(UserSettingsKey.TerminalAutoUppercase, true),
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
VAnchor = VAnchor.Bottom
};
autoUppercase.CheckedStateChanged += (s, e) =>
@ -106,7 +106,7 @@ namespace MatterHackers.MatterControl
textScrollWidget = new TextScrollWidget(printer, printer.Connection.TerminalLog.PrinterLines)
{
BackgroundColor = theme.MinimalShade,
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch,
Margin = 0,

12
MatterControlLib/SetupWizard/AndroidConnectDevicePage.cs
View file

@ -58,15 +58,15 @@ namespace MatterHackers.MatterControl
{
var printerNameLabel = new TextWidget("Connect Your Device".Localize() + ":", 0, 0, labelFontSize)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(bottom: 10)
};
ContentRow.AddChild(printerNameLabel);
ContentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("Instructions".Localize() + ":", 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("1. Power on your 3D Printer.".Localize(), 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("2. Attach your 3D Printer via USB.".Localize(), 0, 0, 12,textColor:theme.TextColor));
ContentRow.AddChild(new TextWidget("3. Press 'Connect'.".Localize(), 0, 0, 12,textColor:theme.TextColor));
//Add inputs to main container
ApplicationController.Instance.ActivePrinter.Connection.CommunicationStateChanged.RegisterEvent(communicationStateChanged, ref unregisterEvents);
@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
connectButtonContainer.AddChild(new HorizontalSpacer());
ContentRow.AddChild(connectButtonContainer);
skipMessage = new TextWidget("(Press 'Skip' to setup connection later)".Localize(), 0, 0, 10, textColor: ActiveTheme.Instance.PrimaryTextColor);
skipMessage = new TextWidget("(Press 'Skip' to setup connection later)".Localize(), 0, 0, 10, textColor: theme.TextColor);
ContentRow.AddChild(skipMessage);
generalError = new TextWidget("", 0, 0, errorFontSize)

2
MatterControlLib/SetupWizard/AndroidNetworkTroubleshootingPage.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(
new TextWidget(
"MatterControl was unable to connect to the Internet. Please check your Wifi connection and try again".Localize() + "...",
textColor: ActiveTheme.Instance.PrimaryTextColor));
textColor: theme.TextColor));
var configureButton = theme.CreateDialogButton("Configure Wifi".Localize());
configureButton.Margin = new BorderDouble(0, 0, 10, 0);

8
MatterControlLib/SetupWizard/CopyGuestProfilesToUser.cs
View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl
};
scrollWindow.AddChild(container);
container.AddChild(new WrappedTextWidget(importMessage, textColor: ActiveTheme.Instance.PrimaryTextColor));
container.AddChild(new WrappedTextWidget(importMessage, textColor: theme.TextColor));
var byCheckbox = new Dictionary<CheckBox, PrinterInfo>();
@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl
{
container.AddChild(new TextWidget("Printers to Copy".Localize() + ":")
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(0, 3, 0, 15),
});
@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl
{
var checkBox = new CheckBox(printerInfo.Name)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5, 0, 0, 0),
HAnchor = HAnchor.Left,
Checked = true,
@ -131,7 +131,7 @@ namespace MatterHackers.MatterControl
});
};
rememberChoice = new CheckBox("Don't remind me again".Localize(), ActiveTheme.Instance.PrimaryTextColor);
rememberChoice = new CheckBox("Don't remind me again".Localize(), theme.TextColor);
ContentRow.AddChild(rememberChoice);
syncButton.Visible = true;

2
MatterControlLib/SetupWizard/DialogPage.cs
View file

@ -129,7 +129,7 @@ namespace MatterHackers.MatterControl
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
headerLabel.PointSize = 14;
headerLabel.TextColor = theme.Colors.PrimaryTextColor;
headerLabel.TextColor = theme.TextColor;
ContentRow.Padding = new BorderDouble(5);
footerRow.Padding = 0;

2
MatterControlLib/SetupWizard/HelpPage.cs
View file

@ -365,7 +365,7 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Fit | (left ? HAnchor.Right: HAnchor.Left),
VAnchor = VAnchor.Fit
};
var content = new TextWidget(text, bold: bold, textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
var content = new TextWidget(text, bold: bold, textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
Margin = (left ? new BorderDouble(5, 3, 10, 3) : new BorderDouble(10, 3, 5, 3))
};

10
MatterControlLib/SetupWizard/ImportSettingsPage.cs
View file

@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl
{
container.AddChild(new TextWidget("Quality Presets:")
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(0, 3),
});
@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl
{
var qualityButton = new RadioButton(string.IsNullOrEmpty(qualitySetting.Name) ? "no name" : qualitySetting.Name)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5, 0, 0, 0),
HAnchor = HAnchor.Left,
};
@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl
{
container.AddChild(new TextWidget("Material Presets:")
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(0, 3, 0, 15),
});
@ -128,7 +128,7 @@ namespace MatterHackers.MatterControl
{
var materialButton = new RadioButton(string.IsNullOrEmpty(materialSetting.Name) ? "no name" : materialSetting.Name)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5, 0),
HAnchor = HAnchor.Left,
};
@ -244,7 +244,7 @@ namespace MatterHackers.MatterControl
this.WindowTitle = "Import Wizard".Localize();
this.HeaderText = "Import Successful".Localize();
ContentRow.AddChild(new WrappedTextWidget(successMessage, textColor: theme.Colors.PrimaryTextColor));
ContentRow.AddChild(new WrappedTextWidget(successMessage, textColor: theme.TextColor));
}
}
}

2
MatterControlLib/SetupWizard/InputBoxPage.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(new TextWidget(label, pointSize: 12)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(5),
HAnchor = HAnchor.Left
});

2
MatterControlLib/SetupWizard/LicenseAgreementPage.cs
View file

@ -48,7 +48,7 @@ public class LicenseAgreementPage : DialogPage
ContentRow.AddChild(scrollable);
scrollable.ScrollArea.Margin = new BorderDouble(0, 0, 15, 0);
scrollable.AddChild(new WrappedTextWidget(eulaText, textColor: ActiveTheme.Instance.PrimaryTextColor, doubleBufferText: false)
scrollable.AddChild(new WrappedTextWidget(eulaText, textColor: theme.TextColor, doubleBufferText: false)
{
DrawFromHintedCache = true,
Name = "LicenseAgreementPage",

6
MatterControlLib/SetupWizard/PrinterProfileHistoryPage.cs
View file

@ -67,7 +67,7 @@ namespace MatterHackers.MatterControl.SetupWizard
private async void LoadHistoryItems()
{
TextWidget loadingText = new TextWidget("Retrieving History from Web...");
loadingText.TextColor = ActiveTheme.Instance.PrimaryTextColor;
loadingText.TextColor = theme.TextColor;
scrollWindow.AddChild(loadingText);
var results = await ApplicationController.GetProfileHistory?.Invoke(ProfileManager.Instance.ActiveProfile.DeviceToken);
@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.SetupWizard
foreach (var group in groupedTimes)
{
// add in the group header
topToBottomStuff.AddChild(new TextWidget(RelativeTime.BlockDescriptions[group.Key], textColor: ActiveTheme.Instance.PrimaryTextColor)
topToBottomStuff.AddChild(new TextWidget(RelativeTime.BlockDescriptions[group.Key], textColor: theme.TextColor)
{
Margin = new BorderDouble(0, 0, 0, 5),
});
@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl.SetupWizard
foreach (var time in group.Value)
{
// add in the radio buttons
var profileVersionButton = new RadioButton(time.Value, textColor: ActiveTheme.Instance.PrimaryTextColor)
var profileVersionButton = new RadioButton(time.Value, textColor: theme.TextColor)
{
Margin = new BorderDouble(5, 0),
};

2
MatterControlLib/SetupWizard/SetupWizardTroubleshooting.cs
View file

@ -96,7 +96,7 @@ namespace MatterHackers.MatterControl
// Regen and refresh the troubleshooting criteria
var printerNameLabel = new TextWidget(string.Format("{0}:", "Connection Troubleshooting".Localize()), 0, 0, labelFontSize)
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(bottom: 10)
};

6
MatterControlLib/SetupWizard/SetupWizardWifi.cs
View file

@ -44,12 +44,12 @@ namespace MatterHackers.MatterControl
ContentRow.AddChild(new TextWidget("Wifi Setup".Localize() + ":", 0, 0, labelFontSize)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Margin = new BorderDouble(bottom: 10)
});
ContentRow.AddChild(new TextWidget("Some features may require an internet connection.".Localize(), 0, 0, 12, textColor: ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("Would you like to setup Wifi?".Localize(), 0, 0, 12, textColor: ActiveTheme.Instance.PrimaryTextColor));
ContentRow.AddChild(new TextWidget("Some features may require an internet connection.".Localize(), 0, 0, 12, textColor: theme.TextColor));
ContentRow.AddChild(new TextWidget("Would you like to setup Wifi?".Localize(), 0, 0, 12, textColor: theme.TextColor));
var connectButtonContainer = new FlowLayoutWidget()
{

2
MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs
View file

@ -65,7 +65,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.Padding = theme.DefaultContainerPadding;
// Section Label
this.AddChild(new TextWidget(label, pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
this.AddChild(new TextWidget(label, pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
HAnchor = HAnchor.Left,
Margin = new BorderDouble(0)

2
MatterControlLib/SlicerConfiguration/SettingsRow.cs
View file

@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
});
}
this.AddChild(settingsLabel = SettingsRow.CreateSettingsLabel(title, helpText, theme.Colors.PrimaryTextColor));
this.AddChild(settingsLabel = SettingsRow.CreateSettingsLabel(title, helpText, theme.TextColor));
this.AddChild(new HorizontalSpacer());
}

2
MatterControlLib/SlicerConfiguration/SliceSettingsRow.cs
View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
&& settingData.DataEditType != SliceSettingData.DataEditTypes.HARDWARE_PRESENT)
{
unitsArea.AddChild(
new WrappedTextWidget(settingData.Units.Localize(), pointSize: 8, textColor: theme.Colors.PrimaryTextColor)
new WrappedTextWidget(settingData.Units.Localize(), pointSize: 8, textColor: theme.TextColor)
{
Margin = new BorderDouble(5, 0),
});

12
MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
// Add heading for My Settings view
searchPanel.AddChild(filteredItemsHeading = new TextWidget("My Modified Settings", pointSize: theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor)
searchPanel.AddChild(filteredItemsHeading = new TextWidget("My Modified Settings", pointSize: theme.DefaultFontSize, textColor: theme.TextColor)
{
Margin = new BorderDouble(left: 10),
HAnchor = HAnchor.Left,
@ -591,7 +591,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
row.AddChild(new TextWidget(title, pointSize: 9)
{
Margin = new BorderDouble(0, 4, 10, 4),
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
});
row.AddChild(new HorizontalSpacer());
@ -599,7 +599,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
row.AddChild(new TextWidget(lastUpdateTime, pointSize: 9)
{
Margin = new BorderDouble(0, 4, 10, 4),
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
});
}
@ -745,7 +745,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
case SliceSettingData.DataEditTypes.OFFSET2:
placeFieldInDedicatedRow = true;
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, theme.Colors.PrimaryTextColor, theme);
uiField = new ExtruderOffsetField(settingsContext, settingData.SlicerConfigName, theme.TextColor, theme);
break;
#if !__ANDROID__
case SliceSettingData.DataEditTypes.IP_LIST:
@ -757,7 +757,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
// Missing Setting
settingsRow.AddContent(new TextWidget($"Missing the setting for '{settingData.DataEditType}'.")
{
TextColor = theme.Colors.PrimaryTextColor,
TextColor = theme.TextColor,
BackgroundColor = Color.Red
});
break;
@ -808,7 +808,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (settingData.QuickMenuSettings.Count > 0
&& settingData.SlicerConfigName == "baud_rate")
{
var dropMenu = new DropMenuWrappedField(uiField, settingData, theme.Colors.PrimaryTextColor, theme);
var dropMenu = new DropMenuWrappedField(uiField, settingData, theme.TextColor, theme);
dropMenu.Initialize(tabIndexForItem);
settingsRow.AddContent(dropMenu.Content);

8
MatterControlLib/SlicerConfiguration/UIFields/CheckboxField.cs
View file

@ -37,16 +37,22 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public class CheckboxField : UIField
{
private CheckBox checkBoxWidget;
private ThemeConfig theme;
public bool Checked => checkBoxWidget.Checked;
public CheckboxField(ThemeConfig theme)
{
this.theme = theme;
}
public override void Initialize(int tabIndex)
{
checkBoxWidget = new CheckBox("")
{
VAnchor = VAnchor.Bottom,
Name = this.Name,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.TextColor,
Checked = this.Value == "1"
};
checkBoxWidget.CheckedStateChanged += (s, e) =>

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

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
TabIndex = tabIndex,
Enabled = canChangeComPort,
TextColor = canChangeComPort ? theme.Colors.PrimaryTextColor : new Color(theme.Colors.PrimaryTextColor, 150),
TextColor = canChangeComPort ? theme.TextColor : new Color(theme.TextColor, 150),
};
//Create default option
@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
printer.Connection.CommunicationStateChanged.RegisterEvent((s, e) =>
{
canChangeComPort = !printer.Connection.IsConnected && printer.Connection.CommunicationState != CommunicationStates.AttemptingToConnect;
dropdownList.TextColor = theme.Colors.PrimaryTextColor;
dropdownList.TextColor = theme.TextColor;
dropdownList.Enabled = canChangeComPort;
}, ref unregisterEvents);

2
MatterControlLib/SlicerConfiguration/UIFields/TextField.cs
View file

@ -85,7 +85,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public override void Initialize(int tabIndex)
{
textWidget = new TextWidget("", textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
textWidget = new TextWidget("", textColor: theme.TextColor, pointSize: theme.DefaultFontSize)
{
TabIndex = tabIndex,
ToolTipText = this.HelpText,

4
MatterControlLib/SlicerConfiguration/UIFields/Vector2Field.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
userInitiated: true);
};
container.AddChild(new TextWidget("X:", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("X:", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(5, 0),
@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
userInitiated: true);
};
container.AddChild(new TextWidget("Y:", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("Y:", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(15, 0, 5, 0),

6
MatterControlLib/SlicerConfiguration/UIFields/Vector3Field.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
userInitiated: true);
};
container.AddChild(new TextWidget("X:", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("X:", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(5, 0),
@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
userInitiated: true);
};
container.AddChild(new TextWidget("Y:", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("Y:", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(15, 0, 5, 0),
@ -141,7 +141,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
userInitiated: true);
};
container.AddChild(new TextWidget("Z:", pointSize: 10, textColor: ActiveTheme.Instance.PrimaryTextColor)
container.AddChild(new TextWidget("Z:", pointSize: 10, textColor: theme.TextColor)
{
VAnchor = VAnchor.Center,
Margin = new BorderDouble(15, 0, 5, 0),

4
MatterControlLib/Utilities/MarkdigAgg/AggRenderer.cs
View file

@ -19,7 +19,7 @@ namespace Markdig.Renderers
public class TextWordX : TextWidget
{
public TextWordX(ThemeConfig theme)
: base("", pointSize: 10, textColor: theme.Colors.PrimaryTextColor)
: base("", pointSize: 10, textColor: theme.TextColor)
{
this.AutoExpandBoundsToText = true;
}
@ -28,7 +28,7 @@ namespace Markdig.Renderers
public class TextSpaceX : TextWidget, ISkipIfFirst
{
public TextSpaceX(ThemeConfig theme)
: base("", pointSize: 10, textColor: theme.Colors.PrimaryTextColor)
: base("", pointSize: 10, textColor: theme.TextColor)
{
this.AutoExpandBoundsToText = true;
}

5
StaticData/Themes/System/Classic/Classic-Dark.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#FFFFFF",
"SourceColor": "#AC193D"
},
"TextColor": "#FFFFFF",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

5
StaticData/Themes/System/Classic/Classic-Light.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#222222",
"SourceColor": "#AC193D"
},
"TextColor": "#222222",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

5
StaticData/Themes/System/Menus/White-Menu.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#222222",
"SourceColor": "#AC193D"
},
"TextColor": "#222222",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

5
StaticData/Themes/System/Modern/Modern-Dark-Menu.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#EEEEEE",
"SourceColor": "#B58900"
},
"TextColor": "#EEEEEE",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

5
StaticData/Themes/System/Modern/Modern-Dark.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#BBBBBB",
"SourceColor": "#00000000"
},
"TextColor": "#BBBBBB",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

5
StaticData/Themes/System/Solarized/Solarized-Dark.json
View file

@ -1,9 +1,6 @@
{
"DefaultFontSize": 11,
"Colors": {
"PrimaryTextColor": "#839496",
"SourceColor": "#B58900"
},
"TextColor": "#839496",
"PresetColors": {
"MaterialPreset": "#FF7F00",
"QualityPreset": "#FFFF00",

Some files were not shown because too many files have changed in this diff Show more