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

- 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

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