CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

fixed #212: Be able to cancel tasks from image editor

Browse source
This commit is contained in:
Jaex 2014-07-30 13:36:35 +03:00
parent f6f7460b09
commit 64ae1ba3c2
6 changed files with 104 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
GreenshotImageEditor/Forms/ImageEditorForm.Designer.cs generated
View file

@ -109,7 +109,8 @@ private void InitializeComponent() {
this.propertiesToolStrip = new Greenshot.Controls.ToolStripEx();
this.btnSaveClose = new System.Windows.Forms.ToolStripButton();
this.btnClose = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.btnCancelTasks = new System.Windows.Forms.ToolStripButton();
this.tssTaskButtons = new System.Windows.Forms.ToolStripSeparator();
this.btnSaveAs = new System.Windows.Forms.ToolStripButton();
this.btnClipboardCopy = new System.Windows.Forms.ToolStripButton();
this.btnUploadImage = new System.Windows.Forms.ToolStripButton();
@ -499,7 +500,7 @@ private void InitializeComponent() {
//
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.saveToolStripMenuItem.Text = "&Save";
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
//
@ -507,7 +508,7 @@ private void InitializeComponent() {
//
this.saveAsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveAsToolStripMenuItem.Image")));
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
this.saveAsToolStripMenuItem.Text = "Save &As...";
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
//
@ -800,7 +801,8 @@ private void InitializeComponent() {
this.propertiesToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btnSaveClose,
this.btnClose,
this.toolStripSeparator6,
this.btnCancelTasks,
this.tssTaskButtons,
this.btnSaveAs,
this.btnClipboardCopy,
this.btnUploadImage,
@ -867,10 +869,19 @@ private void InitializeComponent() {
this.btnClose.Text = "Close";
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// toolStripSeparator6
// btnCancelTasks
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 27);
this.btnCancelTasks.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnCancelTasks.Image = ((System.Drawing.Image)(resources.GetObject("btnCancelTasks.Image")));
this.btnCancelTasks.Name = "btnCancelTasks";
this.btnCancelTasks.Size = new System.Drawing.Size(23, 24);
this.btnCancelTasks.Text = "Close and cancel tasks";
this.btnCancelTasks.Click += new System.EventHandler(this.btnCancelTasks_Click);
//
// tssTaskButtons
//
this.tssTaskButtons.Name = "tssTaskButtons";
this.tssTaskButtons.Size = new System.Drawing.Size(6, 27);
//
// btnSaveAs
//
@ -1140,7 +1151,7 @@ private void InitializeComponent() {
this.fontFamilyComboBox.MaxDropDownItems = 20;
this.fontFamilyComboBox.Name = "fontFamilyComboBox";
this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 23);
this.fontFamilyComboBox.Text = "Agency FB";
this.fontFamilyComboBox.Text = "Aharoni";
this.fontFamilyComboBox.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus);
this.fontFamilyComboBox.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus);
//
@ -1748,12 +1759,13 @@ private void InitializeComponent() {
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripSeparator tssTaskButtons;
private System.Windows.Forms.ToolStripButton btnClipboardCopy;
private System.Windows.Forms.ToolStripButton btnUploadImage;
private System.Windows.Forms.ToolStripButton btnSaveAs;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
private System.Windows.Forms.ToolStripButton btnCancelTasks;
}
}

21
GreenshotImageEditor/Forms/ImageEditorForm.cs
View file

@ -83,6 +83,20 @@ public static List<IImageEditor> Editors
}
}
private bool isTaskWork;
public bool IsTaskWork
{
get
{
return isTaskWork;
}
set
{
isTaskWork = btnSaveClose.Visible = btnClose.Visible = btnCancelTasks.Visible = tssTaskButtons.Visible = value;
}
}
public ImageEditorForm(ISurface iSurface, bool outputMade)
{
editorList.Add(this);
@ -1383,6 +1397,13 @@ private void btnClose_Click(object sender, EventArgs e)
Close();
}
private void btnCancelTasks_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Abort;
forceClose = true;
Close();
}
private void btnClipboardCopy_Click(object sender, EventArgs e)
{
OnClipboardCopyRequested();

54
GreenshotImageEditor/Forms/ImageEditorForm.resx
View file

@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>612, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnCursor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -288,7 +288,7 @@
Mfn5f2QMEgMZIBQ+OwiI6/DgIJC6IQ0YGADxitTt0c6Z7QAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>497, 17</value>
</metadata>
<data name="saveAsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -481,7 +481,7 @@
AElFTkSuQmCC
</value>
</data>
<metadata name="propertiesToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="propertiesToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>225, 17</value>
</metadata>
<data name="btnSaveClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -511,6 +511,20 @@
lxpNESngJyl0dNgfBgdVqbf3giZMwsgEzv6HPbCsX1XLUuRSo+XXdQ9/jrxh1D739ald3PIMUVfxXoI9
Zx8hJodcLWuvO1jk4L6JiIehkPcFAoI9Z9yRo+ltFQBiwM043pwUyU+J7NwVOSHYc8YdOLcAtL6mVQYQ
BKIA3/Yv8CJyoRH5DWo45zzHM0fVAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnCancelTasks.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsEAAA7BAbiRa+0AAAHcSURBVDhPrZM7SMNQFIaPQn2ASipYRHStDk610L0g0qFY
F6mNIrjo4ODg6qwFBxcX8TlYa1HqUJcKRqWDaFMbHXxQihjB6lB0SOgSjufodahUXfzhJyf3/N/l3Dzg
3xUBaNsGmIxRSU4JR3iNeyJWWVEA/259vZLxePSXUMh4m5iwXsfHreehIUN1u3XucUbEy7VJjbgkqQVZ
Np9GR1GX5TLz2mMwaMYbG1XOCuxTyzRatK5OuR8cNG8HBvC6v7+ibwIBvPP7zU2bTWFG4ACrdL6Uy6Vr
Ph+eeb2/+qKvDw+6unRmBA6wBLB11dtrKB4PfjnpcuFeZydG2ttx3eHA5ebmD3OdcDoNZgQOsEhPmna2
Dnp6sFQqYT6fx0wmg5qmYS6Xw0KhgMVi8cMbdjvudHRYzAgcYIFuzr1ea9/pxGw2i+l0uiLMjtEG8dZW
ixmBA8zTOEp3t5GgEaMU+M0J8q4kGcwIHGCOP5yWlodjOt8hBf7yWm2tzozAAcL0SsJVVYricJinNMUp
hX5ysqnJ5CwzAv/UDH0cs9XV6okkmRptolH4u48I5gxnBVauKWpM0+4rNTX6SUODcWm3W2yueY17nBHx
yhqj0YbpfCP0A9E1xRb1JPdE7L8E8A6mCkqY5MqxpAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnSaveAs.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -540,19 +554,19 @@
<data name="btnUploadImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK+SURBVDhPnZLdS1NhHMfPqqtuvLA/IRiRCeLIqIbWFEO8
iJRMEolQm3hTSG5punBL26y0hW9oqQmSitpW2st8QT3Ng3PDOUu3NrfQYzl1NBMVnXx7njXoQrvxe/jA
w3k+3+f5wTnMngCCI+rv4sPqhUqBhn9LoWv6ju6FrP8FgkPFk9LjlbOmarN3pWX6545l6fdOm2N9JbLa
YaJ71AnJ+yRbHytUjFoaWH7btAFUjCzi/fwG6PoTv7YdoTJaqBOy90Zw9UXtlbpxX3a3C7m6OeS9mUO+
zoW779x4PrWB62SPOiF9nyQ8GsrutAein5pwrs6Gs1ozbvT4kPthHSLlKC5quAB1Qva/pKSkiFJTU28d
vSB3xFYZd09pTIh+ZoWo0oJIxRBSurZxpmIa8XXWXepQl3aC5eTk5GNSqVTm9/uRoeqCRM0ittaBhIZv
uNRIqLcjocqGzN5NpLe6cfleG6xWD7KypDLaZZKSkk5otdrm1dVVvOrjEJ3fhbSWeWS2e3Gzk9DhRXqD
CyrLJk7LevC4yYCJCSdUKk0z7TKJiYlxHR0dg/QAh8OBgsZ+iIoNyGj24I7uV5Br9bM4rzQg54keBgMX
PKCm5uUg7TISiSSN4zjn0tISpqamiGDA/ep2xD/QIULeh5OyXsQVd+O2ugVNTa+h1w+B42bR2fnRSbuM
WCzOW1xcRCAQwNbWJtbW/Fhe9oLnF+DxuOFyuQhzBA9hnvCDsAyW/QLaZWJiYvJ9Ph/s9llMT9tgsZjJ
DWMYGRnGwMBAcCKDoZ8wSBgmsAQOZrMTtMtERUUV8DwPnU6H8vIyKJWlUChKUFRUCLlcDpmMUkgoIZQS
ypBDHpa1gXYZoVBYpNfr3X9HdWJm5iv5TJMwmcZhNBqJyBI+E8YI4wRzcIL6+lY37TLh4eGSsLCwhweB
doM/08HDMH8A6isFr8Cs2hUAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAK9SURBVDhPnZLfS1NhHMbPqqtuvLA/IRiRCeLIqJbGEkO8
iCaZJBKhNvGmkNrSdOGWNq00wx9DS02Q3FDbSivmj5xrHpwbumnq2txCz8Kpq4mo6OTpfdegC+3G5/CB
l/N+nvf9wjnMngC8I6ofwsOqxWpeJfeeQtf0Hd2LWP8LeIdKJiTHq2ctdVb/SsvU4o6N+7XT4Vxfia1z
WugedSLyPsnVJ/LlI7amL9y2ZQOoMvrwcWEDdN3HBbZjlGYbdSL23vCuvWq42jgWyO12I183j4J38yjU
uXHvgwcv7Ru4QfaoE9H3SfKToVztdCj+uQXnGh04W2vFzZ4A8j+tQ6AYwYVyNkSdiP0vYrFYkJ6efvvo
RZkzsca4e6rSgvgXkxBU2xArH4K4axtnqqaQ1GjdpQ51aSdcTktLOyaRSKTBYBBZyi6IVCYkNjiR3PQd
l5sJ6jkk1ziQ3buJzHYPrjzowOSkFzk5EintMqmpqSdqa2tbV1dX8aaPRXxhFzLaFpDd6cctLUHjR2aT
G0rbJk5Le/C0xYDxcReUyspW2mVSUlKSNBrNID3A6XTifnM/BCUGZLV6cVf3O8x19SzOKwzIe6aHwcCG
D6ivfz1Iu4xIJMpgWda1tLQEu91OBAMe1nXi0iMdYmR9OCntRVJJN+6o2tDS8hZ6/RBYdhZa7WcX7TJC
obDA5/MhFApha2sTa2tBLC/7wXGL8Ho9cLvdhHmCl7BA+ElYhsk0DdplEhISCgOBAObmZjE15YDNZiU3
jMJoHMbAwEB4IoOhnzBIGCaYCCysVhdol4mLi7vPcRx0Oh0qKsqhUJRBLi9FcXERZDIZpFJKEaGUUEYo
Rx55TCYHaJfh8/nFer3e83dUF2ZmvpHPNAGLZQxms5mIJsJXwihhjGANT6BWt3tol4mOjhZFRUU9Pgi0
G/6ZDh6G+QNLAwV9p+dl4gAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnUndo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -929,7 +943,7 @@
RU5ErkJggg==
</value>
</data>
<metadata name="fileSavedStatusContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="fileSavedStatusContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

9
HelpersLib/Helpers/ImageHelpers.cs
View file

@ -679,19 +679,26 @@ public static Image AnnotateImage(Image img, string imgPath, bool allowSave, str
using (Surface surface = new Surface(capture))
using (ImageEditorForm editor = new ImageEditorForm(surface, true))
{
editor.IsTaskWork = img != null;
editor.SetImagePath(imgPath);
editor.ClipboardCopyRequested += clipboardCopyRequested;
editor.ImageUploadRequested += imageUploadRequested;
editor.ImageSaveRequested += imageSaveRequested;
editor.ImageSaveAsRequested += imageSaveAsRequested;
if (editor.ShowDialog() == DialogResult.OK && img != null)
DialogResult result = editor.ShowDialog();
if (result == DialogResult.OK && editor.IsTaskWork)
{
using (img)
{
return editor.GetImageForExport();
}
}
else if (result == DialogResult.Abort)
{
return null;
}
}
return img;

2
ShareX/Forms/BeforeUploadForm.cs
View file

@ -39,7 +39,7 @@ public BeforeUploadForm(TaskInfo info)
ucBeforeUpload.InitCompleted += (currentDestination) =>
{
string title = string.IsNullOrEmpty(currentDestination) ? "Please choose a destination." : "{0} is about to be- uploaded to {1}. You may choose a different destination.";
string title = string.IsNullOrEmpty(currentDestination) ? "Please choose a destination." : "{0} is about to be uploaded to {1}. You may choose a different destination.";
lblTitle.Text = string.Format(title, info.FileName, currentDestination);
};
ucBeforeUpload.Init(info);

25
ShareX/UploadTask.cs
View file

@ -254,8 +254,12 @@ private void ThreadDoWork()
try
{
DoThreadJob();
DoUploadJob();
StopRequested = !DoThreadJob();
if (!StopRequested)
{
DoUploadJob();
}
}
finally
{
@ -408,7 +412,7 @@ private bool DoUpload(int retry = 0)
return isError;
}
private void DoThreadJob()
private bool DoThreadJob()
{
if (Info.IsUploadJob && Info.TaskSettings.AdvancedSettings.AutoClearClipboard)
{
@ -417,9 +421,9 @@ private void DoThreadJob()
if (Info.Job == TaskJob.Job)
{
if (tempImage != null)
if (tempImage != null && !DoAfterCaptureJobs())
{
DoAfterCaptureJobs();
return false;
}
DoFileJobs();
@ -434,9 +438,11 @@ private void DoThreadJob()
{
Data.Position = 0;
}
return true;
}
private void DoAfterCaptureJobs()
private bool DoAfterCaptureJobs()
{
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.AddImageEffects))
{
@ -451,6 +457,11 @@ private void DoAfterCaptureJobs()
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.AnnotateImage))
{
tempImage = TaskHelpers.AnnotateImage(tempImage, Info.FileName);
if (tempImage == null)
{
return false;
}
}
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.CopyImageToClipboard))
@ -547,6 +558,8 @@ private void DoAfterCaptureJobs()
}
}
}
return true;
}
private void DoFileJobs()