diff --git a/ShareX.MediaLib/Forms/VideoConverterForm.Designer.cs b/ShareX.MediaLib/Forms/VideoConverterForm.Designer.cs index 6d53a4f11..d6289eb47 100644 --- a/ShareX.MediaLib/Forms/VideoConverterForm.Designer.cs +++ b/ShareX.MediaLib/Forms/VideoConverterForm.Designer.cs @@ -102,6 +102,7 @@ private void InitializeComponent() this.btnOutputFolderBrowse.TabIndex = 5; this.btnOutputFolderBrowse.Text = "..."; this.btnOutputFolderBrowse.UseVisualStyleBackColor = true; + this.btnOutputFolderBrowse.Click += new System.EventHandler(this.btnOutputFolderBrowse_Click); // // lblOutputFileName // diff --git a/ShareX.MediaLib/Forms/VideoConverterForm.cs b/ShareX.MediaLib/Forms/VideoConverterForm.cs index 5f4dcc26b..0287989f7 100644 --- a/ShareX.MediaLib/Forms/VideoConverterForm.cs +++ b/ShareX.MediaLib/Forms/VideoConverterForm.cs @@ -48,9 +48,12 @@ public VideoConverterForm(string ffmpegFilePath, VideoConverterOptions options) UpdateOptions(); + txtInputFilePath.Text = Options.InputFilePath; + txtOutputFolder.Text = Options.OutputFolderPath; + txtOutputFileName.Text = Options.OutputFileName; cbVideoCodec.Items.AddRange(Helpers.GetEnumDescriptions()); cbVideoCodec.SelectedIndex = (int)Options.VideoCodec; - tbVideoQuality.SetValue(Options.VideoQuality); + tbVideoQuality.SetValue(tbVideoQuality.Minimum + tbVideoQuality.Maximum - Options.VideoQuality); ready = true; } @@ -172,6 +175,11 @@ private void txtOutputFolder_TextChanged(object sender, EventArgs e) UpdateOptions(); } + private void btnOutputFolderBrowse_Click(object sender, EventArgs e) + { + Helpers.BrowseFolder(txtOutputFolder); + } + private void txtOutputFileName_TextChanged(object sender, EventArgs e) { UpdateOptions(); diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 18574a2c0..dbd42d3bd 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -854,8 +854,8 @@ public static void OpenVideoConverter(TaskSettings taskSettings = null) return; } - VideoConverterOptions options = new VideoConverterOptions(); - VideoConverterForm videoConverterForm = new VideoConverterForm(taskSettings.CaptureSettings.FFmpegOptions.FFmpegPath, options); + VideoConverterForm videoConverterForm = new VideoConverterForm(taskSettings.CaptureSettings.FFmpegOptions.FFmpegPath, + taskSettings.ToolsSettingsReference.VideoConverterOptions); videoConverterForm.Show(); } @@ -869,7 +869,8 @@ public static void OpenVideoThumbnailer(TaskSettings taskSettings = null) } taskSettings.ToolsSettingsReference.VideoThumbnailOptions.DefaultOutputDirectory = taskSettings.CaptureFolder; - VideoThumbnailerForm thumbnailerForm = new VideoThumbnailerForm(taskSettings.CaptureSettings.FFmpegOptions.FFmpegPath, taskSettings.ToolsSettingsReference.VideoThumbnailOptions); + VideoThumbnailerForm thumbnailerForm = new VideoThumbnailerForm(taskSettings.CaptureSettings.FFmpegOptions.FFmpegPath, + taskSettings.ToolsSettingsReference.VideoThumbnailOptions); thumbnailerForm.ThumbnailsTaken += thumbnails => { if (taskSettings.ToolsSettingsReference.VideoThumbnailOptions.UploadThumbnails) diff --git a/ShareX/TaskSettings.cs b/ShareX/TaskSettings.cs index 349219ade..92a947dc6 100644 --- a/ShareX/TaskSettings.cs +++ b/ShareX/TaskSettings.cs @@ -396,6 +396,7 @@ public class TaskSettingsTools public string ScreenColorPickerFormat = "$hex"; public IndexerSettings IndexerSettings = new IndexerSettings(); public ImageCombinerOptions ImageCombinerOptions = new ImageCombinerOptions(); + public VideoConverterOptions VideoConverterOptions = new VideoConverterOptions(); public VideoThumbnailOptions VideoThumbnailOptions = new VideoThumbnailOptions(); }