From 27ccde41c91eb421efe2b8f8aa52dc9e01c0a0b7 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Wed, 7 Sep 2016 16:53:54 +0300
Subject: [PATCH] Use AnnotateImage method in notification form

---
 ShareX/Forms/NotificationForm.cs |  2 +-
 ShareX/TaskHelpers.cs            | 71 +++++++++++++++++---------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/ShareX/Forms/NotificationForm.cs b/ShareX/Forms/NotificationForm.cs
index b494129ef..44f4b78fa 100644
--- a/ShareX/Forms/NotificationForm.cs
+++ b/ShareX/Forms/NotificationForm.cs
@@ -193,7 +193,7 @@ private void NotificationForm_MouseClick(object sender, MouseEventArgs e)
                 {
                     case ToastClickAction.AnnotateImage:
                         if (!string.IsNullOrEmpty(ToastConfig.FilePath) && Helpers.IsImageFile(ToastConfig.FilePath))
-                            TaskHelpers.AnnotateImageUsingGreenshot(ToastConfig.FilePath);
+                            TaskHelpers.AnnotateImage(ToastConfig.FilePath);
                         break;
                     case ToastClickAction.CopyImageToClipboard:
                         if (!string.IsNullOrEmpty(ToastConfig.FilePath))
diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs
index f454c2397..56519d5e1 100644
--- a/ShareX/TaskHelpers.cs
+++ b/ShareX/TaskHelpers.cs
@@ -201,26 +201,6 @@ public static bool ShowAfterCaptureForm(TaskSettings taskSettings, out string fi
             return true;
         }
 
-        public static void AnnotateImageUsingGreenshot(string filePath)
-        {
-            AnnotateImageUsingGreenshot(null, filePath);
-        }
-
-        public static Image AnnotateImageUsingGreenshot(Image img, string imgPath)
-        {
-            return ImageHelpers.AnnotateImage(img, imgPath, !Program.Sandbox, Program.PersonalFolder,
-                x => Program.MainForm.InvokeSafe(() => ClipboardHelpers.CopyImage(x)),
-                x => Program.MainForm.InvokeSafe(() => UploadManager.UploadImage(x)),
-                (x, filePath) => Program.MainForm.InvokeSafe(() => ImageHelpers.SaveImage(x, filePath)),
-                (x, filePath) =>
-                {
-                    string newFilePath = null;
-                    Program.MainForm.InvokeSafe(() => newFilePath = ImageHelpers.SaveImageFileDialog(x, filePath));
-                    return newFilePath;
-                },
-                x => Program.MainForm.InvokeSafe(() => PrintImage(x)));
-        }
-
         public static void PrintImage(Image img)
         {
             if (Program.Settings.DontShowPrintSettingsDialog)
@@ -594,12 +574,7 @@ public static void AnnotateImage(TaskSettings taskSettings = null)
                     {
                         if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
                         {
-                            Image result = RegionCaptureTasks.AnnotateImage(img, taskSettings.CaptureSettingsReference.SurfaceOptions);
-
-                            if (result != null)
-                            {
-                                UploadManager.RunImageTask(result, taskSettings);
-                            }
+                            AnnotateImageUsingShareX(img, taskSettings);
                         }
                         else
                         {
@@ -624,20 +599,50 @@ public static void AnnotateImage(string filePath, TaskSettings taskSettings = nu
 
                 if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
                 {
-                    Image result = RegionCaptureTasks.AnnotateImage(filePath, taskSettings.CaptureSettingsReference.SurfaceOptions);
-
-                    if (result != null)
-                    {
-                        UploadManager.RunImageTask(result, taskSettings);
-                    }
+                    AnnotateImageUsingShareX(filePath, taskSettings);
                 }
                 else
                 {
-                    AnnotateImageUsingGreenshot(filePath);
+                    AnnotateImageUsingGreenshot(null, filePath);
                 }
             }
         }
 
+        public static void AnnotateImageUsingShareX(Image img, TaskSettings taskSettings = null)
+        {
+            Image result = RegionCaptureTasks.AnnotateImage(img, taskSettings.CaptureSettingsReference.SurfaceOptions);
+
+            if (result != null)
+            {
+                UploadManager.RunImageTask(result, taskSettings);
+            }
+        }
+
+        public static void AnnotateImageUsingShareX(string filePath, TaskSettings taskSettings = null)
+        {
+            Image result = RegionCaptureTasks.AnnotateImage(filePath, taskSettings.CaptureSettingsReference.SurfaceOptions);
+
+            if (result != null)
+            {
+                UploadManager.RunImageTask(result, taskSettings);
+            }
+        }
+
+        public static Image AnnotateImageUsingGreenshot(Image img, string imgPath)
+        {
+            return ImageHelpers.AnnotateImage(img, imgPath, !Program.Sandbox, Program.PersonalFolder,
+                x => Program.MainForm.InvokeSafe(() => ClipboardHelpers.CopyImage(x)),
+                x => Program.MainForm.InvokeSafe(() => UploadManager.UploadImage(x)),
+                (x, filePath) => Program.MainForm.InvokeSafe(() => ImageHelpers.SaveImage(x, filePath)),
+                (x, filePath) =>
+                {
+                    string newFilePath = null;
+                    Program.MainForm.InvokeSafe(() => newFilePath = ImageHelpers.SaveImageFileDialog(x, filePath));
+                    return newFilePath;
+                },
+                x => Program.MainForm.InvokeSafe(() => PrintImage(x)));
+        }
+
         public static void OpenImageEffects()
         {
             string filePath = ImageHelpers.OpenImageFileDialog();