From 29af22e2ec6975b774decae85affb67ba14bbfb3 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 24 Oct 2018 08:07:07 -0700 Subject: [PATCH] Rename theme --- MatterControlLib/ApplicationView/ApplicationController.cs | 4 ++-- MatterControlLib/ApplicationView/Themes/DirectoryTheme.cs | 2 +- MatterControlLib/RootSystemWindow.cs | 2 +- .../{Affinity/Affinity-Dark.json => Modern/Modern-Dark.json} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename StaticData/Themes/System/{Affinity/Affinity-Dark.json => Modern/Modern-Dark.json} (99%) diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 7aaf845f4..73dca777f 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -164,8 +164,8 @@ namespace MatterHackers.MatterControl if (themeset == null) { - var themeProvider = ThemeProviders.Values.First(); - themeset = themeProvider.GetTheme(themeProvider.ThemeNames.First()); + var themeProvider = ThemeProviders["Modern"]; + themeset = themeProvider.GetTheme("Modern-Dark"); } DefaultThumbView.ThumbColor = new Color(themeset.Theme.Colors.PrimaryTextColor, 30); diff --git a/MatterControlLib/ApplicationView/Themes/DirectoryTheme.cs b/MatterControlLib/ApplicationView/Themes/DirectoryTheme.cs index de8cb5789..bd9cf5592 100644 --- a/MatterControlLib/ApplicationView/Themes/DirectoryTheme.cs +++ b/MatterControlLib/ApplicationView/Themes/DirectoryTheme.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl public ThemeSet GetTheme(string themeName) { var themeset = this.LoadTheme(themeName); - themeset.SetAccentColor(themeset.AccentColors.First()); + themeset.SetAccentColor(themeset.AccentColors[2]); return themeset; } diff --git a/MatterControlLib/RootSystemWindow.cs b/MatterControlLib/RootSystemWindow.cs index 3c0477f3a..84dbb5065 100644 --- a/MatterControlLib/RootSystemWindow.cs +++ b/MatterControlLib/RootSystemWindow.cs @@ -1,5 +1,5 @@ /* -Copyright (c) 2016, Lars Brubaker, Kevin Pope +Copyright (c) 2018, Lars Brubaker, John Lewin All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/StaticData/Themes/System/Affinity/Affinity-Dark.json b/StaticData/Themes/System/Modern/Modern-Dark.json similarity index 99% rename from StaticData/Themes/System/Affinity/Affinity-Dark.json rename to StaticData/Themes/System/Modern/Modern-Dark.json index 5ee43072c..4b114f3c7 100644 --- a/StaticData/Themes/System/Affinity/Affinity-Dark.json +++ b/StaticData/Themes/System/Modern/Modern-Dark.json @@ -1,5 +1,5 @@ { - "ThemeName": "Affinity Dark", + "ThemeName": "Modern Dark", "AccentColors": [ "#B58900", "#CB4B16",