CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added theme tab to application settings

Browse source
This commit is contained in:
Jaex 2019-09-06 18:11:08 +03:00
parent 229393b726
commit 94425455e3
6 changed files with 333 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ShareX.HelpersLib/ShareXTheme.cs
View file

@ -23,7 +23,9 @@
#endregion License Information (GPL v3)
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
using System.Windows.Forms;
namespace ShareX.HelpersLib
@ -31,13 +33,28 @@ namespace ShareX.HelpersLib
public class ShareXTheme
{
public string Name { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color BackgroundColor { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color BackgroundColor2 { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color TextColor { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color BorderColor { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color CheckerColor { get; set; }
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color CheckerColor2 { get; set; }
public int CheckerSize { get; set; } = 15;
[Editor(typeof(MyColorEditor), typeof(UITypeEditor)), TypeConverter(typeof(MyColorConverter))]
public Color LinkColor { get; set; }
public ShareXTheme()

9
ShareX/ApplicationConfig.cs
View file

@ -88,6 +88,12 @@ public ApplicationConfig()
#endregion General
#region Theme
public ShareXTheme Theme = new ShareXTheme();
#endregion
#region Paths
public bool UseCustomScreenshotsPath = false;
@ -149,9 +155,6 @@ public ApplicationConfig()
#endif
public bool AutoCheckUpdate { get; set; }
[Category("Application"), Description("Customize theme colors."), TypeConverter(typeof(ExpandableObjectConverter))]
public ShareXTheme Theme { get; set; } = new ShareXTheme();
[Category("Application"), DefaultValue(false), Description("Calculate and show file sizes in binary units (KiB, MiB etc.)")]
public bool BinaryUnits { get; set; }

233
ShareX/Forms/ApplicationSettingsForm.Designer.cs generated
View file

@ -33,6 +33,7 @@ private void InitializeComponent()
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ApplicationSettingsForm));
this.tcSettings = new System.Windows.Forms.TabControl();
this.tpGeneral = new System.Windows.Forms.TabPage();
this.cbExperimentalDarkTheme = new System.Windows.Forms.CheckBox();
this.cbUseWhiteShareXIcon = new System.Windows.Forms.CheckBox();
this.cbUseDarkTheme = new System.Windows.Forms.CheckBox();
this.btnCheckDevBuild = new System.Windows.Forms.Button();
@ -46,7 +47,6 @@ private void InitializeComponent()
this.btnEditQuickTaskMenu = new System.Windows.Forms.Button();
this.cbShowTray = new System.Windows.Forms.CheckBox();
this.cbTrayIconProgressEnabled = new System.Windows.Forms.CheckBox();
this.btnLanguages = new ShareX.HelpersLib.MenuButton();
this.cmsLanguages = new System.Windows.Forms.ContextMenuStrip(this.components);
this.cbRememberMainFormPosition = new System.Windows.Forms.CheckBox();
this.cbSilentRun = new System.Windows.Forms.CheckBox();
@ -99,19 +99,10 @@ private void InitializeComponent()
this.btnClipboardFormatEdit = new System.Windows.Forms.Button();
this.btnClipboardFormatRemove = new System.Windows.Forms.Button();
this.btnClipboardFormatAdd = new System.Windows.Forms.Button();
this.lvClipboardFormats = new ShareX.HelpersLib.MyListView();
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.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();
@ -143,8 +134,20 @@ private void InitializeComponent()
this.txtProxyUsername = new System.Windows.Forms.TextBox();
this.tpAdvanced = new System.Windows.Forms.TabPage();
this.pgSettings = new System.Windows.Forms.PropertyGrid();
this.tpTheme = new System.Windows.Forms.TabPage();
this.pgTheme = new System.Windows.Forms.PropertyGrid();
this.btnApplyTheme = new System.Windows.Forms.Button();
this.btnLanguages = new ShareX.HelpersLib.MenuButton();
this.lvClipboardFormats = new ShareX.HelpersLib.MyListView();
this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chFormat = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryFileUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryFileUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryImageUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryImageUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.lvSecondaryTextUploaders = new ShareX.HelpersLib.MyListView();
this.chSecondaryTextUploaders = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
this.cbExperimentalDarkTheme = new System.Windows.Forms.CheckBox();
this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout();
this.tpIntegration.SuspendLayout();
@ -173,12 +176,14 @@ private void InitializeComponent()
this.tpProxy.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.nudProxyPort)).BeginInit();
this.tpAdvanced.SuspendLayout();
this.tpTheme.SuspendLayout();
this.SuspendLayout();
//
// tcSettings
//
resources.ApplyResources(this.tcSettings, "tcSettings");
this.tcSettings.Controls.Add(this.tpGeneral);
this.tcSettings.Controls.Add(this.tpTheme);
this.tcSettings.Controls.Add(this.tpIntegration);
this.tcSettings.Controls.Add(this.tpPaths);
this.tcSettings.Controls.Add(this.tpExportImport);
@ -216,6 +221,13 @@ private void InitializeComponent()
resources.ApplyResources(this.tpGeneral, "tpGeneral");
this.tpGeneral.Name = "tpGeneral";
//
// cbExperimentalDarkTheme
//
resources.ApplyResources(this.cbExperimentalDarkTheme, "cbExperimentalDarkTheme");
this.cbExperimentalDarkTheme.Name = "cbExperimentalDarkTheme";
this.cbExperimentalDarkTheme.UseVisualStyleBackColor = true;
this.cbExperimentalDarkTheme.CheckedChanged += new System.EventHandler(this.CbExperimentalDarkTheme_CheckedChanged);
//
// cbUseWhiteShareXIcon
//
resources.ApplyResources(this.cbUseWhiteShareXIcon, "cbUseWhiteShareXIcon");
@ -304,13 +316,6 @@ private void InitializeComponent()
this.cbTrayIconProgressEnabled.UseVisualStyleBackColor = true;
this.cbTrayIconProgressEnabled.CheckedChanged += new System.EventHandler(this.cbTrayIconProgressEnabled_CheckedChanged);
//
// btnLanguages
//
resources.ApplyResources(this.btnLanguages, "btnLanguages");
this.btnLanguages.Menu = this.cmsLanguages;
this.btnLanguages.Name = "btnLanguages";
this.btnLanguages.UseVisualStyleBackColor = true;
//
// cmsLanguages
//
this.cmsLanguages.Name = "cmsLanguages";
@ -696,28 +701,6 @@ private void InitializeComponent()
this.btnClipboardFormatAdd.UseVisualStyleBackColor = true;
this.btnClipboardFormatAdd.Click += new System.EventHandler(this.btnAddClipboardFormat_Click);
//
// lvClipboardFormats
//
resources.ApplyResources(this.lvClipboardFormats, "lvClipboardFormats");
this.lvClipboardFormats.AutoFillColumn = true;
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chDescription,
this.chFormat});
this.lvClipboardFormats.FullRowSelect = true;
this.lvClipboardFormats.HideSelection = false;
this.lvClipboardFormats.Name = "lvClipboardFormats";
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
//
// chDescription
//
resources.ApplyResources(this.chDescription, "chDescription");
//
// chFormat
//
resources.ApplyResources(this.chFormat, "chFormat");
//
// tpUploadRetry
//
this.tpUploadRetry.BackColor = System.Drawing.SystemColors.Window;
@ -737,24 +720,6 @@ private void InitializeComponent()
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
//
this.gbSecondaryImageUploaders.Controls.Add(this.lvSecondaryImageUploaders);
@ -762,24 +727,6 @@ private void InitializeComponent()
this.gbSecondaryImageUploaders.Name = "gbSecondaryImageUploaders";
this.gbSecondaryImageUploaders.TabStop = false;
//
// lvSecondaryImageUploaders
//
this.lvSecondaryImageUploaders.AllowDrop = true;
this.lvSecondaryImageUploaders.AllowItemDrag = true;
this.lvSecondaryImageUploaders.AutoFillColumn = true;
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryImageUploaders});
resources.ApplyResources(this.lvSecondaryImageUploaders, "lvSecondaryImageUploaders");
this.lvSecondaryImageUploaders.FullRowSelect = true;
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryImageUploaders.HideSelection = false;
this.lvSecondaryImageUploaders.MultiSelect = false;
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// gbSecondaryTextUploaders
//
this.gbSecondaryTextUploaders.Controls.Add(this.lvSecondaryTextUploaders);
@ -787,24 +734,6 @@ private void InitializeComponent()
this.gbSecondaryTextUploaders.Name = "gbSecondaryTextUploaders";
this.gbSecondaryTextUploaders.TabStop = false;
//
// lvSecondaryTextUploaders
//
this.lvSecondaryTextUploaders.AllowDrop = true;
this.lvSecondaryTextUploaders.AllowItemDrag = true;
this.lvSecondaryTextUploaders.AutoFillColumn = true;
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryTextUploaders});
resources.ApplyResources(this.lvSecondaryTextUploaders, "lvSecondaryTextUploaders");
this.lvSecondaryTextUploaders.FullRowSelect = true;
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryTextUploaders.HideSelection = false;
this.lvSecondaryTextUploaders.MultiSelect = false;
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
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");
@ -1042,6 +971,111 @@ private void InitializeComponent()
this.pgSettings.PropertySort = System.Windows.Forms.PropertySort.Categorized;
this.pgSettings.ToolbarVisible = false;
//
// tpTheme
//
this.tpTheme.Controls.Add(this.btnApplyTheme);
this.tpTheme.Controls.Add(this.pgTheme);
resources.ApplyResources(this.tpTheme, "tpTheme");
this.tpTheme.Name = "tpTheme";
this.tpTheme.UseVisualStyleBackColor = true;
//
// pgTheme
//
resources.ApplyResources(this.pgTheme, "pgTheme");
this.pgTheme.Name = "pgTheme";
this.pgTheme.PropertySort = System.Windows.Forms.PropertySort.NoSort;
this.pgTheme.ToolbarVisible = false;
//
// btnApplyTheme
//
resources.ApplyResources(this.btnApplyTheme, "btnApplyTheme");
this.btnApplyTheme.Name = "btnApplyTheme";
this.btnApplyTheme.UseVisualStyleBackColor = true;
this.btnApplyTheme.Click += new System.EventHandler(this.BtnApplyTheme_Click);
//
// btnLanguages
//
resources.ApplyResources(this.btnLanguages, "btnLanguages");
this.btnLanguages.Menu = this.cmsLanguages;
this.btnLanguages.Name = "btnLanguages";
this.btnLanguages.UseVisualStyleBackColor = true;
//
// lvClipboardFormats
//
resources.ApplyResources(this.lvClipboardFormats, "lvClipboardFormats");
this.lvClipboardFormats.AutoFillColumn = true;
this.lvClipboardFormats.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chDescription,
this.chFormat});
this.lvClipboardFormats.FullRowSelect = true;
this.lvClipboardFormats.HideSelection = false;
this.lvClipboardFormats.Name = "lvClipboardFormats";
this.lvClipboardFormats.UseCompatibleStateImageBehavior = false;
this.lvClipboardFormats.View = System.Windows.Forms.View.Details;
this.lvClipboardFormats.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.lvClipboardFormats_MouseDoubleClick);
//
// chDescription
//
resources.ApplyResources(this.chDescription, "chDescription");
//
// chFormat
//
resources.ApplyResources(this.chFormat, "chFormat");
//
// 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);
//
// lvSecondaryImageUploaders
//
this.lvSecondaryImageUploaders.AllowDrop = true;
this.lvSecondaryImageUploaders.AllowItemDrag = true;
this.lvSecondaryImageUploaders.AutoFillColumn = true;
this.lvSecondaryImageUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryImageUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryImageUploaders});
resources.ApplyResources(this.lvSecondaryImageUploaders, "lvSecondaryImageUploaders");
this.lvSecondaryImageUploaders.FullRowSelect = true;
this.lvSecondaryImageUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryImageUploaders.HideSelection = false;
this.lvSecondaryImageUploaders.MultiSelect = false;
this.lvSecondaryImageUploaders.Name = "lvSecondaryImageUploaders";
this.lvSecondaryImageUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryImageUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryImageUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// lvSecondaryTextUploaders
//
this.lvSecondaryTextUploaders.AllowDrop = true;
this.lvSecondaryTextUploaders.AllowItemDrag = true;
this.lvSecondaryTextUploaders.AutoFillColumn = true;
this.lvSecondaryTextUploaders.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.lvSecondaryTextUploaders.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.chSecondaryTextUploaders});
resources.ApplyResources(this.lvSecondaryTextUploaders, "lvSecondaryTextUploaders");
this.lvSecondaryTextUploaders.FullRowSelect = true;
this.lvSecondaryTextUploaders.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
this.lvSecondaryTextUploaders.HideSelection = false;
this.lvSecondaryTextUploaders.MultiSelect = false;
this.lvSecondaryTextUploaders.Name = "lvSecondaryTextUploaders";
this.lvSecondaryTextUploaders.UseCompatibleStateImageBehavior = false;
this.lvSecondaryTextUploaders.View = System.Windows.Forms.View.Details;
this.lvSecondaryTextUploaders.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lvSecondaryUploaders_MouseUp);
//
// tttvMain
//
resources.ApplyResources(this.tttvMain, "tttvMain");
@ -1052,13 +1086,6 @@ 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");
@ -1110,6 +1137,7 @@ private void InitializeComponent()
this.tpProxy.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.nudProxyPort)).EndInit();
this.tpAdvanced.ResumeLayout(false);
this.tpTheme.ResumeLayout(false);
this.ResumeLayout(false);
}
@ -1232,5 +1260,8 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox cbUseDarkTheme;
private System.Windows.Forms.CheckBox cbUseWhiteShareXIcon;
private System.Windows.Forms.CheckBox cbExperimentalDarkTheme;
private System.Windows.Forms.TabPage tpTheme;
private System.Windows.Forms.Button btnApplyTheme;
private System.Windows.Forms.PropertyGrid pgTheme;
}
}

13
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -119,6 +119,9 @@ private void UpdateControls()
cbCheckPreReleaseUpdates.Checked = Program.Settings.CheckPreReleaseUpdates;
#endif
// Theme
pgTheme.SelectedObject = Program.Settings.Theme;
// Integration
#if WindowsStore
cbShellContextMenu.Visible = false;
@ -433,6 +436,16 @@ private void btnCheckDevBuild_Click(object sender, EventArgs e)
#endregion General
#region Theme
private void BtnApplyTheme_Click(object sender, EventArgs e)
{
ShareXResources.ApplyTheme(this);
Program.MainForm.UpdateTheme();
}
#endregion
#region Integration
private void cbStartWithWindows_CheckedChanged(object sender, EventArgs e)

178
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -125,6 +125,9 @@
<data name="cbExperimentalDarkTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbExperimentalDarkTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cbExperimentalDarkTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 96</value>
@ -153,6 +156,9 @@
<data name="cbUseWhiteShareXIcon.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseWhiteShareXIcon.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseWhiteShareXIcon.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 120</value>
</data>
@ -180,6 +186,9 @@
<data name="cbUseDarkTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbUseDarkTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbUseDarkTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 96</value>
</data>
@ -204,6 +213,9 @@
<data name="&gt;&gt;cbUseDarkTheme.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="btnCheckDevBuild.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnCheckDevBuild.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 304</value>
</data>
@ -231,6 +243,9 @@
<data name="cbCheckPreReleaseUpdates.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbCheckPreReleaseUpdates.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbCheckPreReleaseUpdates.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 280</value>
</data>
@ -279,6 +294,9 @@
<data name="lblTrayMiddleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblTrayMiddleClickAction.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblTrayMiddleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 224</value>
</data>
@ -327,6 +345,9 @@
<data name="lblTrayLeftDoubleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblTrayLeftDoubleClickAction.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblTrayLeftDoubleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 200</value>
</data>
@ -375,6 +396,9 @@
<data name="lblTrayLeftClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblTrayLeftClickAction.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblTrayLeftClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 176</value>
</data>
@ -399,6 +423,9 @@
<data name="&gt;&gt;lblTrayLeftClickAction.ZOrder" xml:space="preserve">
<value>10</value>
</data>
<data name="btnEditQuickTaskMenu.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnEditQuickTaskMenu.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 248</value>
</data>
@ -520,7 +547,7 @@
<value>btnLanguages</value>
</data>
<data name="&gt;&gt;btnLanguages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnLanguages.Parent" xml:space="preserve">
<value>tpGeneral</value>
@ -705,9 +732,90 @@
<data name="&gt;&gt;tpGeneral.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnApplyTheme.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnApplyTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 336</value>
</data>
<data name="btnApplyTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 24</value>
</data>
<data name="btnApplyTheme.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="btnApplyTheme.Text" xml:space="preserve">
<value>Apply theme</value>
</data>
<data name="&gt;&gt;btnApplyTheme.Name" xml:space="preserve">
<value>btnApplyTheme</value>
</data>
<data name="&gt;&gt;btnApplyTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;btnApplyTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnApplyTheme.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pgTheme.HelpVisible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="pgTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 8</value>
</data>
<data name="pgTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>360, 320</value>
</data>
<data name="pgTheme.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;pgTheme.Name" xml:space="preserve">
<value>pgTheme</value>
</data>
<data name="&gt;&gt;pgTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pgTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;pgTheme.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="tpTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
</data>
<data name="tpTheme.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 3</value>
</data>
<data name="tpTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 370</value>
</data>
<data name="tpTheme.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="tpTheme.Text" xml:space="preserve">
<value>Theme</value>
</data>
<data name="&gt;&gt;tpTheme.Name" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;tpTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tpTheme.Parent" xml:space="preserve">
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpTheme.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="cbFirefoxAddonSupport.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbFirefoxAddonSupport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbFirefoxAddonSupport.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
@ -786,6 +894,9 @@
<data name="cbSteamShowInApp.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbSteamShowInApp.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbSteamShowInApp.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
@ -837,6 +948,9 @@
<data name="cbChromeExtensionSupport.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbChromeExtensionSupport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbChromeExtensionSupport.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
@ -861,6 +975,9 @@
<data name="&gt;&gt;cbChromeExtensionSupport.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnChromeOpenExtensionPage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnChromeOpenExtensionPage.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 48</value>
</data>
@ -1075,7 +1192,10 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpIntegration.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="btnPersonalFolderPathApply.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnPersonalFolderPathApply.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 56</value>
@ -1447,7 +1567,10 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpPaths.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="btnResetSettings.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnResetSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 80</value>
@ -1473,6 +1596,9 @@
<data name="&gt;&gt;btnResetSettings.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pbExportImport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="pbExportImport.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 16</value>
</data>
@ -1497,6 +1623,9 @@
<data name="&gt;&gt;pbExportImport.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="btnExport.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnExport.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 16</value>
</data>
@ -1573,7 +1702,7 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpExportImport.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="lblUploadLimit.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -1846,7 +1975,7 @@
<value>lvClipboardFormats</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve">
<value>gbClipboardFormats</value>
@ -1921,7 +2050,7 @@
<value>lvSecondaryFileUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve">
<value>gbSecondaryFileUploaders</value>
@ -1972,7 +2101,7 @@
<value>lvSecondaryImageUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve">
<value>gbSecondaryImageUploaders</value>
@ -2023,7 +2152,7 @@
<value>lvSecondaryTextUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve">
<value>gbSecondaryTextUploaders</value>
@ -2218,11 +2347,14 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpUpload.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cbHistoryCheckURL.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbHistoryCheckURL.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbHistoryCheckURL.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 48</value>
</data>
@ -2250,6 +2382,9 @@
<data name="cbHistorySaveTasks.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbHistorySaveTasks.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbHistorySaveTasks.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
@ -2301,6 +2436,9 @@
<data name="cbRecentTasksTrayMenuMostRecentFirst.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbRecentTasksTrayMenuMostRecentFirst.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbRecentTasksTrayMenuMostRecentFirst.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 144</value>
</data>
@ -2328,6 +2466,9 @@
<data name="lblRecentTasksMaxCount.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="lblRecentTasksMaxCount.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblRecentTasksMaxCount.Location" type="System.Drawing.Point, System.Drawing">
<value>13, 48</value>
</data>
@ -2409,6 +2550,9 @@
<data name="cbRecentTasksShowInMainWindow.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbRecentTasksShowInMainWindow.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbRecentTasksShowInMainWindow.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 96</value>
</data>
@ -2436,6 +2580,9 @@
<data name="cbRecentTasksSave.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbRecentTasksSave.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbRecentTasksSave.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 24</value>
</data>
@ -2509,7 +2656,7 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpHistory.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="cbPrintDontShowWindowsDialog.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -2623,7 +2770,7 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpPrint.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="cbProxyMethod.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 32</value>
@ -2908,7 +3055,7 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpProxy.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="pgSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -2959,7 +3106,7 @@
<value>tcSettings</value>
</data>
<data name="&gt;&gt;tpAdvanced.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="tcSettings.Location" type="System.Drawing.Point, System.Drawing">
<value>176, 3</value>
@ -3004,7 +3151,7 @@
<value>tttvMain</value>
</data>
<data name="&gt;&gt;tttvMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tttvMain.Parent" xml:space="preserve">
<value>$this</value>
@ -3021,6 +3168,9 @@
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>737, 402</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>640, 440</value>
</data>

2
ShareX/Forms/MainForm.cs
View file

@ -780,7 +780,7 @@ private void UpdateTaskViewMode()
}
}
private void UpdateTheme()
public void UpdateTheme()
{
if (IsHandleCreated)
{