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

Removed experimental custom theme check box

Browse source
This commit is contained in:
Jaex 2020-05-21 08:54:12 +03:00
parent 973056270f
commit 294eb62c95
3 changed files with 35 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,6 @@ private void InitializeComponent()
this.cbRememberMainFormSize = new System.Windows.Forms.CheckBox();
this.lblLanguage = new System.Windows.Forms.Label();
this.tpTheme = new System.Windows.Forms.TabPage();
this.cbExperimentalCustomTheme = new System.Windows.Forms.CheckBox();
this.btnThemeReset = new System.Windows.Forms.Button();
this.eiTheme = new ShareX.HelpersLib.ExportImportControl();
this.btnThemeRemove = new System.Windows.Forms.Button();
@ -354,7 +353,6 @@ private void InitializeComponent()
//
// tpTheme
//
this.tpTheme.Controls.Add(this.cbExperimentalCustomTheme);
this.tpTheme.Controls.Add(this.btnThemeReset);
this.tpTheme.Controls.Add(this.eiTheme);
this.tpTheme.Controls.Add(this.btnThemeRemove);
@ -366,13 +364,6 @@ private void InitializeComponent()
this.tpTheme.Name = "tpTheme";
this.tpTheme.UseVisualStyleBackColor = true;
//
// cbExperimentalCustomTheme
//
resources.ApplyResources(this.cbExperimentalCustomTheme, "cbExperimentalCustomTheme");
this.cbExperimentalCustomTheme.Name = "cbExperimentalCustomTheme";
this.cbExperimentalCustomTheme.UseVisualStyleBackColor = true;
this.cbExperimentalCustomTheme.CheckedChanged += new System.EventHandler(this.cbExperimentalCustomTheme_CheckedChanged);
//
// btnThemeReset
//
resources.ApplyResources(this.btnThemeReset, "btnThemeReset");
@ -1341,6 +1332,5 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblExportImportNote;
private System.Windows.Forms.CheckBox cbExportHistory;
private System.Windows.Forms.CheckBox cbExportSettings;
private System.Windows.Forms.CheckBox cbExperimentalCustomTheme;
}
}

31
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -104,8 +104,6 @@ private void UpdateControls()
cbTaskbarProgressEnabled.Enabled = TaskbarManager.IsPlatformSupported;
cbTaskbarProgressEnabled.Checked = Program.Settings.TaskbarProgressEnabled;
cbUseCustomTheme.Checked = Program.Settings.UseCustomTheme;
cbExperimentalCustomTheme.Enabled = Program.Settings.UseCustomTheme;
cbExperimentalCustomTheme.Checked = Program.Settings.ExperimentalCustomTheme;
cbUseWhiteShareXIcon.Checked = Program.Settings.UseWhiteShareXIcon;
cbRememberMainFormPosition.Checked = Program.Settings.RememberMainFormPosition;
cbRememberMainFormSize.Checked = Program.Settings.RememberMainFormSize;
@ -434,7 +432,7 @@ private void btnCheckDevBuild_Click(object sender, EventArgs e)
private void UpdateThemeControls()
{
cbExperimentalCustomTheme.Enabled = btnThemeAdd.Enabled = btnThemeReset.Enabled = pgTheme.Enabled = eiTheme.Enabled = Program.Settings.UseCustomTheme;
btnThemeAdd.Enabled = eiTheme.Enabled = btnThemeReset.Enabled = pgTheme.Enabled = Program.Settings.UseCustomTheme;
cbThemes.Enabled = btnThemeRemove.Enabled = Program.Settings.UseCustomTheme && cbThemes.Items.Count > 0;
}
@ -464,13 +462,6 @@ private void CbUseCustomTheme_CheckedChanged(object sender, EventArgs e)
ApplySelectedTheme();
}
private void cbExperimentalCustomTheme_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.ExperimentalCustomTheme = cbExperimentalCustomTheme.Checked;
UpdateThemeControls();
ApplySelectedTheme();
}
private void CbThemes_SelectedIndexChanged(object sender, EventArgs e)
{
Program.Settings.SelectedTheme = cbThemes.SelectedIndex;
@ -516,6 +507,16 @@ private void BtnThemeRemove_Click(object sender, EventArgs e)
}
}
private object EiTheme_ExportRequested()
{
return pgTheme.SelectedObject as ShareXTheme;
}
private void EiTheme_ImportRequested(object obj)
{
AddTheme(obj as ShareXTheme);
}
private void BtnThemeReset_Click(object sender, EventArgs e)
{
Program.Settings.Themes = ShareXTheme.GetPresets();
@ -533,16 +534,6 @@ private void pgTheme_PropertyValueChanged(object s, PropertyValueChangedEventArg
ApplySelectedTheme();
}
private object EiTheme_ExportRequested()
{
return pgTheme.SelectedObject as ShareXTheme;
}
private void EiTheme_ImportRequested(object obj)
{
AddTheme(obj as ShareXTheme);
}
#endregion
#region Integration

75
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -672,41 +672,14 @@
<data name="&gt;&gt;tpGeneral.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cbExperimentalCustomTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbExperimentalCustomTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 16</value>
</data>
<data name="cbExperimentalCustomTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>190, 17</value>
</data>
<data name="cbExperimentalCustomTheme.TabIndex" type="System.Int32, mscorlib">
<value>26</value>
</data>
<data name="cbExperimentalCustomTheme.Text" xml:space="preserve">
<value>Apply custom theme to all windows</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Name" xml:space="preserve">
<value>cbExperimentalCustomTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbExperimentalCustomTheme.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="btnThemeReset.Location" type="System.Drawing.Point, System.Drawing">
<value>384, 40</value>
<value>400, 40</value>
</data>
<data name="btnThemeReset.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 23</value>
<value>88, 24</value>
</data>
<data name="btnThemeReset.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
<value>5</value>
</data>
<data name="btnThemeReset.Text" xml:space="preserve">
<value>Reset</value>
@ -721,16 +694,16 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeReset.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="eiTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>280, 352</value>
<value>208, 40</value>
</data>
<data name="eiTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>185, 24</value>
</data>
<data name="eiTheme.TabIndex" type="System.Int32, mscorlib">
<value>24</value>
<value>4</value>
</data>
<data name="&gt;&gt;eiTheme.Name" xml:space="preserve">
<value>eiTheme</value>
@ -742,19 +715,19 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;eiTheme.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="btnThemeRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnThemeRemove.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 40</value>
<value>112, 40</value>
</data>
<data name="btnThemeRemove.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 23</value>
<value>88, 24</value>
</data>
<data name="btnThemeRemove.TabIndex" type="System.Int32, mscorlib">
<value>23</value>
<value>3</value>
</data>
<data name="btnThemeRemove.Text" xml:space="preserve">
<value>Remove</value>
@ -769,19 +742,19 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeRemove.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="btnThemeAdd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnThemeAdd.Location" type="System.Drawing.Point, System.Drawing">
<value>208, 40</value>
<value>16, 40</value>
</data>
<data name="btnThemeAdd.Size" type="System.Drawing.Size, System.Drawing">
<value>80, 23</value>
<value>88, 24</value>
</data>
<data name="btnThemeAdd.TabIndex" type="System.Int32, mscorlib">
<value>22</value>
<value>2</value>
</data>
<data name="btnThemeAdd.Text" xml:space="preserve">
<value>Add</value>
@ -796,16 +769,16 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;btnThemeAdd.ZOrder" xml:space="preserve">
<value>4</value>
<value>3</value>
</data>
<data name="cbThemes.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 40</value>
<value>208, 14</value>
</data>
<data name="cbThemes.Size" type="System.Drawing.Size, System.Drawing">
<value>184, 21</value>
<value>280, 21</value>
</data>
<data name="cbThemes.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
<value>1</value>
</data>
<data name="&gt;&gt;cbThemes.Name" xml:space="preserve">
<value>cbThemes</value>
@ -817,7 +790,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbThemes.ZOrder" xml:space="preserve">
<value>5</value>
<value>4</value>
</data>
<data name="pgTheme.HelpVisible" type="System.Boolean, mscorlib">
<value>False</value>
@ -826,10 +799,10 @@
<value>16, 72</value>
</data>
<data name="pgTheme.Size" type="System.Drawing.Size, System.Drawing">
<value>448, 272</value>
<value>472, 304</value>
</data>
<data name="pgTheme.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<value>6</value>
</data>
<data name="&gt;&gt;pgTheme.Name" xml:space="preserve">
<value>pgTheme</value>
@ -841,7 +814,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;pgTheme.ZOrder" xml:space="preserve">
<value>6</value>
<value>5</value>
</data>
<data name="cbUseCustomTheme.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -856,7 +829,7 @@
<value>114, 17</value>
</data>
<data name="cbUseCustomTheme.TabIndex" type="System.Int32, mscorlib">
<value>18</value>
<value>0</value>
</data>
<data name="cbUseCustomTheme.Text" xml:space="preserve">
<value>Use custom theme</value>
@ -871,7 +844,7 @@
<value>tpTheme</value>
</data>
<data name="&gt;&gt;cbUseCustomTheme.ZOrder" xml:space="preserve">
<value>7</value>
<value>6</value>
</data>
<data name="tpTheme.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>