More dark theme support

ShareX.HelpersLib/Forms/ClipboardContentViewer.cs

@@ -41,7 +41,12 @@ public partial class ClipboardContentViewer : Form
         public ClipboardContentViewer(bool showCheckBox = false)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
+            if (ShareXResources.UseDarkTheme)
+            {
+                lblQuestion.BackColor = ShareXResources.DarkBorderColor;
+            }
 
             cbDontShowThisWindow.Visible = showCheckBox;
         }

ShareX.HelpersLib/Forms/DNSChangerForm.cs

@@ -35,7 +35,7 @@ public partial class DNSChangerForm : Form
         public DNSChangerForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             AddDNS(Resources.DNSChangerForm_DNSChangerForm_Manual);
             AddDNS("Google Public DNS", "8.8.8.8", "8.8.4.4"); // https://developers.google.com/speed/public-dns/

ShareX.HelpersLib/Forms/DebugForm.cs

@@ -44,10 +44,11 @@ public partial class DebugForm : Form
 
         private DebugForm(Logger logger)
         {
-            InitializeComponent();
-            Icon = ShareXResources.Icon;
             Logger = logger;
 
+            InitializeComponent();
+            ShareXResources.ApplyThemeToForm(this);
+
             rtbDebug.Text = Logger.ToString();
             rtbDebug.SelectionStart = rtbDebug.TextLength;
             rtbDebug.ScrollToCaret();

ShareX.HelpersLib/Forms/ErrorForm.cs

@@ -42,7 +42,7 @@ public ErrorForm(Exception error, string logPath, string bugReportPath) : this(e
         public ErrorForm(string errorTitle, string errorMessage, string logPath, string bugReportPath, bool unhandledException = true)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             IsUnhandledException = unhandledException;
             LogPath = logPath;

ShareX.HelpersLib/Forms/GradientPickerForm.cs

@@ -39,8 +39,10 @@ public partial class GradientPickerForm : Form
         public GradientPickerForm(GradientInfo gradient)
         {
             Gradient = gradient;
+
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             cbGradientType.Items.AddRange(Helpers.GetEnumNamesProper<LinearGradientMode>());
             cbGradientType.SelectedIndex = (int)Gradient.Type;
             foreach (GradientStop gradientStop in Gradient.Colors)

ShareX.HelpersLib/Forms/HashCheckForm.cs

@@ -38,7 +38,7 @@ public partial class HashCheckForm : Form
         public HashCheckForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             cbHashType.Items.AddRange(Helpers.GetEnumDescriptions<HashType>());
             cbHashType.SelectedIndex = (int)HashType.SHA1;
@@ -64,10 +64,13 @@ private void UpdateResult()
                 {
                     txtTarget.BackColor = Color.FromArgb(255, 200, 200);
                 }
+
+                txtTarget.ForeColor = SystemColors.ControlText;
             }
             else
             {
-                txtTarget.BackColor = SystemColors.Window;
+                txtTarget.BackColor = txtResult.BackColor;
+                txtTarget.ForeColor = txtResult.ForeColor;
             }
         }
 

ShareX.HelpersLib/Forms/InputBox.cs

@@ -36,7 +36,7 @@ public class InputBox : Form
         public InputBox(string title = null, string inputText = null, string okText = null, string cancelText = null)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             InputText = inputText;
 

ShareX.HelpersLib/Forms/MonitorTestForm.cs

@@ -35,7 +35,7 @@ public partial class MonitorTestForm : Form
         public MonitorTestForm()
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
 
             Rectangle screenBounds = CaptureHelpers.GetScreenBounds();
             Location = screenBounds.Location;

ShareX.HelpersLib/Forms/MyMessageBox.cs

@@ -42,8 +42,6 @@ public class MyMessageBox : Form
 
         public MyMessageBox(string text, string caption, MessageBoxButtons buttons = MessageBoxButtons.OK, string checkBoxText = null, bool isChecked = false)
         {
-            Icon = ShareXResources.Icon;
-
             Width = 180;
             Height = 100;
             Text = caption;
@@ -148,6 +146,13 @@ public MyMessageBox(string text, string caption, MessageBoxButtons buttons = Mes
             panel.Location = new Point(0, labelPanel.Bottom + LabelVerticalPadding);
             panel.Size = new Size(labelPanel.Width + (LabelHorizontalPadding * 2), button1.Height + (ButtonPadding * 2));
             ClientSize = new Size(panel.Width, labelPanel.Height + (LabelVerticalPadding * 2) + panel.Height);
+
+            ShareXResources.ApplyThemeToForm(this);
+
+            if (ShareXResources.UseDarkTheme)
+            {
+                panel.BackColor = ShareXResources.DarkBorderColor;
+            }
         }
 
         private void MyMessageBox_Shown(object sender, System.EventArgs e)

ShareX.HelpersLib/Forms/OutputBox.cs

@@ -33,7 +33,8 @@ public partial class OutputBox : Form
         public OutputBox(string text, string title)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             Text = "ShareX - " + title;
             txtText.Text = text;
         }

ShareX.HelpersLib/Forms/PrintForm.Designer.cs

@@ -93,6 +93,7 @@ private void InitializeComponent()
             // 
             // btnCancel
             // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             resources.ApplyResources(this.btnCancel, "btnCancel");
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.UseVisualStyleBackColor = true;

ShareX.HelpersLib/Forms/PrintForm.cs

@@ -38,7 +38,8 @@ public partial class PrintForm : Form
         public PrintForm(Image img, PrintSettings settings, bool previewOnly = false)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             printHelper = new PrintHelper(img);
             printHelper.Settings = printSettings = settings;
             btnPrint.Enabled = !previewOnly;

ShareX.HelpersLib/Forms/PrintForm.resx

@@ -202,7 +202,7 @@
     <value>True</value>
   </data>
   <data name="lblMargin.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 16</value>
+    <value>13, 16</value>
   </data>
   <data name="lblMargin.Size" type="System.Drawing.Size, System.Drawing">
     <value>42, 13</value>

ShareX.HelpersLib/Forms/PrintTextForm.cs

@@ -38,7 +38,8 @@ public partial class PrintTextForm : Form
         public PrintTextForm(string text, PrintSettings settings)
         {
             InitializeComponent();
-            Icon = ShareXResources.Icon;
+            ShareXResources.ApplyThemeToForm(this);
+
             printHelper = new PrintHelper(text);
             printHelper.Settings = printSettings = settings;
             LoadSettings();