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

Revise button styling and icon sizing

Browse source
This commit is contained in:
John Lewin 2017-08-13 14:21:28 -07:00
parent 9915817e16
commit 0958e09e66
12 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ActionBar/PrintActionRow.cs
View file

@ -111,7 +111,7 @@ namespace MatterHackers.MatterControl.ActionBar
WizardWindow.Show<SetupOptionsPage>("/SetupOptions", "Setup Wizard");
};
resetConnectionButton = buttonFactory.Generate("Reset".Localize().ToUpper(), StaticData.Instance.LoadIcon("e_stop4.png", 32,32).InvertLightness());
resetConnectionButton = buttonFactory.Generate("Reset".Localize().ToUpper(), StaticData.Instance.LoadIcon("e_stop.png", 14, 14));
resetConnectionButton.ToolTipText = "Reboots the firmware on the controller".Localize();
resetConnectionButton.Margin = defaultMargin;
resetConnectionButton.Click += (s, e) => UiThread.RunOnIdle(PrinterConnection.Instance.RebootBoard);

4
ActionBar/PrinterConnectAndSelectControl.cs
View file

@ -236,7 +236,7 @@ namespace MatterHackers.MatterControl.ActionBar
this.Margin = 0;
this.Padding = 0;
connectButton = buttonFactory.Generate("Connect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 16, 16));
connectButton = buttonFactory.Generate("Connect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 14, 14));
connectButton.Name = "Connect to printer button";
connectButton.ToolTipText = "Connect to the currently selected printer".Localize();
connectButton.Click += (s, e) =>
@ -251,7 +251,7 @@ namespace MatterHackers.MatterControl.ActionBar
};
this.AddChild(connectButton);
disconnectButton = buttonFactory.Generate("Disconnect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 16, 16));
disconnectButton = buttonFactory.Generate("Disconnect".Localize().ToUpper(), StaticData.Instance.LoadIcon("connect.png", 14, 14));
disconnectButton.Name = "Disconnect from printer button";
disconnectButton.Visible = false;
disconnectButton.ToolTipText = "Disconnect from current printer".Localize();

2
ActionBar/TemperatureWidgetBase.cs
View file

@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.ActionBar
};
this.AddChild(container);
if (!ActiveTheme.Instance.IsDarkTheme)
if (ActiveTheme.Instance.IsDarkTheme)
{
this.ImageWidget.Image = this.ImageWidget.Image.InvertLightness();
}

3
ActionBar/TemperatureWidgetBed.cs
View file

@ -54,8 +54,7 @@ namespace MatterHackers.MatterControl.ActionBar
this.ToolTipText = "Current bed temperature".Localize();
var icon = StaticData.Instance.LoadIcon("bed.png");
if (!ActiveTheme.Instance.IsDarkTheme)
if (ActiveTheme.Instance.IsDarkTheme)
{
icon = icon.InvertLightness();
}