Revise button styling and icon sizing
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -132,13 +132,14 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
DefaultThumbView.ThumbColor = new RGBA_Bytes(theme.PrimaryTextColor, 30);
|
||||
|
||||
|
||||
var commonOptions = new ButtonFactoryOptions();
|
||||
commonOptions.Normal.TextColor = theme.PrimaryTextColor;
|
||||
commonOptions.Hover.TextColor = theme.PrimaryTextColor;
|
||||
commonOptions.Pressed.TextColor = theme.PrimaryTextColor;
|
||||
commonOptions.Disabled.TextColor = theme.TertiaryBackgroundColor;
|
||||
commonOptions.Margin = new BorderDouble(16, 0);
|
||||
commonOptions.Margin = new BorderDouble(14, 0);
|
||||
commonOptions.FontSize = 12;
|
||||
commonOptions.ImageSpacing = 8;
|
||||
commonOptions.BorderWidth = 0;
|
||||
commonOptions.FixedHeight = 32;
|
||||
|
||||
|
|
@ -153,6 +154,7 @@ namespace MatterHackers.MatterControl
|
|||
this.SmallMarginButtonFactory = new TextImageButtonFactory(commonOptions.Clone(options =>
|
||||
{
|
||||
options.Margin = new BorderDouble(8, 0);
|
||||
options.ImageSpacing = 6;
|
||||
}));
|
||||
|
||||
this.RadioButtons = new TextImageButtonFactory(commonOptions.Clone(options =>
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
|
||||
var buttonSpacing = ApplicationController.Instance.Theme.ButtonSpacing;
|
||||
|
||||
Button addButton = smallMarginButtonFactory.Generate("Insert".Localize(), StaticData.Instance.LoadIcon("AddAzureResource_16x.png", 16, 16));
|
||||
Button addButton = smallMarginButtonFactory.Generate("Insert".Localize(), StaticData.Instance.LoadIcon("AddAzureResource_16x.png", 14, 14));
|
||||
addButton.Margin = buttonSpacing;
|
||||
addButton.Click += (sender, e) =>
|
||||
{
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 500 B After Width: | Height: | Size: 512 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 209 B |
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 3 KiB |
|
Before Width: | Height: | Size: 679 B After Width: | Height: | Size: 458 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 185 B |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 367 B |