From 8984e255646013aa706058a6e0958812ae10272d Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 5 Feb 2020 14:32:38 +0300 Subject: [PATCH] In after capture form continue after enter key is up --- ShareX/Forms/AfterCaptureForm.Designer.cs | 19 ++++++++------- ShareX/Forms/AfterCaptureForm.cs | 29 ++++++++++++++++++++--- ShareX/Forms/AfterCaptureForm.resx | 11 ++++----- 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/ShareX/Forms/AfterCaptureForm.Designer.cs b/ShareX/Forms/AfterCaptureForm.Designer.cs index 5fe58cc1d..fe1d8b3ca 100644 --- a/ShareX/Forms/AfterCaptureForm.Designer.cs +++ b/ShareX/Forms/AfterCaptureForm.Designer.cs @@ -37,13 +37,13 @@ private void InitializeComponent() this.lvAfterCaptureTasks = new ShareX.HelpersLib.MyListView(); this.chAfterCapture = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.tpBeforeUpload = new System.Windows.Forms.TabPage(); + this.ucBeforeUpload = new ShareX.BeforeUploadControl(); this.tpAfterUpload = new System.Windows.Forms.TabPage(); this.lvAfterUploadTasks = new ShareX.HelpersLib.MyListView(); this.chAfterUpload = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lblFileName = new System.Windows.Forms.Label(); this.txtFileName = new System.Windows.Forms.TextBox(); this.pbImage = new ShareX.HelpersLib.MyPictureBox(); - this.ucBeforeUpload = new ShareX.BeforeUploadControl(); this.tcTasks.SuspendLayout(); this.tpAfterCapture.SuspendLayout(); this.tpBeforeUpload.SuspendLayout(); @@ -53,7 +53,6 @@ private void InitializeComponent() // btnContinue // resources.ApplyResources(this.btnContinue, "btnContinue"); - this.btnContinue.DialogResult = System.Windows.Forms.DialogResult.OK; this.btnContinue.Name = "btnContinue"; this.btnContinue.UseVisualStyleBackColor = true; this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click); @@ -98,6 +97,7 @@ private void InitializeComponent() resources.ApplyResources(this.lvAfterCaptureTasks, "lvAfterCaptureTasks"); this.lvAfterCaptureTasks.FullRowSelect = true; this.lvAfterCaptureTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.lvAfterCaptureTasks.HideSelection = false; this.lvAfterCaptureTasks.MultiSelect = false; this.lvAfterCaptureTasks.Name = "lvAfterCaptureTasks"; this.lvAfterCaptureTasks.UseCompatibleStateImageBehavior = false; @@ -112,6 +112,11 @@ private void InitializeComponent() resources.ApplyResources(this.tpBeforeUpload, "tpBeforeUpload"); this.tpBeforeUpload.Name = "tpBeforeUpload"; // + // ucBeforeUpload + // + resources.ApplyResources(this.ucBeforeUpload, "ucBeforeUpload"); + this.ucBeforeUpload.Name = "ucBeforeUpload"; + // // tpAfterUpload // this.tpAfterUpload.BackColor = System.Drawing.SystemColors.Window; @@ -128,6 +133,7 @@ private void InitializeComponent() resources.ApplyResources(this.lvAfterUploadTasks, "lvAfterUploadTasks"); this.lvAfterUploadTasks.FullRowSelect = true; this.lvAfterUploadTasks.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + this.lvAfterUploadTasks.HideSelection = false; this.lvAfterUploadTasks.MultiSelect = false; this.lvAfterUploadTasks.Name = "lvAfterUploadTasks"; this.lvAfterUploadTasks.UseCompatibleStateImageBehavior = false; @@ -144,6 +150,8 @@ private void InitializeComponent() // resources.ApplyResources(this.txtFileName, "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 // @@ -155,16 +163,11 @@ private void InitializeComponent() this.pbImage.EnableRightClickMenu = true; this.pbImage.FullscreenOnClick = true; this.pbImage.Name = "pbImage"; + this.pbImage.PictureBoxBackColor = System.Drawing.SystemColors.Window; this.pbImage.ShowImageSizeLabel = true; // - // ucBeforeUpload - // - resources.ApplyResources(this.ucBeforeUpload, "ucBeforeUpload"); - this.ucBeforeUpload.Name = "ucBeforeUpload"; - // // AfterCaptureForm // - this.AcceptButton = this.btnContinue; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; diff --git a/ShareX/Forms/AfterCaptureForm.cs b/ShareX/Forms/AfterCaptureForm.cs index 4c986a601..a28fa95c7 100644 --- a/ShareX/Forms/AfterCaptureForm.cs +++ b/ShareX/Forms/AfterCaptureForm.cs @@ -84,6 +84,15 @@ private void AfterCaptureForm_Shown(object sender, EventArgs e) 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) { 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) { - TaskSettings.AfterCaptureJob = GetAfterCaptureTasks(); - TaskSettings.AfterUploadJob = GetAfterUploadTasks(); - FileName = txtFileName.Text; + Continue(); } private void btnCopy_Click(object sender, EventArgs e) diff --git a/ShareX/Forms/AfterCaptureForm.resx b/ShareX/Forms/AfterCaptureForm.resx index a2f99e641..f7b6179ea 100644 --- a/ShareX/Forms/AfterCaptureForm.resx +++ b/ShareX/Forms/AfterCaptureForm.resx @@ -235,7 +235,7 @@ lvAfterCaptureTasks - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null tpAfterCapture @@ -286,7 +286,7 @@ ucBeforeUpload - ShareX.BeforeUploadControl, ShareX, Version=11.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.BeforeUploadControl, ShareX, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null tpBeforeUpload @@ -340,7 +340,7 @@ lvAfterUploadTasks - ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null tpAfterUpload @@ -469,7 +469,7 @@ pbImage - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.0.2.0, Culture=neutral, PublicKeyToken=null $this @@ -486,9 +486,6 @@ 784, 441 - - NoControl - 800, 445