From 4e838276a8edae42df53d004f36dd4237c9c354a Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Tue, 6 Sep 2022 21:20:05 +0200 Subject: [PATCH] minor changes --- .vs/Crunchyroll Downloader/v17/.suo | Bin 135680 -> 144896 bytes Crunchyroll Downloader/Anime_Add.vb | 2 + .../CefSharp_Browser.Designer.vb | 1 - Crunchyroll Downloader/CefSharp_Browser.vb | 1 + Crunchyroll Downloader/Main.vb | 93 +++++++++++--- .../einstellungen.Designer.vb | 114 +++++++++--------- Crunchyroll Downloader/einstellungen.vb | 50 ++++---- 7 files changed, 167 insertions(+), 94 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index ecfbdc738db14741d9f5a63d8211c8de57394cd6..639eced0fbf2cbefc79cc8cb5fbf08281e7d0f9e 100644 GIT binary patch delta 9923 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 Xo}ny-=(3rXh)Lzt#aerorgiuyLjAYe delta 7186 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 0 Then Main.MergeSubs = True - rk.SetValue("MergeSubs", "1", RegistryValueKind.String) + Main.MergeSubsFormat = CB_Merge.SelectedItem.ToString + rk.SetValue("MergeSubs", CB_Merge.SelectedItem.ToString, RegistryValueKind.String) Else + Main.MergeSubsFormat = CB_Merge.SelectedItem.ToString Main.MergeSubs = False - rk.SetValue("MergeSubs", "0", RegistryValueKind.String) + rk.SetValue("MergeSubs", "None", RegistryValueKind.String) End If @@ -857,7 +852,7 @@ Public Class Einstellungen Private Sub AAuto_Click(sender As Object, e As EventArgs) Handles AAuto.Click - If MergeMP4.Checked = True Then + If CB_Merge.SelectedIndex > 0 Then If AAuto.Checked = True Then If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then @@ -875,13 +870,13 @@ Public Class Einstellungen End If End Sub - Private Sub MergeMP4_Click(sender As Object, e As EventArgs) Handles MergeMP4.Click - If MergeMP4.Checked = True Then + Private Sub MergeMP4_Click(sender As Object, e As EventArgs) + If CB_Merge.SelectedIndex > 0 Then If AAuto.Checked = True Then If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then Else - MergeMP4.Checked = False + CB_Merge.SelectedIndex = 0 End If End If End If @@ -1228,19 +1223,34 @@ Public Class Einstellungen Private Sub CB_Format_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Format.SelectedIndexChanged If CB_Format.Text = "AAC (Audio only)" Then - If MergeMP4.Checked = True Then + If CB_Merge.SelectedIndex > 0 Then MsgBox("Merged subs are not avalible with audio only!", MsgBoxStyle.Information) End If - MergeMP4.Checked = False + CB_Merge.SelectedIndex = 0 + ElseIf CB_Format.Text = "MP4" Then + CB_Merge.SelectedIndex = 0 + CB_Merge.Items.Clear() + CB_Merge.Items.Add("[Merge Disabeld]") 'mov_text + CB_Merge.Items.Add("mov_text") + 'CB_Merge.Items.Add("srt") + CB_Merge.SelectedItem = Main.MergeSubsFormat + ElseIf CB_Format.Text = "MKV" Then + CB_Merge.SelectedIndex = 0 + CB_Merge.Items.Clear() + CB_Merge.Items.Add("[Merge Disabeld]") + CB_Merge.Items.Add("copy") + CB_Merge.Items.Add("srt") + CB_Merge.SelectedItem = Main.MergeSubsFormat End If + End Sub - Private Sub MergeMP4_CheckedChanged(sender As Object, e As EventArgs) Handles MergeMP4.CheckedChanged + Private Sub MergeMP4_CheckedChanged(sender As Object, e As EventArgs) If CB_Format.Text = "AAC (Audio only)" Then - If MergeMP4.Checked = True Then + If CB_Merge.SelectedIndex > 0 Then MsgBox("Merged subs are not avalible with audio only!", MsgBoxStyle.Information) End If - MergeMP4.Checked = False + CB_Merge.SelectedIndex = 0 End If End Sub @@ -1290,8 +1300,6 @@ Public Class Einstellungen - - #End Region