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

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