mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-05 20:54:31 +13:00
Use AnnotateImage method in notification form
This commit is contained in:
parent
8fd061e4c8
commit
27ccde41c9
2 changed files with 39 additions and 34 deletions
|
@ -193,7 +193,7 @@ private void NotificationForm_MouseClick(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
case ToastClickAction.AnnotateImage:
|
case ToastClickAction.AnnotateImage:
|
||||||
if (!string.IsNullOrEmpty(ToastConfig.FilePath) && Helpers.IsImageFile(ToastConfig.FilePath))
|
if (!string.IsNullOrEmpty(ToastConfig.FilePath) && Helpers.IsImageFile(ToastConfig.FilePath))
|
||||||
TaskHelpers.AnnotateImageUsingGreenshot(ToastConfig.FilePath);
|
TaskHelpers.AnnotateImage(ToastConfig.FilePath);
|
||||||
break;
|
break;
|
||||||
case ToastClickAction.CopyImageToClipboard:
|
case ToastClickAction.CopyImageToClipboard:
|
||||||
if (!string.IsNullOrEmpty(ToastConfig.FilePath))
|
if (!string.IsNullOrEmpty(ToastConfig.FilePath))
|
||||||
|
|
|
@ -201,26 +201,6 @@ public static bool ShowAfterCaptureForm(TaskSettings taskSettings, out string fi
|
||||||
return true;
|
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)
|
public static void PrintImage(Image img)
|
||||||
{
|
{
|
||||||
if (Program.Settings.DontShowPrintSettingsDialog)
|
if (Program.Settings.DontShowPrintSettingsDialog)
|
||||||
|
@ -594,12 +574,7 @@ public static void AnnotateImage(TaskSettings taskSettings = null)
|
||||||
{
|
{
|
||||||
if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
|
if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
|
||||||
{
|
{
|
||||||
Image result = RegionCaptureTasks.AnnotateImage(img, taskSettings.CaptureSettingsReference.SurfaceOptions);
|
AnnotateImageUsingShareX(img, taskSettings);
|
||||||
|
|
||||||
if (result != null)
|
|
||||||
{
|
|
||||||
UploadManager.RunImageTask(result, taskSettings);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -623,6 +598,27 @@ public static void AnnotateImage(string filePath, TaskSettings taskSettings = nu
|
||||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||||
|
|
||||||
if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
|
if (taskSettings.AdvancedSettings.UseShareXForAnnotation)
|
||||||
|
{
|
||||||
|
AnnotateImageUsingShareX(filePath, taskSettings);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
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);
|
Image result = RegionCaptureTasks.AnnotateImage(filePath, taskSettings.CaptureSettingsReference.SurfaceOptions);
|
||||||
|
|
||||||
|
@ -631,11 +627,20 @@ public static void AnnotateImage(string filePath, TaskSettings taskSettings = nu
|
||||||
UploadManager.RunImageTask(result, taskSettings);
|
UploadManager.RunImageTask(result, taskSettings);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
public static Image AnnotateImageUsingGreenshot(Image img, string imgPath)
|
||||||
{
|
{
|
||||||
AnnotateImageUsingGreenshot(filePath);
|
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()
|
public static void OpenImageEffects()
|
||||||
|
|
Loading…
Reference in a new issue