CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-07 07:26:05 +12:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1270 from junderhill/master

Browse source 
Added post capture task to show in explorer #1265
This commit is contained in:
Jaex 2016-01-20 13:00:57 +02:00
parent 4a6f55846d d3787c1024
commit 8afd3bf9c5
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -196,6 +196,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Show file in explorer.
/// </summary>
internal static string AfterCaptureTasks_ShowInExplorer {
get {
return ResourceManager.GetString("AfterCaptureTasks_ShowInExplorer", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Upload image to host.
/// </summary>

3
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -540,6 +540,9 @@ File size: {2:n0} / {3:n0} KB</value>
<data name="AfterCaptureTasks_SaveImageToFileWithDialog" xml:space="preserve">
<value>Save image to file as...</value>
</data>
<data name="AfterCaptureTasks_ShowInExplorer" xml:space="preserve">
<value>Show file in explorer</value>
</data>
<data name="AfterCaptureTasks_SaveThumbnailImageToFile" xml:space="preserve">
<value>Save thumbnail image to file</value>
</data>

7
ShareX/Enums.cs
View file

@ -101,9 +101,10 @@ public enum AfterCaptureTasks // Localized
PerformActions = 1 << 8,
CopyFileToClipboard = 1 << 9,
CopyFilePathToClipboard = 1 << 10,
ShowBeforeUploadWindow = 1 << 11,
UploadImageToHost = 1 << 12,
DeleteFile = 1 << 13
ShowInExplorer = 1 << 11,
ShowBeforeUploadWindow = 1 << 12,
UploadImageToHost = 1 << 13,
DeleteFile = 1 << 14
}
[Flags]

5
ShareX/WorkerTask.cs
View file

@ -655,6 +655,11 @@ private void DoFileJobs()
{
ClipboardHelpers.CopyText(Info.FilePath);
}
if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.ShowInExplorer))
{
Helpers.OpenFolderWithFile(Info.FilePath);
}
}
}