From d24963f74b7bca2cf3060ffcb30ea523ebff5d16 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 5 Apr 2020 20:57:10 +0300 Subject: [PATCH] Added hotkeys for image splitter, image thumbnailer and video converter --- .../Properties/Resources.Designer.cs | 54 +++++++++++++++++++ ShareX.HelpersLib/Properties/Resources.resx | 18 +++++++ ShareX.IndexerLib/HtmlHelper.cs | 8 +-- ShareX.IndexerLib/IndexerHtml.cs | 2 +- .../Resources/IndexerDefault.css | 2 +- ShareX/Enums.cs | 3 ++ ShareX/TaskHelpers.cs | 12 +++++ 7 files changed, 93 insertions(+), 6 deletions(-) diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index e0b54b555..661fed43b 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -1347,6 +1347,42 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Image splitter. + /// + internal static string HotkeyType_ImageSplitter { + get { + return ResourceManager.GetString("HotkeyType_ImageSplitter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_ImageSplitter_Category { + get { + return ResourceManager.GetString("HotkeyType_ImageSplitter_Category", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Image thumbnailer. + /// + internal static string HotkeyType_ImageThumbnailer { + get { + return ResourceManager.GetString("HotkeyType_ImageThumbnailer", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_ImageThumbnailer_Category { + get { + return ResourceManager.GetString("HotkeyType_ImageThumbnailer_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Index folder. /// @@ -1914,6 +1950,24 @@ internal class Resources { } } + /// + /// Looks up a localized string similar to Video converter. + /// + internal static string HotkeyType_VideoConverter { + get { + return ResourceManager.GetString("HotkeyType_VideoConverter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tools. + /// + internal static string HotkeyType_VideoConverter_Category { + get { + return ResourceManager.GetString("HotkeyType_VideoConverter_Category", resourceCulture); + } + } + /// /// Looks up a localized string similar to Video thumbnailer. /// diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index 9d1517b67..8e7817efa 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -1220,4 +1220,22 @@ Would you like to download and install it? Smart eraser + + Image splitter + + + Tools + + + Image thumbnailer + + + Tools + + + Video converter + + + Tools + \ No newline at end of file diff --git a/ShareX.IndexerLib/HtmlHelper.cs b/ShareX.IndexerLib/HtmlHelper.cs index 6d26f2a8b..51995dffb 100644 --- a/ShareX.IndexerLib/HtmlHelper.cs +++ b/ShareX.IndexerLib/HtmlHelper.cs @@ -35,22 +35,22 @@ public static string StartTag(string tag, string style = "", string otherFields if (!string.IsNullOrEmpty(style)) { - css = string.Format(" style=\"{0}\"", style); + css = $" style=\"{style}\""; } string fields = ""; if (!string.IsNullOrEmpty(otherFields)) { - fields = " " + otherFields; + fields = $" {otherFields}"; } - return string.Format("<{0}{2}{1}>", tag, fields, css); + return $"<{tag}{css}{fields}>"; } public static string EndTag(string tag) { - return string.Format("", tag); + return $""; } public static string Tag(string tag, string content, string style = "", string otherFields = "") diff --git a/ShareX.IndexerLib/IndexerHtml.cs b/ShareX.IndexerLib/IndexerHtml.cs index 0cf2cfb17..6748d11b7 100644 --- a/ShareX.IndexerLib/IndexerHtml.cs +++ b/ShareX.IndexerLib/IndexerHtml.cs @@ -70,7 +70,7 @@ protected override void IndexFolder(FolderInfo dir, int level = 0) sbContent.AppendLine(GetFolderNameRow(dir, level)); string divClass = level > 0 ? "FolderBorder" : "MainFolderBorder"; - sbContent.AppendLine(HtmlHelper.StartTag("div", "", "class=\"" + divClass + "\"")); + sbContent.AppendLine(HtmlHelper.StartTag("div", "", $"class=\"{divClass}\"")); if (dir.Files.Count > 0) { diff --git a/ShareX.IndexerLib/Resources/IndexerDefault.css b/ShareX.IndexerLib/Resources/IndexerDefault.css index f06436465..0cfa2f1f5 100644 --- a/ShareX.IndexerLib/Resources/IndexerDefault.css +++ b/ShareX.IndexerLib/Resources/IndexerDefault.css @@ -31,7 +31,7 @@ h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; font-size: large; font-weight: normal; - text-shadow: 1px 1px 1px #000000; + text-shadow: 0px 1px 1px #000000; } h1 { diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs index 2354dc89c..f59e0facc 100644 --- a/ShareX/Enums.cs +++ b/ShareX/Enums.cs @@ -211,6 +211,9 @@ public enum HotkeyType // Localized + Category Ruler, IndexFolder, ImageCombiner, + ImageSplitter, + ImageThumbnailer, + VideoConverter, VideoThumbnailer, TweetMessage, MonitorTest, diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index fd60025dc..3201409a7 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -205,6 +205,15 @@ public static void ExecuteJob(TaskSettings taskSettings, HotkeyType job, CLIComm case HotkeyType.ImageCombiner: OpenImageCombiner(safeTaskSettings); break; + case HotkeyType.ImageSplitter: + OpenImageSplitter(); + break; + case HotkeyType.ImageThumbnailer: + OpenImageThumbnailer(); + break; + case HotkeyType.VideoConverter: + OpenVideoConverter(safeTaskSettings); + break; case HotkeyType.VideoThumbnailer: OpenVideoThumbnailer(safeTaskSettings); break; @@ -1562,6 +1571,9 @@ public static Image GetHotkeyTypeIcon(HotkeyType hotkeyType) case HotkeyType.Ruler: return Resources.ruler_triangle; case HotkeyType.IndexFolder: return Resources.folder_tree; case HotkeyType.ImageCombiner: return Resources.document_break; + case HotkeyType.ImageSplitter: return Resources.image_split; + case HotkeyType.ImageThumbnailer: return Resources.image_resize_actual; + case HotkeyType.VideoConverter: return Resources.camcorder_pencil; case HotkeyType.VideoThumbnailer: return Resources.images_stack; case HotkeyType.TweetMessage: return Resources.Twitter; case HotkeyType.MonitorTest: return Resources.monitor;