From ffb8d351394653e32418ed7e5555982158ee0426 Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 2 Sep 2014 01:21:16 +0300 Subject: [PATCH] fixed #258: Hotkey for open screenshots folder --- ShareX/Enums.cs | 2 ++ ShareX/Forms/MainForm.cs | 12 ++++-------- ShareX/TaskHelpers.cs | 12 ++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs index d7e774534..921a16a4a 100644 --- a/ShareX/Enums.cs +++ b/ShareX/Enums.cs @@ -175,6 +175,8 @@ public enum HotkeyType ScreenRecorder, [Description("Auto capture")] AutoCapture, + [Description("Open screenshots folder")] + OpenScreenshotsFolder, [Description("Screen color picker")] ScreenColorPicker, [Description("Ruler")] diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 6f2cd4be6..db20316d7 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -921,14 +921,7 @@ private void tsbDestinationSettings_Click(object sender, EventArgs e) private void tsbScreenshotsFolder_Click(object sender, EventArgs e) { - if (Directory.Exists(Program.ScreenshotsFolder)) - { - Helpers.OpenFolder(Program.ScreenshotsFolder); - } - else - { - Helpers.OpenFolder(Program.ScreenshotsParentFolder); - } + TaskHelpers.OpenScreenshotsFolder(); } private void tsbHistory_Click(object sender, EventArgs e) @@ -1416,6 +1409,9 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job) case HotkeyType.AutoCapture: TaskHelpers.OpenAutoCapture(); break; + case HotkeyType.OpenScreenshotsFolder: + TaskHelpers.OpenScreenshotsFolder(); + break; case HotkeyType.ScreenColorPicker: TaskHelpers.OpenScreenColorPicker(safeTaskSettings); break; diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 1692b5bf0..df013eaf7 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -503,6 +503,18 @@ public static void OpenAutoCapture() AutoCaptureForm.Instance.ShowActivate(); } + public static void OpenScreenshotsFolder() + { + if (Directory.Exists(Program.ScreenshotsFolder)) + { + Helpers.OpenFolder(Program.ScreenshotsFolder); + } + else + { + Helpers.OpenFolder(Program.ScreenshotsParentFolder); + } + } + public static void StartAutoCapture() { if (!AutoCaptureForm.IsRunning)