CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added continue button to quick task menu

Browse source
This commit is contained in:
Jaex 2016-02-25 11:35:52 +02:00
parent 93a5d71e06
commit d2a38db520
6 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX/Forms/MainForm.cs
View file

@ -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;

10
ShareX/Properties/Resources.Designer.cs generated
View file

@ -551,6 +551,16 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
public static System.Drawing.Bitmap control {
get {
object obj = ResourceManager.GetObject("control", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

3
ShareX/Properties/Resources.resx
View file

@ -817,4 +817,7 @@ Would you like to restart ShareX?</value>
<data name="disk_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\disk-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

11
ShareX/QuickTaskMenu.cs
View file

@ -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();

BIN
ShareX/Resources/control.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 396 B

1
ShareX/ShareX.csproj
View file

@ -1268,6 +1268,7 @@
<None Include="Resources\vn.png" />
<None Include="Resources\layout-select.png" />
<None Include="Resources\disk-black.png" />
<None Include="Resources\control.png" />
<Content Include="ShareX_Icon.ico" />
<None Include="Resources\globe--pencil.png" />
<None Include="Resources\camcorder--pencil.png" />