ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added hotkeys for image splitter, image thumbnailer and video converter

This commit is contained in:
Jaex 2020-04-05 20:57:10 +03:00
parent 8e244b5982
commit d24963f74b
7 changed files with 93 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View File

@ -1347,6 +1347,42 @@ namespace ShareX.HelpersLib.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Image splitter.
/// </summary>
internal static string HotkeyType_ImageSplitter {
get {
return ResourceManager.GetString("HotkeyType_ImageSplitter", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_ImageSplitter_Category {
get {
return ResourceManager.GetString("HotkeyType_ImageSplitter_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Image thumbnailer.
/// </summary>
internal static string HotkeyType_ImageThumbnailer {
get {
return ResourceManager.GetString("HotkeyType_ImageThumbnailer", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_ImageThumbnailer_Category {
get {
return ResourceManager.GetString("HotkeyType_ImageThumbnailer_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Index folder.
/// </summary>
@ -1914,6 +1950,24 @@ namespace ShareX.HelpersLib.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Video converter.
/// </summary>
internal static string HotkeyType_VideoConverter {
get {
return ResourceManager.GetString("HotkeyType_VideoConverter", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Tools.
/// </summary>
internal static string HotkeyType_VideoConverter_Category {
get {
return ResourceManager.GetString("HotkeyType_VideoConverter_Category", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Video thumbnailer.
/// </summary>

18
ShareX.HelpersLib/Properties/Resources.resx
View File

@ -1220,4 +1220,22 @@ Would you like to download and install it?</value>
<data name="ShapeType_DrawingSmartEraser" xml:space="preserve">
<value>Smart eraser</value>
</data>
<data name="HotkeyType_ImageSplitter" xml:space="preserve">
<value>Image splitter</value>
</data>
<data name="HotkeyType_ImageSplitter_Category" xml:space="preserve">
<value>Tools</value>
</data>
<data name="HotkeyType_ImageThumbnailer" xml:space="preserve">
<value>Image thumbnailer</value>
</data>
<data name="HotkeyType_ImageThumbnailer_Category" xml:space="preserve">
<value>Tools</value>
</data>
<data name="HotkeyType_VideoConverter" xml:space="preserve">
<value>Video converter</value>
</data>
<data name="HotkeyType_VideoConverter_Category" xml:space="preserve">
<value>Tools</value>
</data>
</root>

8
ShareX.IndexerLib/HtmlHelper.cs
View File

@ -35,22 +35,22 @@ namespace ShareX.IndexerLib
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("</{0}>", tag);
return $"</{tag}>";
}
public static string Tag(string tag, string content, string style = "", string otherFields = "")

2
ShareX.IndexerLib/IndexerHtml.cs
View File

@ -70,7 +70,7 @@ namespace ShareX.IndexerLib
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)
{

2
ShareX.IndexerLib/Resources/IndexerDefault.css
View File

@ -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 {

3
ShareX/Enums.cs
View File

@ -211,6 +211,9 @@ namespace ShareX
Ruler,
IndexFolder,
ImageCombiner,
ImageSplitter,
ImageThumbnailer,
VideoConverter,
VideoThumbnailer,
TweetMessage,
MonitorTest,

12
ShareX/TaskHelpers.cs
View File

@ -205,6 +205,15 @@ namespace ShareX
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 @@ namespace ShareX
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;