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

Moved "AutoCheckUpdate" option to "General" tab

Browse source
This commit is contained in:
Jaex 2023-06-25 00:37:24 +03:00
parent d78720253b
commit d93ac19a86
4 changed files with 85 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ShareX/ApplicationConfig.cs
View file

@ -72,6 +72,7 @@ public ApplicationConfig()
public HotkeyType TrayLeftDoubleClickAction = HotkeyType.OpenMainWindow;
public HotkeyType TrayMiddleClickAction = HotkeyType.ClipboardUploadWithContentViewer;
public bool AutoCheckUpdate = true;
public bool CheckPreReleaseUpdates = false;
#endregion General
@ -169,12 +170,6 @@ public ApplicationConfig()
#region Advanced
[Category("Application"), DefaultValue(true), Description("Automatically check updates.")]
#if STEAM || MicrosoftStore
[Browsable(false)]
#endif
public bool AutoCheckUpdate { get; set; }
[Category("Application"), DefaultValue(false), Description("Calculate and show file sizes in binary units (KiB, MiB etc.)")]
public bool BinaryUnits { get; set; }

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

@ -75,6 +75,8 @@ private void InitializeComponent()
this.cbSendToMenu = new System.Windows.Forms.CheckBox();
this.cbShellContextMenu = new System.Windows.Forms.CheckBox();
this.tpPaths = new System.Windows.Forms.TabPage();
this.txtSaveImageSubFolderPatternWindow = new System.Windows.Forms.TextBox();
this.lblSaveImageSubFolderPatternWindow = new System.Windows.Forms.Label();
this.btnPersonalFolderPathApply = new System.Windows.Forms.Button();
this.btnOpenScreenshotsFolder = new System.Windows.Forms.Button();
this.lblPreviewPersonalFolderPath = new System.Windows.Forms.Label();
@ -179,8 +181,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.lblSaveImageSubFolderPatternWindow = new System.Windows.Forms.Label();
this.txtSaveImageSubFolderPatternWindow = new System.Windows.Forms.TextBox();
this.cbAutoCheckUpdate = new System.Windows.Forms.CheckBox();
this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout();
this.tpTheme.SuspendLayout();
@ -236,6 +237,7 @@ private void InitializeComponent()
// tpGeneral
//
this.tpGeneral.BackColor = System.Drawing.SystemColors.Window;
this.tpGeneral.Controls.Add(this.cbAutoCheckUpdate);
this.tpGeneral.Controls.Add(this.cbUseWhiteShareXIcon);
this.tpGeneral.Controls.Add(this.btnCheckDevBuild);
this.tpGeneral.Controls.Add(this.cbCheckPreReleaseUpdates);
@ -577,6 +579,17 @@ private void InitializeComponent()
resources.ApplyResources(this.tpPaths, "tpPaths");
this.tpPaths.Name = "tpPaths";
//
// txtSaveImageSubFolderPatternWindow
//
resources.ApplyResources(this.txtSaveImageSubFolderPatternWindow, "txtSaveImageSubFolderPatternWindow");
this.txtSaveImageSubFolderPatternWindow.Name = "txtSaveImageSubFolderPatternWindow";
this.txtSaveImageSubFolderPatternWindow.TextChanged += new System.EventHandler(this.txtSaveImageSubFolderPatternWindow_TextChanged);
//
// lblSaveImageSubFolderPatternWindow
//
resources.ApplyResources(this.lblSaveImageSubFolderPatternWindow, "lblSaveImageSubFolderPatternWindow");
this.lblSaveImageSubFolderPatternWindow.Name = "lblSaveImageSubFolderPatternWindow";
//
// btnPersonalFolderPathApply
//
resources.ApplyResources(this.btnPersonalFolderPathApply, "btnPersonalFolderPathApply");
@ -1403,16 +1416,12 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 175;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// lblSaveImageSubFolderPatternWindow
// cbAutoCheckUpdate
//
resources.ApplyResources(this.lblSaveImageSubFolderPatternWindow, "lblSaveImageSubFolderPatternWindow");
this.lblSaveImageSubFolderPatternWindow.Name = "lblSaveImageSubFolderPatternWindow";
//
// txtSaveImageSubFolderPatternWindow
//
resources.ApplyResources(this.txtSaveImageSubFolderPatternWindow, "txtSaveImageSubFolderPatternWindow");
this.txtSaveImageSubFolderPatternWindow.Name = "txtSaveImageSubFolderPatternWindow";
this.txtSaveImageSubFolderPatternWindow.TextChanged += new System.EventHandler(this.txtSaveImageSubFolderPatternWindow_TextChanged);
resources.ApplyResources(this.cbAutoCheckUpdate, "cbAutoCheckUpdate");
this.cbAutoCheckUpdate.Name = "cbAutoCheckUpdate";
this.cbAutoCheckUpdate.UseVisualStyleBackColor = true;
this.cbAutoCheckUpdate.CheckedChanged += new System.EventHandler(this.cbAutoCheckUpdate_CheckedChanged);
//
// ApplicationSettingsForm
//
@ -1632,5 +1641,6 @@ private void InitializeComponent()
private System.Windows.Forms.Label lblClipboardFormatsTip;
private System.Windows.Forms.TextBox txtSaveImageSubFolderPatternWindow;
private System.Windows.Forms.Label lblSaveImageSubFolderPatternWindow;
private System.Windows.Forms.CheckBox cbAutoCheckUpdate;
}
}

8
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -120,16 +120,19 @@ private void UpdateControls()
cbTrayMiddleClickAction.SelectedIndex = (int)Program.Settings.TrayMiddleClickAction;
#if STEAM || MicrosoftStore
cbAutoCheckUpdate.Visible = false;
cbCheckPreReleaseUpdates.Visible = false;
btnCheckDevBuild.Visible = false;
#else
if (SystemOptions.DisableUpdateCheck)
{
cbAutoCheckUpdate.Visible = false;
cbCheckPreReleaseUpdates.Visible = false;
btnCheckDevBuild.Visible = false;
}
else
{
cbAutoCheckUpdate.Checked = Program.Settings.AutoCheckUpdate;
cbCheckPreReleaseUpdates.Checked = Program.Settings.CheckPreReleaseUpdates;
}
#endif
@ -443,6 +446,11 @@ private void btnEditQuickTaskMenu_Click(object sender, EventArgs e)
new QuickTaskMenuEditorForm().ShowDialog();
}
private void cbAutoCheckUpdate_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.AutoCheckUpdate = cbAutoCheckUpdate.Checked;
}
private void cbCheckPreReleaseUpdates_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.CheckPreReleaseUpdates = cbCheckPreReleaseUpdates.Checked;

88
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -122,13 +122,40 @@
<value>Top, Bottom, Left, Right</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="cbAutoCheckUpdate.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cbAutoCheckUpdate.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 248</value>
</data>
<data name="cbAutoCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
<value>162, 17</value>
</data>
<data name="cbAutoCheckUpdate.TabIndex" type="System.Int32, mscorlib">
<value>20</value>
</data>
<data name="cbAutoCheckUpdate.Text" xml:space="preserve">
<value>Automatically check updates</value>
</data>
<data name="&gt;&gt;cbAutoCheckUpdate.Name" xml:space="preserve">
<value>cbAutoCheckUpdate</value>
</data>
<data name="&gt;&gt;cbAutoCheckUpdate.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;cbAutoCheckUpdate.Parent" xml:space="preserve">
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbAutoCheckUpdate.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<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>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="cbUseWhiteShareXIcon.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 120</value>
</data>
@ -151,13 +178,13 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbUseWhiteShareXIcon.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</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, 272</value>
<value>16, 296</value>
</data>
<data name="btnCheckDevBuild.Size" type="System.Drawing.Size, System.Drawing">
<value>288, 23</value>
@ -178,7 +205,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;btnCheckDevBuild.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="cbCheckPreReleaseUpdates.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -187,7 +214,7 @@
<value>NoControl</value>
</data>
<data name="cbCheckPreReleaseUpdates.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 248</value>
<value>16, 272</value>
</data>
<data name="cbCheckPreReleaseUpdates.Size" type="System.Drawing.Size, System.Drawing">
<value>168, 17</value>
@ -208,7 +235,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbCheckPreReleaseUpdates.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="cbTrayMiddleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 188</value>
@ -229,7 +256,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayMiddleClickAction.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="lblTrayMiddleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -259,7 +286,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayMiddleClickAction.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cbTrayLeftDoubleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 164</value>
@ -280,7 +307,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayLeftDoubleClickAction.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="lblTrayLeftDoubleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -310,7 +337,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayLeftDoubleClickAction.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="cbTrayLeftClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 140</value>
@ -331,7 +358,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayLeftClickAction.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="lblTrayLeftClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -361,7 +388,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayLeftClickAction.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="btnEditQuickTaskMenu.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
@ -388,7 +415,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;btnEditQuickTaskMenu.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="cbShowTray.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -418,7 +445,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbShowTray.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="cbTrayIconProgressEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -448,7 +475,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayIconProgressEnabled.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="btnLanguages.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -487,13 +514,13 @@
<value>btnLanguages</value>
</data>
<data name="&gt;&gt;btnLanguages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;btnLanguages.Parent" xml:space="preserve">
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;btnLanguages.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="cbRememberMainFormPosition.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -523,7 +550,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbRememberMainFormPosition.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="cbSilentRun.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -553,7 +580,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbSilentRun.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</value>
</data>
<data name="cbTaskbarProgressEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -583,7 +610,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTaskbarProgressEnabled.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="cbRememberMainFormSize.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -613,7 +640,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbRememberMainFormSize.ZOrder" xml:space="preserve">
<value>16</value>
<value>17</value>
</data>
<data name="lblLanguage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -643,7 +670,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblLanguage.ZOrder" xml:space="preserve">
<value>17</value>
<value>18</value>
</data>
<data name="tpGeneral.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
@ -841,7 +868,7 @@
<value>eiTheme</value>
</data>
<data name="&gt;&gt;eiTheme.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.ExportImportControl, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;eiTheme.Parent" xml:space="preserve">
<value>tpTheme</value>
@ -998,7 +1025,6 @@
</data>
<data name="gbSteam.Text" xml:space="preserve">
<value>Steam</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;gbSteam.Name" xml:space="preserve">
<value>gbSteam</value>
@ -1221,7 +1247,6 @@
</data>
<data name="gbWindows.Text" xml:space="preserve">
<value>Windows</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;gbWindows.Name" xml:space="preserve">
<value>gbWindows</value>
@ -1381,7 +1406,6 @@
</data>
<data name="lblPreviewPersonalFolderPath.Text" xml:space="preserve">
<value>...</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblPreviewPersonalFolderPath.Name" xml:space="preserve">
<value>lblPreviewPersonalFolderPath</value>
@ -1625,7 +1649,6 @@
</data>
<data name="lblSaveImageSubFolderPatternPreview.Text" xml:space="preserve">
<value>...</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblSaveImageSubFolderPatternPreview.Name" xml:space="preserve">
<value>lblSaveImageSubFolderPatternPreview</value>
@ -2253,7 +2276,6 @@
</data>
<data name="lblThumbnailViewThumbnailSizeX.Text" xml:space="preserve">
<value>x</value>
<comment>@Invariant</comment>
</data>
<data name="&gt;&gt;lblThumbnailViewThumbnailSizeX.Name" xml:space="preserve">
<value>lblThumbnailViewThumbnailSizeX</value>
@ -2745,7 +2767,7 @@
<value>lvClipboardFormats</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve">
<value>tpClipboardFormats</value>
@ -2796,7 +2818,7 @@
<value>lvSecondaryFileUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve">
<value>gbSecondaryFileUploaders</value>
@ -2877,7 +2899,7 @@
<value>lvSecondaryImageUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve">
<value>gbSecondaryImageUploaders</value>
@ -2928,7 +2950,7 @@
<value>lvSecondaryTextUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve">
<value>gbSecondaryTextUploaders</value>
@ -4038,7 +4060,7 @@
<value>tttvMain</value>
</data>
<data name="&gt;&gt;tttvMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=13.6.2.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tttvMain.Parent" xml:space="preserve">
<value>$this</value>