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

Add labels to theme buttons

Browse source 
- Issue MatterHackers/MCCentral#4370
This commit is contained in:
John Lewin 2018-10-24 08:34:05 -07:00
parent 29af22e2ec
commit 30e6bdec26
6 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
MatterControlLib/ConfigurationPage/ApplicationSettings/ThemeColorPanel.cs
View file

@ -139,7 +139,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
themeset = provider.GetTheme(themeName);
}
previewContainer.AddChild(new ThemePreviewButton(themeset, this)
var previewColumn = new FlowLayoutWidget(FlowDirection.TopToBottom);
previewContainer.AddChild(previewColumn);
previewColumn.AddChild(new ThemePreviewButton(themeset, this)
{
HAnchor = HAnchor.Absolute,
VAnchor = VAnchor.Absolute,
@ -148,7 +151,19 @@ namespace MatterHackers.MatterControl.ConfigurationPage
Mode = themeName,
Border = 1,
BorderColor = theme.BorderColor20,
Margin = theme.DefaultContainerPadding
Margin = new BorderDouble(theme.DefaultContainerPadding, 0, theme.DefaultContainerPadding, theme.DefaultContainerPadding)
});
string name = themeset.Name;
if (string.IsNullOrEmpty(name))
{
name = themeset.ThemeID.Replace("-", " ");
}
previewColumn.AddChild(new TextWidget(name, pointSize: theme.FontSize7, textColor: theme.Colors.PrimaryTextColor)
{
HAnchor = HAnchor.Left,
Margin = new BorderDouble(12, 2)
});
if (themeName == AppContext.ThemeSet.ThemeID)

2
StaticData/Themes/System/Classic/Classic-Dark.json
View file

@ -1,5 +1,5 @@
{
"ThemeName": "Classic Dark",
"Name": "Classic Dark",
"AccentColors": [
"#AC193D",
"#DC4FAD",

2
StaticData/Themes/System/Classic/Classic-Light.json
View file

@ -1,5 +1,5 @@
{
"ThemeName": "Classic Light",
"Name": "Classic Light",
"AccentColors": [
"#AC193D",
"#DC4FAD",

2
StaticData/Themes/System/Modern/Modern-Dark.json
View file

@ -1,5 +1,5 @@
{
"ThemeName": "Modern Dark",
"Name": "Modern Dark",
"AccentColors": [
"#B58900",
"#CB4B16",

2
StaticData/Themes/System/Solarized/Solarized-Dark.json
View file

@ -1,5 +1,5 @@
{
"ThemeName": "Solarized Dark",
"Name": "Solarized Dark",
"AccentColors": [
"#B58900",
"#CB4B16",

2
StaticData/Themes/System/Solarized/Solarized-Light.json
View file

@ -1,5 +1,5 @@
{
"ThemeName": "Solarized Light",
"Name": "Solarized Light",
"AccentColors": [
"#B58900",
"#CB4B16",