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

fixed #2177: Removed auto close option from scrolling capture window

Browse source
This commit is contained in:
Jaex 2017-01-02 19:44:34 +03:00
parent 77466f5c99
commit ee5fabd6a2
4 changed files with 6 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.Designer.cs generated
View file

@ -35,7 +35,6 @@ private void InitializeComponent()
this.tcScrollingCapture = new System.Windows.Forms.TabControl();
this.tpCapture = new System.Windows.Forms.TabPage();
this.gbAfterCapture = new System.Windows.Forms.GroupBox();
this.cbAutoClose = new System.Windows.Forms.CheckBox();
this.cbRemoveDuplicates = new System.Windows.Forms.CheckBox();
this.cbAutoCombine = new System.Windows.Forms.CheckBox();
this.chkAutoUpload = new System.Windows.Forms.CheckBox();
@ -177,20 +176,12 @@ private void InitializeComponent()
// gbAfterCapture
//
resources.ApplyResources(this.gbAfterCapture, "gbAfterCapture");
this.gbAfterCapture.Controls.Add(this.cbAutoClose);
this.gbAfterCapture.Controls.Add(this.cbRemoveDuplicates);
this.gbAfterCapture.Controls.Add(this.cbAutoCombine);
this.gbAfterCapture.Controls.Add(this.chkAutoUpload);
this.gbAfterCapture.Name = "gbAfterCapture";
this.gbAfterCapture.TabStop = false;
//
// cbAutoClose
//
resources.ApplyResources(this.cbAutoClose, "cbAutoClose");
this.cbAutoClose.Name = "cbAutoClose";
this.cbAutoClose.UseVisualStyleBackColor = true;
this.cbAutoClose.CheckedChanged += new System.EventHandler(this.cbAutoClose_CheckedChanged);
//
// cbRemoveDuplicates
//
resources.ApplyResources(this.cbRemoveDuplicates, "cbRemoveDuplicates");
@ -635,6 +626,5 @@ private void InitializeComponent()
private GroupBox gbAfterCapture;
private GroupBox gbWhileCapturing;
private GroupBox gbBeforeCapture;
private CheckBox cbAutoClose;
}
}

6
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs
View file

@ -234,7 +234,6 @@ private void StopCapture()
isCapturing = false;
if (Options.AutoUpload) StartProcess();
if (Options.AutoClose) Close();
}
private void Clean()
@ -665,11 +664,6 @@ private void chkAutoUpload_CheckedChanged(object sender, EventArgs e)
Options.AutoUpload = chkAutoUpload.Checked;
}
private void cbAutoClose_CheckedChanged(object sender, EventArgs e)
{
Options.AutoClose = cbAutoClose.Checked;
}
private Padding GuessEdges(Image img1, Image img2)
{
Padding result = new Padding();

42
ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.resx
View file

@ -184,7 +184,7 @@
<value>NoControl</value>
</data>
<data name="btnCapture.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 480</value>
<value>8, 456</value>
</data>
<data name="btnCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>960, 48</value>
@ -315,36 +315,6 @@
<data name="gbAfterCapture.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="cbAutoClose.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="cbAutoClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cbAutoClose.Location" type="System.Drawing.Point, System.Drawing">
<value>16, 96</value>
</data>
<data name="cbAutoClose.Size" type="System.Drawing.Size, System.Drawing">
<value>188, 17</value>
</data>
<data name="cbAutoClose.TabIndex" type="System.Int32, mscorlib">
<value>21</value>
</data>
<data name="cbAutoClose.Text" xml:space="preserve">
<value>Close this window after processing</value>
</data>
<data name="&gt;&gt;cbAutoClose.Name" xml:space="preserve">
<value>cbAutoClose</value>
</data>
<data name="&gt;&gt;cbAutoClose.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;cbAutoClose.Parent" xml:space="preserve">
<value>gbAfterCapture</value>
</data>
<data name="&gt;&gt;cbAutoClose.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="cbRemoveDuplicates.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -370,7 +340,7 @@
<value>gbAfterCapture</value>
</data>
<data name="&gt;&gt;cbRemoveDuplicates.ZOrder" xml:space="preserve">
<value>1</value>
<value>0</value>
</data>
<data name="cbAutoCombine.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -397,7 +367,7 @@
<value>gbAfterCapture</value>
</data>
<data name="&gt;&gt;cbAutoCombine.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="chkAutoUpload.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -427,13 +397,13 @@
<value>gbAfterCapture</value>
</data>
<data name="&gt;&gt;chkAutoUpload.ZOrder" xml:space="preserve">
<value>3</value>
<value>2</value>
</data>
<data name="gbAfterCapture.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 344</value>
</data>
<data name="gbAfterCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>960, 128</value>
<value>960, 104</value>
</data>
<data name="gbAfterCapture.TabIndex" type="System.Int32, mscorlib">
<value>25</value>
@ -769,7 +739,7 @@
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lblNote.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 544</value>
<value>8, 512</value>
</data>
<data name="lblNote.Size" type="System.Drawing.Size, System.Drawing">
<value>960, 80</value>

3
ShareX.ScreenCaptureLib/ScrollingCaptureOptions.cs
View file

@ -62,9 +62,6 @@ public class ScrollingCaptureOptions
[DefaultValue(false)]
public bool AutoUpload { get; set; } = false;
[DefaultValue(false), Description("Automatically close scrolling capture window after completing the task.")]
public bool AutoClose { get; set; } = false;
public int TrimLeftEdge = 0;
public int TrimTopEdge = 0;
public int TrimRightEdge = 0;