From d6600df108bc98a04ab9bb6211f2ea2ddaaf5ce9 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 22 May 2020 08:44:02 +0300 Subject: [PATCH] Removed ExperimentalCustomTheme option --- .../Forms/ClipboardContentViewer.cs | 2 +- ShareX.HelpersLib/Forms/MyMessageBox.cs | 2 +- ShareX.HelpersLib/NameParser/CodeMenu.cs | 2 +- ShareX.HelpersLib/ShareXResources.cs | 16 +--------------- ShareX.HistoryLib/Forms/ImageHistoryForm.cs | 2 +- .../Forms/StickerImageListViewRenderer.cs | 2 +- .../Forms/TextDrawingInputBox.cs | 2 +- ShareX/ApplicationConfig.cs | 1 - ShareX/Forms/MainForm.cs | 1 - 9 files changed, 7 insertions(+), 23 deletions(-) diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs index 708f83d05..0e2071c0e 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs @@ -42,7 +42,7 @@ public ClipboardContentViewer(bool showCheckBox = false) InitializeComponent(); ShareXResources.ApplyTheme(this); - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { lblQuestion.BackColor = ShareXResources.Theme.BorderColor; } diff --git a/ShareX.HelpersLib/Forms/MyMessageBox.cs b/ShareX.HelpersLib/Forms/MyMessageBox.cs index 5a65be4f6..52e42f551 100644 --- a/ShareX.HelpersLib/Forms/MyMessageBox.cs +++ b/ShareX.HelpersLib/Forms/MyMessageBox.cs @@ -148,7 +148,7 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes ShareXResources.ApplyTheme(this); - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { panel.BackColor = ShareXResources.Theme.BorderColor; } diff --git a/ShareX.HelpersLib/NameParser/CodeMenu.cs b/ShareX.HelpersLib/NameParser/CodeMenu.cs index db60fc059..ddb7c8dba 100644 --- a/ShareX.HelpersLib/NameParser/CodeMenu.cs +++ b/ShareX.HelpersLib/NameParser/CodeMenu.cs @@ -103,7 +103,7 @@ public CodeMenu(TextBoxBase tbb, CodeMenuItem[] items) tsmiClose.Click += (sender, e) => Close(); Items.Add(tsmiClose); - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { ShareXResources.ApplyCustomThemeToContextMenuStrip(this); } diff --git a/ShareX.HelpersLib/ShareXResources.cs b/ShareX.HelpersLib/ShareXResources.cs index 7226ec730..e270f5dfb 100644 --- a/ShareX.HelpersLib/ShareXResources.cs +++ b/ShareX.HelpersLib/ShareXResources.cs @@ -55,20 +55,6 @@ public static bool UseCustomTheme } } - private static bool experimentalCustomTheme; - - public static bool ExperimentalCustomTheme - { - get - { - return UseCustomTheme && experimentalCustomTheme; - } - set - { - experimentalCustomTheme = value; - } - } - public static bool IsDarkTheme => UseCustomTheme && Theme.IsDarkTheme; public static bool UseWhiteIcon { get; set; } @@ -86,7 +72,7 @@ public static void ApplyTheme(Form form, bool setIcon = true) form.Icon = Icon; } - if (ExperimentalCustomTheme) + if (UseCustomTheme) { ApplyCustomThemeToControl(form); diff --git a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs index e45c1e727..6a1569832 100644 --- a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs @@ -56,7 +56,7 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio ilvImages.View = (View)Settings.ViewMode; ilvImages.ThumbnailSize = Settings.ThumbnailSize; - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { ilvImages.BorderStyle = BorderStyle.None; ilvImages.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor; diff --git a/ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs b/ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs index f55347750..feb9a1015 100644 --- a/ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs +++ b/ShareX.ScreenCaptureLib/Forms/StickerImageListViewRenderer.cs @@ -43,7 +43,7 @@ public override void InitializeGraphics(Graphics g) ImageListView.Colors.SelectedColor1 = ImageListView.Colors.HoverColor1 = ImageListView.Colors.UnFocusedColor1 = Color.FromArgb(252, 221, 132); ImageListView.Colors.SelectedColor2 = ImageListView.Colors.HoverColor2 = ImageListView.Colors.UnFocusedColor2 = Color.Transparent; - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { ImageListView.BackColor = ShareXResources.Theme.BackgroundColor; ImageListView.Colors.BackColor = ShareXResources.Theme.LightBackgroundColor; diff --git a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs index 1b65d1516..db86050c0 100644 --- a/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs +++ b/ShareX.ScreenCaptureLib/Forms/TextDrawingInputBox.cs @@ -327,7 +327,7 @@ private void UpdateInputBox() private void UpdateButtonImages() { - if (ShareXResources.ExperimentalCustomTheme) + if (ShareXResources.UseCustomTheme) { ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsGradient); ShareXResources.ApplyCustomThemeToContextMenuStrip(cmsAlignmentHorizontal); diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs index d4c8a2d50..65ccc6b86 100644 --- a/ShareX/ApplicationConfig.cs +++ b/ShareX/ApplicationConfig.cs @@ -92,7 +92,6 @@ public ApplicationConfig() public bool UseDarkTheme = true; public bool UseCustomTheme = true; - public bool ExperimentalCustomTheme = true; public List Themes = ShareXTheme.GetPresets(); public int SelectedTheme = 0; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 0fc2d4ea8..bbb895a1c 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -796,7 +796,6 @@ public void UpdateTheme() ShareXResources.Theme = Program.Settings.Themes[Program.Settings.SelectedTheme]; ShareXResources.UseCustomTheme = Program.Settings.UseCustomTheme; - ShareXResources.ExperimentalCustomTheme = Program.Settings.ExperimentalCustomTheme; if (IsHandleCreated) {