Apply theme to more forms

ShareX.HelpersLib/Colors/ColorPickerForm.cs

@@ -44,7 +44,7 @@ public partial class ColorPickerForm : Form
         public ColorPickerForm(Color currentColor, bool isScreenColorPickerMode = false)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             IsScreenColorPickerMode = isScreenColorPickerMode;
 

ShareX.UploadersLib/Forms/UploadersConfigForm.cs

@@ -53,7 +53,10 @@ public partial class UploadersConfigForm : Form
         private UploadersConfigForm(UploadersConfig config)
         {
             Config = config;
+
             InitializeComponent();
+            ShareXResources.ApplyThemeToForm(this);
+
             InitializeControls();
         }
 
@@ -79,8 +82,6 @@ private void UploadersConfigForm_Resize(object sender, EventArgs e)
 
         private void InitializeControls()
         {
-            Icon = ShareXResources.Icon;
-
             if (!string.IsNullOrEmpty(Config.FilePath))
             {
                 Text += " - " + Config.FilePath;

ShareX/Forms/ActionsForm.cs

@@ -41,7 +41,7 @@ public ActionsForm() : this(new ExternalProgram())
         public ActionsForm(ExternalProgram fileAction)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             FileAction = fileAction;
             txtName.Text = fileAction.Name ?? "";

ShareX/Forms/ActionsToolbarEditForm.cs

@@ -40,7 +40,7 @@ public partial class ActionsToolbarEditForm : Form
         public ActionsToolbarEditForm(List<HotkeyType> actions)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             Actions = actions;
 

ShareX/Forms/AfterCaptureForm.cs

@@ -42,7 +42,7 @@ private AfterCaptureForm(TaskSettings taskSettings)
             TaskSettings = taskSettings;
 
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             ImageList imageList = new ImageList { ColorDepth = ColorDepth.Depth32Bit };
             imageList.Images.Add(Resources.checkbox_uncheck);

ShareX/Forms/AfterUploadForm.cs

@@ -46,7 +46,7 @@ public partial class AfterUploadForm : Form
         public AfterUploadForm(TaskInfo info)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             Info = info;
             if (Info.TaskSettings.AdvancedSettings.AutoCloseAfterUploadForm) tmrClose.Start();

ShareX/Forms/AutoCaptureForm.cs

@@ -64,7 +64,7 @@ public static AutoCaptureForm Instance
         private AutoCaptureForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
             niTray.Icon = Resources.clock.ToIcon();
 
             screenshotTimer = new System.Timers.Timer();

ShareX/Forms/BeforeUploadForm.cs

@@ -35,7 +35,7 @@ public partial class BeforeUploadForm : Form
         public BeforeUploadForm(TaskInfo info)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
             DialogResult = DialogResult.OK;
 
             ucBeforeUpload.InitCompleted += currentDestination =>

ShareX/Forms/ClipboardFormatForm.cs

@@ -41,7 +41,7 @@ public ClipboardFormatForm() : this(new ClipboardFormat())
         public ClipboardFormatForm(ClipboardFormat cbf)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             ClipboardFormat = cbf;
             txtDescription.Text = cbf.Description ?? "";

ShareX/Forms/FileExistForm.cs

@@ -41,7 +41,7 @@ public partial class FileExistForm : Form
         public FileExistForm(string filepath)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             Filepath = filepath;
             filename = Path.GetFileNameWithoutExtension(Filepath);

ShareX/Forms/QRCodeForm.cs

@@ -46,7 +46,7 @@ public partial class QRCodeForm : Form
         public QRCodeForm(string text = null)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             if (!string.IsNullOrEmpty(text))
             {
@@ -104,6 +104,7 @@ private void EncodeText(string text)
 
                 int size = Math.Min(pbQRCode.Width, pbQRCode.Height);
                 pbQRCode.Image = TaskHelpers.CreateQRCode(text, size);
+                pbQRCode.BackColor = Color.White;
             }
         }
 

ShareX/Forms/QuickTaskInfoEditForm.cs

@@ -36,9 +36,11 @@ public partial class QuickTaskInfoEditForm : Form
 
         public QuickTaskInfoEditForm(QuickTaskInfo taskInfo)
         {
-            InitializeComponent();
-            Icon = ShareXResources.Icon;
             TaskInfo = taskInfo;
+
+            InitializeComponent();
+            ShareXResources.ApplyThemeToForm(this);
+
             txtName.Text = TaskInfo.Name;
             AddMultiEnumItemsContextMenu<AfterCaptureTasks>(x => TaskInfo.AfterCaptureTasks = TaskInfo.AfterCaptureTasks.Swap(x), cmsAfterCapture);
             AddMultiEnumItemsContextMenu<AfterUploadTasks>(x => TaskInfo.AfterUploadTasks = TaskInfo.AfterUploadTasks.Swap(x), cmsAfterUpload);

ShareX/Forms/QuickTaskMenuEditorForm.cs

@@ -37,7 +37,7 @@ public partial class QuickTaskMenuEditorForm : Form
         public QuickTaskMenuEditorForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             if (Program.Settings.QuickTaskPresets == null)
             {
@@ -49,7 +49,6 @@ public QuickTaskMenuEditorForm()
 
         private void UpdateItem(ListViewItem lvi, QuickTaskInfo taskInfo)
         {
-            lvi.BackColor = taskInfo.IsValid ? Color.White : Color.WhiteSmoke;
             lvi.Tag = taskInfo;
             lvi.Text = taskInfo.ToString();
         }

ShareX/Forms/TextUploadForm.cs

@@ -36,7 +36,7 @@ public partial class TextUploadForm : Form
         public TextUploadForm(string content = null)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             if (string.IsNullOrEmpty(content) && Clipboard.ContainsText())
             {

ShareX/Forms/WatchFolderForm.cs

@@ -40,8 +40,10 @@ public WatchFolderForm() : this(new WatchFolderSettings())
         public WatchFolderForm(WatchFolderSettings watchFolder)
         {
             WatchFolder = watchFolder;
+
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             txtFolderPath.Text = watchFolder.FolderPath ?? "";
             txtFilter.Text = watchFolder.Filter ?? "";
             cbIncludeSubdirectories.Checked = watchFolder.IncludeSubdirectories;