diff --git a/ShareX/ApplicationConfig.cs b/ShareX/ApplicationConfig.cs
index d131fba80..e5a82d777 100644
--- a/ShareX/ApplicationConfig.cs
+++ b/ShareX/ApplicationConfig.cs
@@ -72,6 +72,7 @@ public ApplicationConfig()
public bool TrayIconProgressEnabled = true;
public bool TaskbarProgressEnabled = true;
public bool UseDarkTheme = true;
+ public bool ExperimentalDarkTheme = true;
public bool UseWhiteShareXIcon = false;
public bool RememberMainFormPosition = false;
public Point MainFormPosition = Point.Empty;
@@ -147,9 +148,6 @@ public ApplicationConfig()
#endif
public bool AutoCheckUpdate { get; set; }
- [Category("Application"), DefaultValue(true), Description("Enables experimental dark theme support by changing each controls color options to dark theme colors.")]
- public bool ExperimentalDarkTheme { get; set; }
-
[Category("Application"), DefaultValue(false), Description("Calculate and show file sizes in binary units (KiB, MiB etc.)")]
public bool BinaryUnits { get; set; }
diff --git a/ShareX/Forms/ApplicationSettingsForm.Designer.cs b/ShareX/Forms/ApplicationSettingsForm.Designer.cs
index f0f1b4c3a..08d1ca34e 100644
--- a/ShareX/Forms/ApplicationSettingsForm.Designer.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.Designer.cs
@@ -103,16 +103,16 @@ private void InitializeComponent()
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tpUploadRetry = new System.Windows.Forms.TabPage();
- this.chkUseSecondaryUploaders = new System.Windows.Forms.CheckBox();
- this.gbSecondaryImageUploaders = new System.Windows.Forms.GroupBox();
- this.lvSecondaryImageUploaders = new ShareX.HelpersLib.MyListView();
- this.chSecondaryImageUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.gbSecondaryFileUploaders = new System.Windows.Forms.GroupBox();
this.lvSecondaryFileUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryFileUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.gbSecondaryImageUploaders = new System.Windows.Forms.GroupBox();
+ this.lvSecondaryImageUploaders = new ShareX.HelpersLib.MyListView();
+ this.chSecondaryImageUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.gbSecondaryTextUploaders = new System.Windows.Forms.GroupBox();
this.lvSecondaryTextUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryTextUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+ this.chkUseSecondaryUploaders = new System.Windows.Forms.CheckBox();
this.cbIfUploadFailRetryOnce = new System.Windows.Forms.Label();
this.nudRetryUpload = new System.Windows.Forms.NumericUpDown();
this.tpHistory = new System.Windows.Forms.TabPage();
@@ -144,6 +144,7 @@ private void InitializeComponent()
this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgSettings = new System.Windows.Forms.PropertyGrid();
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
+ this.cbExperimentalDarkTheme = new System.Windows.Forms.CheckBox();
this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout();
this.tpIntegration.SuspendLayout();
@@ -160,8 +161,8 @@ private void InitializeComponent()
this.tpUploadResults.SuspendLayout();
this.gbClipboardFormats.SuspendLayout();
this.tpUploadRetry.SuspendLayout();
- this.gbSecondaryImageUploaders.SuspendLayout();
this.gbSecondaryFileUploaders.SuspendLayout();
+ this.gbSecondaryImageUploaders.SuspendLayout();
this.gbSecondaryTextUploaders.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudRetryUpload)).BeginInit();
this.tpHistory.SuspendLayout();
@@ -192,6 +193,7 @@ private void InitializeComponent()
// tpGeneral
//
this.tpGeneral.BackColor = System.Drawing.SystemColors.Window;
+ this.tpGeneral.Controls.Add(this.cbExperimentalDarkTheme);
this.tpGeneral.Controls.Add(this.cbUseWhiteShareXIcon);
this.tpGeneral.Controls.Add(this.cbUseDarkTheme);
this.tpGeneral.Controls.Add(this.btnCheckDevBuild);
@@ -728,12 +730,30 @@ private void InitializeComponent()
resources.ApplyResources(this.tpUploadRetry, "tpUploadRetry");
this.tpUploadRetry.Name = "tpUploadRetry";
//
- // chkUseSecondaryUploaders
+ // gbSecondaryFileUploaders
//
- resources.ApplyResources(this.chkUseSecondaryUploaders, "chkUseSecondaryUploaders");
- this.chkUseSecondaryUploaders.Name = "chkUseSecondaryUploaders";
- this.chkUseSecondaryUploaders.UseVisualStyleBackColor = true;
- this.chkUseSecondaryUploaders.CheckedChanged += new System.EventHandler(this.chkUseSecondaryUploaders_CheckedChanged);
+ this.gbSecondaryFileUploaders.Controls.Add(this.lvSecondaryFileUploaders);
+ resources.ApplyResources(this.gbSecondaryFileUploaders, "gbSecondaryFileUploaders");
+ this.gbSecondaryFileUploaders.Name = "gbSecondaryFileUploaders";
+ this.gbSecondaryFileUploaders.TabStop = false;
+ //
+ // lvSecondaryFileUploaders
+ //
+ this.lvSecondaryFileUploaders.AllowDrop = true;
+ this.lvSecondaryFileUploaders.AllowItemDrag = true;
+ this.lvSecondaryFileUploaders.AutoFillColumn = true;
+ this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.chSecondaryFileUploaders});
+ resources.ApplyResources(this.lvSecondaryFileUploaders, "lvSecondaryFileUploaders");
+ this.lvSecondaryFileUploaders.FullRowSelect = true;
+ this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+ this.lvSecondaryFileUploaders.HideSelection = false;
+ this.lvSecondaryFileUploaders.MultiSelect = false;
+ this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
+ this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
+ this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
+ this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// gbSecondaryImageUploaders
//
@@ -760,31 +780,6 @@ private void InitializeComponent()
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
- // gbSecondaryFileUploaders
- //
- this.gbSecondaryFileUploaders.Controls.Add(this.lvSecondaryFileUploaders);
- resources.ApplyResources(this.gbSecondaryFileUploaders, "gbSecondaryFileUploaders");
- this.gbSecondaryFileUploaders.Name = "gbSecondaryFileUploaders";
- this.gbSecondaryFileUploaders.TabStop = false;
- //
- // lvSecondaryFileUploaders
- //
- this.lvSecondaryFileUploaders.AllowDrop = true;
- this.lvSecondaryFileUploaders.AllowItemDrag = true;
- this.lvSecondaryFileUploaders.AutoFillColumn = true;
- this.lvSecondaryFileUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.lvSecondaryFileUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
- this.chSecondaryFileUploaders});
- resources.ApplyResources(this.lvSecondaryFileUploaders, "lvSecondaryFileUploaders");
- this.lvSecondaryFileUploaders.FullRowSelect = true;
- this.lvSecondaryFileUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
- this.lvSecondaryFileUploaders.HideSelection = false;
- this.lvSecondaryFileUploaders.MultiSelect = false;
- this.lvSecondaryFileUploaders.Name = "lvSecondaryFileUploaders";
- this.lvSecondaryFileUploaders.UseCompatibleStateImageBehavior = false;
- this.lvSecondaryFileUploaders.View = System.Windows.Forms.View.Details;
- this.lvSecondaryFileUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
- //
// gbSecondaryTextUploaders
//
this.gbSecondaryTextUploaders.Controls.Add(this.lvSecondaryTextUploaders);
@@ -810,6 +805,13 @@ private void InitializeComponent()
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
+ // chkUseSecondaryUploaders
+ //
+ resources.ApplyResources(this.chkUseSecondaryUploaders, "chkUseSecondaryUploaders");
+ this.chkUseSecondaryUploaders.Name = "chkUseSecondaryUploaders";
+ this.chkUseSecondaryUploaders.UseVisualStyleBackColor = true;
+ this.chkUseSecondaryUploaders.CheckedChanged += new System.EventHandler(this.chkUseSecondaryUploaders_CheckedChanged);
+ //
// cbIfUploadFailRetryOnce
//
resources.ApplyResources(this.cbIfUploadFailRetryOnce, "cbIfUploadFailRetryOnce");
@@ -1050,6 +1052,13 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 175;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
+ // cbExperimentalDarkTheme
+ //
+ resources.ApplyResources(this.cbExperimentalDarkTheme, "cbExperimentalDarkTheme");
+ this.cbExperimentalDarkTheme.Name = "cbExperimentalDarkTheme";
+ this.cbExperimentalDarkTheme.UseVisualStyleBackColor = true;
+ this.cbExperimentalDarkTheme.CheckedChanged += new System.EventHandler(this.CbExperimentalDarkTheme_CheckedChanged);
+ //
// ApplicationSettingsForm
//
resources.ApplyResources(this, "$this");
@@ -1085,8 +1094,8 @@ private void InitializeComponent()
this.gbClipboardFormats.ResumeLayout(false);
this.tpUploadRetry.ResumeLayout(false);
this.tpUploadRetry.PerformLayout();
- this.gbSecondaryImageUploaders.ResumeLayout(false);
this.gbSecondaryFileUploaders.ResumeLayout(false);
+ this.gbSecondaryImageUploaders.ResumeLayout(false);
this.gbSecondaryTextUploaders.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.nudRetryUpload)).EndInit();
this.tpHistory.ResumeLayout(false);
@@ -1222,5 +1231,6 @@ private void InitializeComponent()
private System.Windows.Forms.Button btnPersonalFolderPathApply;
private System.Windows.Forms.CheckBox cbUseDarkTheme;
private System.Windows.Forms.CheckBox cbUseWhiteShareXIcon;
+ private System.Windows.Forms.CheckBox cbExperimentalDarkTheme;
}
}
\ No newline at end of file
diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs
index 54e079575..8cfdd1191 100644
--- a/ShareX/Forms/ApplicationSettingsForm.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.cs
@@ -102,6 +102,8 @@ private void UpdateControls()
cbTaskbarProgressEnabled.Enabled = TaskbarManager.IsPlatformSupported;
cbTaskbarProgressEnabled.Checked = Program.Settings.TaskbarProgressEnabled;
cbUseDarkTheme.Checked = Program.Settings.UseDarkTheme;
+ cbExperimentalDarkTheme.Enabled = Program.Settings.UseDarkTheme;
+ cbExperimentalDarkTheme.Checked = Program.Settings.ExperimentalDarkTheme;
cbUseWhiteShareXIcon.Checked = Program.Settings.UseWhiteShareXIcon;
cbRememberMainFormPosition.Checked = Program.Settings.RememberMainFormPosition;
cbRememberMainFormSize.Checked = Program.Settings.RememberMainFormSize;
@@ -372,6 +374,12 @@ private void cbTaskbarProgressEnabled_CheckedChanged(object sender, EventArgs e)
private void CbUseDarkTheme_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.UseDarkTheme = cbUseDarkTheme.Checked;
+ cbExperimentalDarkTheme.Enabled = Program.Settings.UseDarkTheme;
+ }
+
+ private void CbExperimentalDarkTheme_CheckedChanged(object sender, EventArgs e)
+ {
+ Program.Settings.ExperimentalDarkTheme = cbExperimentalDarkTheme.Checked;
}
private void CbUseWhiteShareXIcon_CheckedChanged(object sender, EventArgs e)
diff --git a/ShareX/Forms/ApplicationSettingsForm.resx b/ShareX/Forms/ApplicationSettingsForm.resx
index 4fc95e7c9..6cb339af0 100644
--- a/ShareX/Forms/ApplicationSettingsForm.resx
+++ b/ShareX/Forms/ApplicationSettingsForm.resx
@@ -122,13 +122,40 @@
Top, Bottom, Left, Right
-
+
True
-
+
248, 96
+
+ 142, 17
+
+
+ 20
+
+
+ Experimental dark theme
+
+
+ cbExperimentalDarkTheme
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tpGeneral
+
+
+ 0
+
+
+ True
+
+
+ 16, 120
+
134, 17
@@ -148,7 +175,7 @@
tpGeneral
- 0
+ 1
True
@@ -175,10 +202,10 @@
tpGeneral
- 1
+ 2
- 16, 280
+ 16, 304
288, 23
@@ -199,13 +226,13 @@
tpGeneral
- 2
+ 3
True
- 16, 256
+ 16, 280
168, 17
@@ -226,10 +253,10 @@
tpGeneral
- 3
+ 4
- 248, 196
+ 248, 220
288, 21
@@ -247,13 +274,13 @@
tpGeneral
- 4
+ 5
True
- 13, 200
+ 13, 224
125, 13
@@ -274,10 +301,10 @@
tpGeneral
- 5
+ 6
- 248, 172
+ 248, 196
288, 21
@@ -295,13 +322,13 @@
tpGeneral
- 6
+ 7
True
- 13, 176
+ 13, 200
144, 13
@@ -322,10 +349,10 @@
tpGeneral
- 7
+ 8
- 248, 148
+ 248, 172
288, 21
@@ -343,13 +370,13 @@
tpGeneral
- 8
+ 9
True
- 13, 152
+ 13, 176
109, 13
@@ -370,10 +397,10 @@
tpGeneral
- 9
+ 10
- 16, 224
+ 16, 248
288, 23
@@ -394,7 +421,7 @@
tpGeneral
- 10
+ 11
True
@@ -424,7 +451,7 @@
tpGeneral
- 11
+ 12
True
@@ -454,7 +481,7 @@
tpGeneral
- 12
+ 13
MiddleLeft
@@ -499,7 +526,7 @@
tpGeneral
- 13
+ 14
True
@@ -508,7 +535,7 @@
NoControl
- 16, 120
+ 16, 144
180, 17
@@ -529,7 +556,7 @@
tpGeneral
- 14
+ 15
True
@@ -559,7 +586,7 @@
tpGeneral
- 15
+ 16
True
@@ -589,7 +616,7 @@
tpGeneral
- 16
+ 17
True
@@ -598,7 +625,7 @@
NoControl
- 248, 120
+ 248, 144
162, 17
@@ -619,7 +646,7 @@
tpGeneral
- 17
+ 18
True
@@ -649,7 +676,7 @@
tpGeneral
- 18
+ 19
4, 22
@@ -3018,18 +3045,18 @@
System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- chSecondaryImageUploaders
-
-
- System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
chSecondaryFileUploaders
System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ chSecondaryImageUploaders
+
+
+ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
chSecondaryTextUploaders