mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
In after capture form continue after enter key is up
This commit is contained in:
parent
bfc9cc0aa4
commit
8984e25564
3 changed files with 41 additions and 18 deletions
19
ShareX/Forms/AfterCaptureForm.Designer.cs
generated
19
ShareX/Forms/AfterCaptureForm.Designer.cs
generated
|
@ -37,13 +37,13 @@ private void InitializeComponent()
|
||||||
this.lvAfterCaptureTasks = new ShareX.HelpersLib.MyListView();
|
this.lvAfterCaptureTasks = new ShareX.HelpersLib.MyListView();
|
||||||
this.chAfterCapture = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
this.chAfterCapture = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||||
this.tpBeforeUpload = new System.Windows.Forms.TabPage();
|
this.tpBeforeUpload = new System.Windows.Forms.TabPage();
|
||||||
|
this.ucBeforeUpload = new ShareX.BeforeUploadControl();
|
||||||
this.tpAfterUpload = new System.Windows.Forms.TabPage();
|
this.tpAfterUpload = new System.Windows.Forms.TabPage();
|
||||||
this.lvAfterUploadTasks = new ShareX.HelpersLib.MyListView();
|
this.lvAfterUploadTasks = new ShareX.HelpersLib.MyListView();
|
||||||
this.chAfterUpload = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
this.chAfterUpload = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||||
this.lblFileName = new System.Windows.Forms.Label();
|
this.lblFileName = new System.Windows.Forms.Label();
|
||||||
this.txtFileName = new System.Windows.Forms.TextBox();
|
this.txtFileName = new System.Windows.Forms.TextBox();
|
||||||
this.pbImage = new ShareX.HelpersLib.MyPictureBox();
|
this.pbImage = new ShareX.HelpersLib.MyPictureBox();
|
||||||
this.ucBeforeUpload = new ShareX.BeforeUploadControl();
|
|
||||||
this.tcTasks.SuspendLayout();
|
this.tcTasks.SuspendLayout();
|
||||||
this.tpAfterCapture.SuspendLayout();
|
this.tpAfterCapture.SuspendLayout();
|
||||||
this.tpBeforeUpload.SuspendLayout();
|
this.tpBeforeUpload.SuspendLayout();
|
||||||
|
@ -53,7 +53,6 @@ private void InitializeComponent()
|
||||||
// btnContinue
|
// btnContinue
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this.btnContinue, "btnContinue");
|
resources.ApplyResources(this.btnContinue, "btnContinue");
|
||||||
this.btnContinue.DialogResult = System.Windows.Forms.DialogResult.OK;
|
|
||||||
this.btnContinue.Name = "btnContinue";
|
this.btnContinue.Name = "btnContinue";
|
||||||
this.btnContinue.UseVisualStyleBackColor = true;
|
this.btnContinue.UseVisualStyleBackColor = true;
|
||||||
this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
|
this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
|
||||||
|
@ -98,6 +97,7 @@ private void InitializeComponent()
|
||||||
resources.ApplyResources(this.lvAfterCaptureTasks, "lvAfterCaptureTasks");
|
resources.ApplyResources(this.lvAfterCaptureTasks, "lvAfterCaptureTasks");
|
||||||
this.lvAfterCaptureTasks.FullRowSelect = true;
|
this.lvAfterCaptureTasks.FullRowSelect = true;
|
||||||
this.lvAfterCaptureTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
this.lvAfterCaptureTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||||
|
this.lvAfterCaptureTasks.HideSelection = false;
|
||||||
this.lvAfterCaptureTasks.MultiSelect = false;
|
this.lvAfterCaptureTasks.MultiSelect = false;
|
||||||
this.lvAfterCaptureTasks.Name = "lvAfterCaptureTasks";
|
this.lvAfterCaptureTasks.Name = "lvAfterCaptureTasks";
|
||||||
this.lvAfterCaptureTasks.UseCompatibleStateImageBehavior = false;
|
this.lvAfterCaptureTasks.UseCompatibleStateImageBehavior = false;
|
||||||
|
@ -112,6 +112,11 @@ private void InitializeComponent()
|
||||||
resources.ApplyResources(this.tpBeforeUpload, "tpBeforeUpload");
|
resources.ApplyResources(this.tpBeforeUpload, "tpBeforeUpload");
|
||||||
this.tpBeforeUpload.Name = "tpBeforeUpload";
|
this.tpBeforeUpload.Name = "tpBeforeUpload";
|
||||||
//
|
//
|
||||||
|
// ucBeforeUpload
|
||||||
|
//
|
||||||
|
resources.ApplyResources(this.ucBeforeUpload, "ucBeforeUpload");
|
||||||
|
this.ucBeforeUpload.Name = "ucBeforeUpload";
|
||||||
|
//
|
||||||
// tpAfterUpload
|
// tpAfterUpload
|
||||||
//
|
//
|
||||||
this.tpAfterUpload.BackColor = System.Drawing.SystemColors.Window;
|
this.tpAfterUpload.BackColor = System.Drawing.SystemColors.Window;
|
||||||
|
@ -128,6 +133,7 @@ private void InitializeComponent()
|
||||||
resources.ApplyResources(this.lvAfterUploadTasks, "lvAfterUploadTasks");
|
resources.ApplyResources(this.lvAfterUploadTasks, "lvAfterUploadTasks");
|
||||||
this.lvAfterUploadTasks.FullRowSelect = true;
|
this.lvAfterUploadTasks.FullRowSelect = true;
|
||||||
this.lvAfterUploadTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
this.lvAfterUploadTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
|
||||||
|
this.lvAfterUploadTasks.HideSelection = false;
|
||||||
this.lvAfterUploadTasks.MultiSelect = false;
|
this.lvAfterUploadTasks.MultiSelect = false;
|
||||||
this.lvAfterUploadTasks.Name = "lvAfterUploadTasks";
|
this.lvAfterUploadTasks.Name = "lvAfterUploadTasks";
|
||||||
this.lvAfterUploadTasks.UseCompatibleStateImageBehavior = false;
|
this.lvAfterUploadTasks.UseCompatibleStateImageBehavior = false;
|
||||||
|
@ -144,6 +150,8 @@ private void InitializeComponent()
|
||||||
//
|
//
|
||||||
resources.ApplyResources(this.txtFileName, "txtFileName");
|
resources.ApplyResources(this.txtFileName, "txtFileName");
|
||||||
this.txtFileName.Name = "txtFileName";
|
this.txtFileName.Name = "txtFileName";
|
||||||
|
this.txtFileName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtFileName_KeyDown);
|
||||||
|
this.txtFileName.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtFileName_KeyUp);
|
||||||
//
|
//
|
||||||
// pbImage
|
// pbImage
|
||||||
//
|
//
|
||||||
|
@ -155,16 +163,11 @@ private void InitializeComponent()
|
||||||
this.pbImage.EnableRightClickMenu = true;
|
this.pbImage.EnableRightClickMenu = true;
|
||||||
this.pbImage.FullscreenOnClick = true;
|
this.pbImage.FullscreenOnClick = true;
|
||||||
this.pbImage.Name = "pbImage";
|
this.pbImage.Name = "pbImage";
|
||||||
|
this.pbImage.PictureBoxBackColor = System.Drawing.SystemColors.Window;
|
||||||
this.pbImage.ShowImageSizeLabel = true;
|
this.pbImage.ShowImageSizeLabel = true;
|
||||||
//
|
//
|
||||||
// ucBeforeUpload
|
|
||||||
//
|
|
||||||
resources.ApplyResources(this.ucBeforeUpload, "ucBeforeUpload");
|
|
||||||
this.ucBeforeUpload.Name = "ucBeforeUpload";
|
|
||||||
//
|
|
||||||
// AfterCaptureForm
|
// AfterCaptureForm
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.btnContinue;
|
|
||||||
resources.ApplyResources(this, "$this");
|
resources.ApplyResources(this, "$this");
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.BackColor = System.Drawing.SystemColors.Window;
|
this.BackColor = System.Drawing.SystemColors.Window;
|
||||||
|
|
|
@ -84,6 +84,15 @@ private void AfterCaptureForm_Shown(object sender, EventArgs e)
|
||||||
this.ForceActivate();
|
this.ForceActivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void Continue()
|
||||||
|
{
|
||||||
|
TaskSettings.AfterCaptureJob = GetAfterCaptureTasks();
|
||||||
|
TaskSettings.AfterUploadJob = GetAfterUploadTasks();
|
||||||
|
FileName = txtFileName.Text;
|
||||||
|
DialogResult = DialogResult.OK;
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
|
||||||
private void CheckItem(ListViewItem lvi, bool check)
|
private void CheckItem(ListViewItem lvi, bool check)
|
||||||
{
|
{
|
||||||
lvi.ImageIndex = check ? 1 : 0;
|
lvi.ImageIndex = check ? 1 : 0;
|
||||||
|
@ -201,11 +210,25 @@ private void lvAfterUploadTasks_MouseDown(object sender, MouseEventArgs e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void txtFileName_KeyDown(object sender, KeyEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.KeyData == Keys.Enter)
|
||||||
|
{
|
||||||
|
e.SuppressKeyPress = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void txtFileName_KeyUp(object sender, KeyEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.KeyData == Keys.Enter)
|
||||||
|
{
|
||||||
|
Continue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void btnContinue_Click(object sender, EventArgs e)
|
private void btnContinue_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
TaskSettings.AfterCaptureJob = GetAfterCaptureTasks();
|
Continue();
|
||||||
TaskSettings.AfterUploadJob = GetAfterUploadTasks();
|
|
||||||
FileName = txtFileName.Text;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void btnCopy_Click(object sender, EventArgs e)
|
private void btnCopy_Click(object sender, EventArgs e)
|
||||||
|
|
|
@ -235,7 +235,7 @@
|
||||||
<value>lvAfterCaptureTasks</value>
|
<value>lvAfterCaptureTasks</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lvAfterCaptureTasks.Type" xml:space="preserve">
|
<data name=">>lvAfterCaptureTasks.Type" xml:space="preserve">
|
||||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lvAfterCaptureTasks.Parent" xml:space="preserve">
|
<data name=">>lvAfterCaptureTasks.Parent" xml:space="preserve">
|
||||||
<value>tpAfterCapture</value>
|
<value>tpAfterCapture</value>
|
||||||
|
@ -286,7 +286,7 @@
|
||||||
<value>ucBeforeUpload</value>
|
<value>ucBeforeUpload</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ucBeforeUpload.Type" xml:space="preserve">
|
<data name=">>ucBeforeUpload.Type" xml:space="preserve">
|
||||||
<value>ShareX.BeforeUploadControl, ShareX, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.BeforeUploadControl, ShareX, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ucBeforeUpload.Parent" xml:space="preserve">
|
<data name=">>ucBeforeUpload.Parent" xml:space="preserve">
|
||||||
<value>tpBeforeUpload</value>
|
<value>tpBeforeUpload</value>
|
||||||
|
@ -340,7 +340,7 @@
|
||||||
<value>lvAfterUploadTasks</value>
|
<value>lvAfterUploadTasks</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lvAfterUploadTasks.Type" xml:space="preserve">
|
<data name=">>lvAfterUploadTasks.Type" xml:space="preserve">
|
||||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lvAfterUploadTasks.Parent" xml:space="preserve">
|
<data name=">>lvAfterUploadTasks.Parent" xml:space="preserve">
|
||||||
<value>tpAfterUpload</value>
|
<value>tpAfterUpload</value>
|
||||||
|
@ -469,7 +469,7 @@
|
||||||
<value>pbImage</value>
|
<value>pbImage</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>pbImage.Type" xml:space="preserve">
|
<data name=">>pbImage.Type" xml:space="preserve">
|
||||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>pbImage.Parent" xml:space="preserve">
|
<data name=">>pbImage.Parent" xml:space="preserve">
|
||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
|
@ -486,9 +486,6 @@
|
||||||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>784, 441</value>
|
<value>784, 441</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
|
||||||
<value>NoControl</value>
|
|
||||||
</data>
|
|
||||||
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>800, 445</value>
|
<value>800, 445</value>
|
||||||
</data>
|
</data>
|
||||||
|
|
Loading…
Reference in a new issue