mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-03 05:30:32 +12:00
Use TaskSettings in all auto capture form
This commit is contained in:
Jaex
parent
0e021a1d86
commit
bea1548924
1
ShareX/Forms/AutoCaptureForm.Designer.cs
generated
1
ShareX/Forms/AutoCaptureForm.Designer.cs
generated
|
|
@ -77,6 +77,7 @@ private void InitializeComponent()
|
|||
//
|
||||
// tsslStatus
|
||||
//
|
||||
this.tsslStatus.BackColor = System.Drawing.Color.Transparent;
|
||||
this.tsslStatus.Name = "tsslStatus";
|
||||
resources.ApplyResources(this.tsslStatus, "tsslStatus");
|
||||
//
|
||||
|
|
|
|||
|
|
@ -108,35 +108,25 @@ private void TakeScreenshot()
|
|||
|
||||
if (!rect.IsEmpty)
|
||||
{
|
||||
TaskSettings taskSettings;
|
||||
if(this.TaskSettings != null)
|
||||
{
|
||||
taskSettings = this.TaskSettings;
|
||||
}
|
||||
else
|
||||
{
|
||||
taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
}
|
||||
|
||||
Image img = TaskHelpers.GetScreenshot(taskSettings).CaptureRectangle(rect);
|
||||
Image img = TaskHelpers.GetScreenshot(TaskSettings).CaptureRectangle(rect);
|
||||
|
||||
if (img != null)
|
||||
{
|
||||
taskSettings.UseDefaultAfterCaptureJob = false;
|
||||
taskSettings.AfterCaptureJob = taskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage);
|
||||
taskSettings.UseDefaultAdvancedSettings = false;
|
||||
taskSettings.AdvancedSettings.DisableNotifications = true;
|
||||
TaskSettings.UseDefaultAfterCaptureJob = false;
|
||||
TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage);
|
||||
TaskSettings.UseDefaultAdvancedSettings = false;
|
||||
TaskSettings.AdvancedSettings.DisableNotifications = true;
|
||||
|
||||
UploadManager.RunImageTask(img, taskSettings, true, true);
|
||||
UploadManager.RunImageTask(img, TaskSettings, true, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void SelectRegion(TaskSettings taskSettings)
|
||||
private void SelectRegion()
|
||||
{
|
||||
Rectangle rect;
|
||||
|
||||
if (RegionCaptureTasks.GetRectangleRegion(out rect, taskSettings.CaptureSettings.SurfaceOptions))
|
||||
if (RegionCaptureTasks.GetRectangleRegion(out rect, TaskSettings.CaptureSettings.SurfaceOptions))
|
||||
{
|
||||
Program.Settings.AutoCaptureRegion = rect;
|
||||
UpdateRegion();
|
||||
|
|
@ -217,8 +207,7 @@ private void rbCustomRegion_CheckedChanged(object sender, EventArgs e)
|
|||
|
||||
private void btnRegion_Click(object sender, EventArgs e)
|
||||
{
|
||||
TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
SelectRegion(taskSettings);
|
||||
SelectRegion();
|
||||
}
|
||||
|
||||
private void nudDuration_ValueChanged(object sender, EventArgs e)
|
||||
|
|
|
|||
|
|
@ -121,6 +121,12 @@
|
|||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="tspbBar.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 16</value>
|
||||
</data>
|
||||
<data name="tsslStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 17</value>
|
||||
</data>
|
||||
<data name="ssBar.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 241</value>
|
||||
</data>
|
||||
|
|
@ -146,12 +152,6 @@
|
|||
<data name=">>ssBar.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="tspbBar.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 16</value>
|
||||
</data>
|
||||
<data name="tsslStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>0, 17</value>
|
||||
</data>
|
||||
<data name="btnExecute.Enabled" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
|
|
@ -369,54 +369,6 @@
|
|||
<data name=">>lblDurationSeconds.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name=">>rbFullscreen.Name" xml:space="preserve">
|
||||
<value>rbFullscreen</value>
|
||||
</data>
|
||||
<data name=">>rbFullscreen.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>rbFullscreen.Parent" xml:space="preserve">
|
||||
<value>gbRegion</value>
|
||||
</data>
|
||||
<data name=">>rbFullscreen.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>rbCustomRegion.Name" xml:space="preserve">
|
||||
<value>rbCustomRegion</value>
|
||||
</data>
|
||||
<data name=">>rbCustomRegion.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>rbCustomRegion.Parent" xml:space="preserve">
|
||||
<value>gbRegion</value>
|
||||
</data>
|
||||
<data name=">>rbCustomRegion.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="gbRegion.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="gbRegion.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>304, 96</value>
|
||||
</data>
|
||||
<data name="gbRegion.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="gbRegion.Text" xml:space="preserve">
|
||||
<value>Region</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Name" xml:space="preserve">
|
||||
<value>gbRegion</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="rbFullscreen.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
|
|
@ -471,6 +423,30 @@
|
|||
<data name=">>rbCustomRegion.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="gbRegion.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="gbRegion.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>304, 96</value>
|
||||
</data>
|
||||
<data name="gbRegion.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="gbRegion.Text" xml:space="preserve">
|
||||
<value>Region</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Name" xml:space="preserve">
|
||||
<value>gbRegion</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>gbRegion.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
|
|||
Loading…
Reference in a new issue