From adae87e658ce01c93d47c011557d7d8b996335e4 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 9 Dec 2020 08:32:46 +0300 Subject: [PATCH] Preparation to add new themes --- ShareX.HelpersLib/ShareXResources.cs | 2 +- ShareX.HelpersLib/ShareXTheme.cs | 56 +++++++++++-------------- ShareX/ApplicationConfig.cs | 2 +- ShareX/Forms/ApplicationSettingsForm.cs | 5 +-- ShareX/Forms/MainForm.cs | 2 +- 5 files changed, 30 insertions(+), 37 deletions(-) diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs index e6a63815f..2ec7fe656 100644 --- a/ShareX.HelpersLib/ShareXResources.cs +++ b/ShareX.HelpersLib/ShareXResources.cs @@ -65,7 +65,7 @@ public static bool UseCustomTheme public static Bitmap Logo => Resources.ShareX_Logo; - public static ShareXTheme Theme { get; set; } = new ShareXTheme(); + public static ShareXTheme Theme { get; set; } = ShareXTheme.DarkTheme; public static void ApplyTheme(Form form, bool setIcon = true) { diff --git a/ShareX.HelpersLib/ShareXTheme.cs b/ShareX.HelpersLib/ShareXTheme.cs index d3586be23..aa336aa4a 100644 --- a/ShareX.HelpersLib/ShareXTheme.cs +++ b/ShareX.HelpersLib/ShareXTheme.cs @@ -148,12 +148,7 @@ public Color BorderColor [Browsable(false)] public bool IsDarkTheme => ColorHelpers.IsDarkColor(BackgroundColor); - public ShareXTheme() - { - SetDarkTheme(); - } - - public void SetDarkTheme() + private ShareXTheme() { Name = "Dark"; BackgroundColor = Color.FromArgb(42, 47, 56); @@ -174,33 +169,32 @@ public void SetDarkTheme() SeparatorDarkColor = Color.FromArgb(22, 26, 31); } - public void SetLightTheme() - { - Name = "Light"; - BackgroundColor = Color.FromArgb(242, 242, 242); - LightBackgroundColor = Color.FromArgb(247, 247, 247); - DarkBackgroundColor = Color.FromArgb(235, 235, 235); - TextColor = Color.FromArgb(69, 69, 69); - BorderColor = Color.FromArgb(201, 201, 201); - CheckerColor = Color.FromArgb(247, 247, 247); - CheckerColor2 = Color.FromArgb(235, 235, 235); - CheckerSize = 15; - LinkColor = Color.FromArgb(166, 212, 255); - MenuHighlightColor = Color.FromArgb(247, 247, 247); - MenuHighlightBorderColor = Color.FromArgb(96, 143, 226); - MenuBorderColor = Color.FromArgb(201, 201, 201); - MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244); - ContextMenuOpacity = 100; - SeparatorLightColor = Color.FromArgb(253, 253, 253); - SeparatorDarkColor = Color.FromArgb(189, 189, 189); - } + public static ShareXTheme DarkTheme => new ShareXTheme(); - public static List GetPresets() + public static ShareXTheme LightTheme => new ShareXTheme() { - ShareXTheme darkTheme = new ShareXTheme(); - ShareXTheme lightTheme = new ShareXTheme(); - lightTheme.SetLightTheme(); - return new List() { darkTheme, lightTheme }; + Name = "Light", + BackgroundColor = Color.FromArgb(242, 242, 242), + LightBackgroundColor = Color.FromArgb(247, 247, 247), + DarkBackgroundColor = Color.FromArgb(235, 235, 235), + TextColor = Color.FromArgb(69, 69, 69), + BorderColor = Color.FromArgb(201, 201, 201), + CheckerColor = Color.FromArgb(247, 247, 247), + CheckerColor2 = Color.FromArgb(235, 235, 235), + CheckerSize = 15, + LinkColor = Color.FromArgb(166, 212, 255), + MenuHighlightColor = Color.FromArgb(247, 247, 247), + MenuHighlightBorderColor = Color.FromArgb(96, 143, 226), + MenuBorderColor = Color.FromArgb(201, 201, 201), + MenuCheckBackgroundColor = Color.FromArgb(225, 233, 244), + ContextMenuOpacity = 100, + SeparatorLightColor = Color.FromArgb(253, 253, 253), + SeparatorDarkColor = Color.FromArgb(189, 189, 189) + }; + + public static List GetDefaultThemes() + { + return new List() { DarkTheme, LightTheme }; } public override string ToString() diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index 5cd50746e..de57ea27d 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -94,7 +94,7 @@ public ApplicationConfig() public bool UseDarkTheme = true; public bool UseCustomTheme = true; - public List Themes = ShareXTheme.GetPresets(); + public List Themes = ShareXTheme.GetDefaultThemes(); public int SelectedTheme = 0; #endregion diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index b80550651..4ff6246ac 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -481,8 +481,7 @@ private void CbThemes_SelectedIndexChanged(object sender, EventArgs e) private void BtnThemeAdd_Click(object sender, EventArgs e) { - ShareXTheme theme = new ShareXTheme(); - AddTheme(theme); + AddTheme(ShareXTheme.DarkTheme); } private void BtnThemeRemove_Click(object sender, EventArgs e) @@ -521,7 +520,7 @@ private void BtnThemeReset_Click(object sender, EventArgs e) { if (MessageBox.Show(Resources.WouldYouLikeToResetThemes, "ShareX - " + Resources.Confirmation, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) { - Program.Settings.Themes = ShareXTheme.GetPresets(); + Program.Settings.Themes = ShareXTheme.GetDefaultThemes(); Program.Settings.SelectedTheme = 0; cbThemes.Items.Clear(); diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index b21823697..a2378ce56 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -819,7 +819,7 @@ public void UpdateTheme() { if (Program.Settings.Themes == null || Program.Settings.Themes.Count == 0) { - Program.Settings.Themes = ShareXTheme.GetPresets(); + Program.Settings.Themes = ShareXTheme.GetDefaultThemes(); Program.Settings.SelectedTheme = 0; }