CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

If pre release updates checkbox is checked then dev build install button will show up

Browse source
This commit is contained in:
Jaex 2018-05-06 23:44:58 +03:00
parent 78652b7831
commit 5309277063
3 changed files with 71 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,7 @@ private void InitializeComponent()
this.cbChromeExtensionSupport = new System.Windows.Forms.CheckBox();
this.btnChromeOpenExtensionPage = new System.Windows.Forms.Button();
this.gbWindows = new System.Windows.Forms.GroupBox();
this.cbEditWithShareX = new System.Windows.Forms.CheckBox();
this.cbStartWithWindows = new System.Windows.Forms.CheckBox();
this.cbSendToMenu = new System.Windows.Forms.CheckBox();
this.cbShellContextMenu = new System.Windows.Forms.CheckBox();
@ -141,7 +142,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.cbEditWithShareX = new System.Windows.Forms.CheckBox();
this.btnCheckDevBuild = new System.Windows.Forms.Button();
this.tcSettings.SuspendLayout();
this.tpGeneral.SuspendLayout();
this.tpIntegration.SuspendLayout();
@ -191,6 +192,7 @@ private void InitializeComponent()
// tpGeneral
//
this.tpGeneral.BackColor = System.Drawing.SystemColors.Window;
this.tpGeneral.Controls.Add(this.btnCheckDevBuild);
this.tpGeneral.Controls.Add(this.cbCheckPreReleaseUpdates);
this.tpGeneral.Controls.Add(this.cbTrayMiddleClickAction);
this.tpGeneral.Controls.Add(this.lblTrayMiddleClickAction);
@ -216,7 +218,6 @@ private void InitializeComponent()
this.cbCheckPreReleaseUpdates.Name = "cbCheckPreReleaseUpdates";
this.cbCheckPreReleaseUpdates.UseVisualStyleBackColor = true;
this.cbCheckPreReleaseUpdates.CheckedChanged += new System.EventHandler(this.cbCheckPreReleaseUpdates_CheckedChanged);
this.cbCheckPreReleaseUpdates.MouseUp += new System.Windows.Forms.MouseEventHandler(this.cbCheckPreReleaseUpdates_MouseUp);
//
// cbTrayMiddleClickAction
//
@ -401,6 +402,13 @@ private void InitializeComponent()
this.gbWindows.Name = "gbWindows";
this.gbWindows.TabStop = false;
//
// cbEditWithShareX
//
resources.ApplyResources(this.cbEditWithShareX, "cbEditWithShareX");
this.cbEditWithShareX.Name = "cbEditWithShareX";
this.cbEditWithShareX.UseVisualStyleBackColor = true;
this.cbEditWithShareX.CheckedChanged += new System.EventHandler(this.cbEditWithShareX_CheckedChanged);
//
// cbStartWithWindows
//
resources.ApplyResources(this.cbStartWithWindows, "cbStartWithWindows");
@ -1022,12 +1030,12 @@ private void InitializeComponent()
this.tttvMain.TreeViewSize = 175;
this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
//
// cbEditWithShareX
// btnCheckDevBuild
//
resources.ApplyResources(this.cbEditWithShareX, "cbEditWithShareX");
this.cbEditWithShareX.Name = "cbEditWithShareX";
this.cbEditWithShareX.UseVisualStyleBackColor = true;
this.cbEditWithShareX.CheckedChanged += new System.EventHandler(this.cbEditWithShareX_CheckedChanged);
resources.ApplyResources(this.btnCheckDevBuild, "btnCheckDevBuild");
this.btnCheckDevBuild.Name = "btnCheckDevBuild";
this.btnCheckDevBuild.UseVisualStyleBackColor = true;
this.btnCheckDevBuild.Click += new System.EventHandler(this.btnCheckDevBuild_Click);
//
// ApplicationSettingsForm
//
@ -1201,5 +1209,6 @@ private void InitializeComponent()
private System.Windows.Forms.CheckBox cbFirefoxAddonSupport;
private System.Windows.Forms.Button btnResetSettings;
private System.Windows.Forms.CheckBox cbEditWithShareX;
private System.Windows.Forms.Button btnCheckDevBuild;
}
}

11
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -127,8 +127,10 @@ private void UpdateControls()
#if STEAM || WindowsStore
cbCheckPreReleaseUpdates.Visible = false;
btnCheckDevBuild.Visible = false;
#else
cbCheckPreReleaseUpdates.Checked = Program.Settings.CheckPreReleaseUpdates;
btnCheckDevBuild.Visible = Program.Settings.CheckPreReleaseUpdates;
#endif
// Integration
@ -388,15 +390,16 @@ private void btnEditQuickTaskMenu_Click(object sender, EventArgs e)
private void cbCheckPreReleaseUpdates_CheckedChanged(object sender, EventArgs e)
{
Program.Settings.CheckPreReleaseUpdates = cbCheckPreReleaseUpdates.Checked;
btnCheckDevBuild.Visible = Program.Settings.CheckPreReleaseUpdates;
}
private void cbCheckPreReleaseUpdates_MouseUp(object sender, MouseEventArgs e)
private void btnCheckDevBuild_Click(object sender, EventArgs e)
{
if (e.Button == MouseButtons.Middle)
// TODO: Translate
if (MessageBox.Show("Dev builds can be unstable and must be used for testing purposes only. Do you want to install it?", "ShareX",
MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
Cursor = Cursors.WaitCursor;
TaskHelpers.DownloadAppVeyorBuild();
Cursor = Cursors.Default;
}
}

72
ShareX/Forms/ApplicationSettingsForm.resx
View file

@ -121,11 +121,35 @@
<data name="tcSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnCheckDevBuild.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 352</value>
</data>
<data name="btnCheckDevBuild.Size" type="System.Drawing.Size, System.Drawing">
<value>288, 23</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnCheckDevBuild.TabIndex" type="System.Int32, mscorlib">
<value>17</value>
</data>
<data name="btnCheckDevBuild.Text" xml:space="preserve">
<value>Install dev build...</value>
</data>
<data name="&gt;&gt;btnCheckDevBuild.Name" xml:space="preserve">
<value>btnCheckDevBuild</value>
</data>
<data name="&gt;&gt;btnCheckDevBuild.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;btnCheckDevBuild.Parent" xml:space="preserve">
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;btnCheckDevBuild.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cbCheckPreReleaseUpdates.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="cbCheckPreReleaseUpdates.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 328</value>
</data>
@ -148,7 +172,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbCheckPreReleaseUpdates.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="cbTrayMiddleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 260</value>
@ -169,7 +193,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayMiddleClickAction.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="lblTrayMiddleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -196,7 +220,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayMiddleClickAction.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="cbTrayLeftDoubleClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 236</value>
@ -217,7 +241,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayLeftDoubleClickAction.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="lblTrayLeftDoubleClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -244,7 +268,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayLeftDoubleClickAction.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cbTrayLeftClickAction.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 212</value>
@ -265,7 +289,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayLeftClickAction.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="lblTrayLeftClickAction.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -292,7 +316,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblTrayLeftClickAction.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
<data name="btnEditQuickTaskMenu.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 296</value>
@ -316,7 +340,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;btnEditQuickTaskMenu.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="cbShowTray.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -346,7 +370,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbShowTray.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="cbTrayIconProgressEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -376,7 +400,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTrayIconProgressEnabled.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="btnLanguages.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
@ -415,13 +439,13 @@
<value>btnLanguages</value>
</data>
<data name="&gt;&gt;btnLanguages.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=12.2.0.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>10</value>
<value>11</value>
</data>
<data name="cbRememberMainFormPosition.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -451,7 +475,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbRememberMainFormPosition.ZOrder" xml:space="preserve">
<value>11</value>
<value>12</value>
</data>
<data name="cbSilentRun.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -463,7 +487,7 @@
<value>16, 88</value>
</data>
<data name="cbSilentRun.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 17</value>
<value>136, 17</value>
</data>
<data name="cbSilentRun.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
@ -481,7 +505,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbSilentRun.ZOrder" xml:space="preserve">
<value>12</value>
<value>13</value>
</data>
<data name="cbTaskbarProgressEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -511,7 +535,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbTaskbarProgressEnabled.ZOrder" xml:space="preserve">
<value>13</value>
<value>14</value>
</data>
<data name="cbRememberMainFormSize.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -541,7 +565,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;cbRememberMainFormSize.ZOrder" xml:space="preserve">
<value>14</value>
<value>15</value>
</data>
<data name="lblLanguage.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -571,7 +595,7 @@
<value>tpGeneral</value>
</data>
<data name="&gt;&gt;lblLanguage.ZOrder" xml:space="preserve">
<value>15</value>
<value>16</value>
</data>
<data name="tpGeneral.Location" type="System.Drawing.Point, System.Drawing">
<value>4, 22</value>
@ -1747,7 +1771,7 @@
<value>lvClipboardFormats</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvClipboardFormats.Parent" xml:space="preserve">
<value>gbClipboardFormats</value>
@ -1858,7 +1882,7 @@
<value>lvSecondaryImageUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryImageUploaders.Parent" xml:space="preserve">
<value>gbSecondaryImageUploaders</value>
@ -1912,7 +1936,7 @@
<value>lvSecondaryFileUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryFileUploaders.Parent" xml:space="preserve">
<value>gbSecondaryFileUploaders</value>
@ -1966,7 +1990,7 @@
<value>lvSecondaryTextUploaders</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Type" xml:space="preserve">
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lvSecondaryTextUploaders.Parent" xml:space="preserve">
<value>gbSecondaryTextUploaders</value>
@ -2950,7 +2974,7 @@
<value>tttvMain</value>
</data>
<data name="&gt;&gt;tttvMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=12.1.1.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.TabToTreeView, ShareX.HelpersLib, Version=12.2.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tttvMain.Parent" xml:space="preserve">
<value>$this</value>