From d2a38db520932383b6ef3af9fbe45ba7f155566b Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 25 Feb 2016 11:35:52 +0200 Subject: [PATCH] Added continue button to quick task menu --- ShareX/Forms/MainForm.cs | 6 +++++- ShareX/Properties/Resources.Designer.cs | 10 ++++++++++ ShareX/Properties/Resources.resx | 3 +++ ShareX/QuickTaskMenu.cs | 11 ++++++++++- ShareX/Resources/control.png | Bin 0 -> 396 bytes ShareX/ShareX.csproj | 1 + 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ShareX/Resources/control.png diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 5a1b7d5d1..cfe6a53dc 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1887,7 +1887,11 @@ private void AfterCapture(Image img, CaptureType captureType, TaskSettings taskS QuickTaskMenu quickTaskMenu = new QuickTaskMenu(); quickTaskMenu.TaskInfoSelected += taskInfo => { - if (taskInfo.IsValid) + if (taskInfo == null) + { + AfterCaptureRunTask(img, taskSettings); + } + else if (taskInfo.IsValid) { taskSettings.AfterCaptureJob = taskInfo.AfterCaptureTasks; taskSettings.AfterUploadJob = taskInfo.AfterUploadTasks; diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 940894077..acea634c3 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -551,6 +551,16 @@ public static System.Drawing.Bitmap color { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap control { + get { + object obj = ResourceManager.GetObject("control", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index cb2478b9c..712548f42 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -817,4 +817,7 @@ Would you like to restart ShareX? ..\Resources\disk-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX/QuickTaskMenu.cs b/ShareX/QuickTaskMenu.cs index bc589a76b..705ccaf40 100644 --- a/ShareX/QuickTaskMenu.cs +++ b/ShareX/QuickTaskMenu.cs @@ -74,7 +74,7 @@ public void ShowMenu() // TODO: Translate ToolStripMenuItem tsmiEdit = new ToolStripMenuItem("Edit this menu..."); - tsmiEdit.Image = Resources.gear; + tsmiEdit.Image = Resources.pencil; tsmiEdit.Click += (sender, e) => { cms.Close(); @@ -84,6 +84,15 @@ public void ShowMenu() cms.Items.Add(new ToolStripSeparator()); + ToolStripMenuItem tsmiContinue = new ToolStripMenuItem("Continue"); + tsmiContinue.Image = Resources.control; + tsmiContinue.Click += (sender, e) => + { + cms.Close(); + OnTaskInfoSelected(null); + }; + cms.Items.Add(tsmiContinue); + ToolStripMenuItem tsmiCancel = new ToolStripMenuItem("Cancel"); tsmiCancel.Image = Resources.cross; tsmiCancel.Click += (sender, e) => cms.Close(); diff --git a/ShareX/Resources/control.png b/ShareX/Resources/control.png new file mode 100644 index 0000000000000000000000000000000000000000..195a9d707b853c9fc591a518bdd0cbb6e450d115 GIT binary patch literal 396 zcmV;70dxL|P)LR z@Si__mi+nso8kA*pJ4p!#}9_<4W@(*0BSS_QpQm35<)Iu!Y}}6Ypl1FF_11``2RnK zWCK9XegFOsL%g57@$X;12pWRbfbZY`FkHU;i6Pcc1#HNFJceKx01B+%zyARZ`N44f z_#=iOSD;IN{={hrRs-I=`@rz{=~E#6j^XgpI}Gl&vS34qipF2xzcal0^`GGbJ2#lG zqa?_%cGLN@jEsyEh%*4_f|sn^3@^Fa7<45$7`Cn457x}e&c1{=1Au|}f|Z9sT$+L5 z*n;&C&1`H-NQwm(b{2-~GgqAb^Xu0HVBjqwEgFCQVt6=t-dSKmBB&Xw7ykbFa~6~r qm|0ks5R;i0Db0;c3={%@00RI)N~D1c%`xf#0000 +