mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 05:05:42 +13:00
Merge
This commit is contained in:
commit
1886ab00b8
4 changed files with 6 additions and 5 deletions
|
@ -1,9 +1,9 @@
|
||||||
ShareX 8.8.1
|
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
|
* Clipboard Upload supports image or file URLs in their respective data types
|
||||||
* DreamObjects hosting support via Amazon S3
|
* 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 Greenshot Image Editor to Tools menu
|
||||||
* Added FTP Client to Tools menu
|
* Added FTP Client to Tools menu
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ public enum HotkeyType
|
||||||
FreeHandRegion,
|
FreeHandRegion,
|
||||||
[Description("Capture last region")]
|
[Description("Capture last region")]
|
||||||
LastRegion,
|
LastRegion,
|
||||||
[Description("Screen recorder")]
|
[Description("Screen recording")]
|
||||||
ScreenRecorder,
|
ScreenRecorder,
|
||||||
[Description("Auto capture")]
|
[Description("Auto capture")]
|
||||||
AutoCapture,
|
AutoCapture,
|
||||||
|
|
|
@ -74,7 +74,8 @@ public AfterUploadForm(TaskInfo info)
|
||||||
|
|
||||||
foreach (LinkFormatEnum type in Enum.GetValues(typeof(LinkFormatEnum)))
|
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;
|
continue;
|
||||||
|
|
||||||
AddFormat(type.GetDescription(), GetUrlByType(type));
|
AddFormat(type.GetDescription(), GetUrlByType(type));
|
||||||
|
|
|
@ -102,7 +102,7 @@ public async void StartRecording(TaskSettings TaskSettings)
|
||||||
if (TaskSettings.CaptureSettings.ScreenRecordOutput == ScreenRecordOutput.FFmpeg && !File.Exists(TaskSettings.CaptureSettings.FFmpegOptions.CLIPath))
|
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?",
|
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 =
|
Program.DefaultTaskSettings.CaptureSettings.FFmpegOptions.CLIPath = TaskSettings.TaskSettingsReference.CaptureSettings.FFmpegOptions.CLIPath =
|
||||||
TaskSettings.CaptureSettings.FFmpegOptions.CLIPath = Path.Combine(Program.ToolsFolder, "ffmpeg.exe");
|
TaskSettings.CaptureSettings.FFmpegOptions.CLIPath = Path.Combine(Program.ToolsFolder, "ffmpeg.exe");
|
||||||
|
|
Loading…
Reference in a new issue