mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-05 20:54:31 +13:00
Few annotate image changes
This commit is contained in:
parent
466bf954a1
commit
1ed5411644
1 changed files with 10 additions and 7 deletions
|
@ -721,7 +721,7 @@ private bool CheckCLIHotkey(CLICommand command)
|
||||||
{
|
{
|
||||||
if (command.CheckCommand(job.ToString()))
|
if (command.CheckCommand(job.ToString()))
|
||||||
{
|
{
|
||||||
ExecuteJob(TaskSettings.GetDefaultTaskSettings(), job, command);
|
ExecuteJob(job, command);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1744,9 +1744,9 @@ private void HandleHotkeys(HotkeySettings hotkeySetting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ExecuteJob(HotkeyType job)
|
private void ExecuteJob(HotkeyType job, CLICommand command = null)
|
||||||
{
|
{
|
||||||
ExecuteJob(Program.DefaultTaskSettings, job);
|
ExecuteJob(Program.DefaultTaskSettings, job, command);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ExecuteJob(TaskSettings taskSettings)
|
private void ExecuteJob(TaskSettings taskSettings)
|
||||||
|
@ -1860,11 +1860,14 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job, CLICommand co
|
||||||
TaskHelpers.OpenScreenColorPicker(safeTaskSettings);
|
TaskHelpers.OpenScreenColorPicker(safeTaskSettings);
|
||||||
break;
|
break;
|
||||||
case HotkeyType.ImageEditor:
|
case HotkeyType.ImageEditor:
|
||||||
if (command != null)
|
if (command != null && !string.IsNullOrEmpty(command.Parameter) && File.Exists(command.Parameter))
|
||||||
if (!string.IsNullOrEmpty(command.Parameter))
|
{
|
||||||
TaskHelpers.AnnotateImage(command.Parameter);
|
TaskHelpers.AnnotateImage(command.Parameter, safeTaskSettings);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
TaskHelpers.AnnotateImage(taskSettings);
|
{
|
||||||
|
TaskHelpers.AnnotateImage(safeTaskSettings);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case HotkeyType.ImageEffects:
|
case HotkeyType.ImageEffects:
|
||||||
TaskHelpers.OpenImageEffects();
|
TaskHelpers.OpenImageEffects();
|
||||||
|
|
Loading…
Reference in a new issue