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

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)