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

Merge

Browse source
This commit is contained in:
Jaex 2014-05-12 01:25:55 +03:00
parent 3cb47314a9 c2e37a85cf
commit 1886ab00b8
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Docs/VersionHistory.txt
View file

@ -1,9 +1,9 @@
ShareX 8.8.1
* Capture screencasts (screen recordings) using FFmpeg
* Capture screencasts using FFmpeg
* Capture screencasts (screen recordings) using Video Compression Manager (VCM) via Video for Windows (VfW) encoders
* Clipboard Upload supports image or file URLs in their respective data types
* DreamObjects hosting support via Amazon S3
* Video Compression Manager (VCM) options to use Video for Windows (VfW) encoders
* Added Greenshot Image Editor to Tools menu
* Added FTP Client to Tools menu

2
ShareX/Enums.cs
View file

@ -158,7 +158,7 @@ public enum HotkeyType
FreeHandRegion,
[Description("Capture last region")]
LastRegion,
[Description("Screen recorder")]
[Description("Screen recording")]
ScreenRecorder,
[Description("Auto capture")]
AutoCapture,

3
ShareX/Forms/AfterUploadForm.cs
View file

@ -74,7 +74,8 @@ public AfterUploadForm(TaskInfo info)
foreach (LinkFormatEnum type in Enum.GetValues(typeof(LinkFormatEnum)))
{
if (!Helpers.IsImageFile(Info.Result.URL) && type != LinkFormatEnum.URL && type != LinkFormatEnum.LocalFilePath && type != LinkFormatEnum.LocalFilePathUri)
if (!Helpers.IsImageFile(Info.Result.URL) && (type == LinkFormatEnum.HTMLImage || type == LinkFormatEnum.HTMLLinkedImage ||
type == LinkFormatEnum.ForumImage || type == LinkFormatEnum.ForumLinkedImage))
continue;
AddFormat(type.GetDescription(), GetUrlByType(type));

2
ShareX/Forms/ScreenRecordForm.cs
View file

@ -102,7 +102,7 @@ public async void StartRecording(TaskSettings TaskSettings)
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.FFmpeg && !File.Exists(TaskSettings.CaptureSettings.FFmpegOptions.CLIPath))
{
if (MessageBox.Show(TaskSettings.CaptureSettings.FFmpegOptions.CLIPath + " does not exist." + Environment.NewLine + Environment.NewLine + "Would you like to automatically download it?",
Application.ProductName + " - Missing ffmpeg.exe", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == System.Windows.Forms.DialogResult.Yes)
Application.ProductName + " - Missing ffmpeg.exe", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes)
{
Program.DefaultTaskSettings.CaptureSettings.FFmpegOptions.CLIPath = TaskSettings.TaskSettingsReference.CaptureSettings.FFmpegOptions.CLIPath =
TaskSettings.CaptureSettings.FFmpegOptions.CLIPath = Path.Combine(Program.ToolsFolder, "ffmpeg.exe");