From 311f5f24b4580faab49eecb8e4d99c752a626c4d Mon Sep 17 00:00:00 2001 From: hama3254 Date: Sat, 17 Jun 2023 17:23:31 +0200 Subject: [PATCH] add "ScaledBorderAndShadow:yes" option #764 add "ScaledBorderAndShadow:yes" option #764 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 198656 -> 205824 bytes Crunchyroll Downloader/App.config | 3 + Crunchyroll Downloader/CRD_List_Item.vb | 5 + Crunchyroll Downloader/Main.vb | 9 + .../My Project/Settings.Designer.vb | 12 ++ .../My Project/Settings.settings | 3 + Crunchyroll Downloader/Subfolder.vb | 15 ++ .../einstellungen.Designer.vb | 163 +++++++++++------- Crunchyroll Downloader/einstellungen.vb | 30 +++- 9 files changed, 175 insertions(+), 65 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 87237648a69326186427ecaefdc906ff0efd3a0a..5e5f5cbdf8738fffe2f5071d5d666d95e0baaa8b 100644 GIT binary patch delta 11971 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 "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.34" + + False + diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index b829459..cccdd10 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -1170,6 +1170,11 @@ Public Class CRD_List_Item End Try End If Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False) + + If My.Settings.SubtitleMod1 = True Then + InputData = AddScaledBorderAndShadow(InputData) + End If + Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) sink.WriteLine(InputData) End Using diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 4b151a6..7b2fee6 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1856,6 +1856,11 @@ Public Class Main Dim SubText As String = "" SubText = Curl(SoftSubsList(i2).Url.Replace(" -i ", "").Replace(Chr(34), "")) + + If My.Settings.SubtitleMod1 = True Then + SubText = AddScaledBorderAndShadow(SubText) + End If + Dim Pfad3 As String = Pfad2.Replace(Chr(34), "") Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + "." + GetSubFileLangName(SoftSubsList(i2).SubLangValue) + Path.GetExtension(Pfad3)), SubFormat) If i = 0 And IncludeLangName = False Then @@ -2224,6 +2229,10 @@ Public Class Main End Sub Private Sub Btn_Browser_Click(sender As Object, e As EventArgs) Handles Btn_Browser.Click + + 'Dim Teststring As String = TheTextBox.Text + 'TheTextBox.Text = AddScaledBorderAndShadow(Teststring) + 'Exit Sub 'Debug.WriteLine(Date.Now.ToString + "." + Date.Now.Millisecond.ToString) UserBowser = True diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index c4947e8..ca033a6 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -630,6 +630,18 @@ Namespace My Me("User_Agend") = value End Set End Property + + _ + Public Property SubtitleMod1() As Boolean + Get + Return CType(Me("SubtitleMod1"),Boolean) + End Get + Set + Me("SubtitleMod1") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index 8ffd73c..4522381 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -146,5 +146,8 @@ "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.34" + + False + \ No newline at end of file diff --git a/Crunchyroll Downloader/Subfolder.vb b/Crunchyroll Downloader/Subfolder.vb index 36f7db3..b88ea7e 100644 --- a/Crunchyroll Downloader/Subfolder.vb +++ b/Crunchyroll Downloader/Subfolder.vb @@ -1,6 +1,7 @@ Imports System.ComponentModel Imports System.IO Imports System.Runtime.Remoting +Imports System.Runtime.Remoting.Messaging Imports System.Text Imports System.Windows.Forms.VisualStyles @@ -50,6 +51,20 @@ Module Subfolder End Function + Public Function AddScaledBorderAndShadow(ByVal Subtitle As String) As String + Dim Output As String = Subtitle + + If CBool(InStr(Output, "[V4+ Styles]")) And CBool(InStr(Output, "ScaledBorderAndShadow")) = False Then + + Dim Styles() As String = Output.Split(New String() {"[V4+ Styles]"}, System.StringSplitOptions.RemoveEmptyEntries) + Output = Styles(0) + "ScaledBorderAndShadow: yes" + vbNewLine + vbNewLine + "[V4+ Styles]" + Styles(1) + + End If + + + Return Output + End Function + Public Sub WriteText(ByVal Pfad As String, ByVal Content As String) diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 094b287..fd7745a 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -32,6 +32,7 @@ Partial Class Einstellungen Me.CR_SoftSubs = New MetroFramework.Controls.MetroComboBox() Me.GB_SubLanguage = New System.Windows.Forms.GroupBox() Me.CB_CR_Harsubs = New MetroFramework.Controls.MetroComboBox() + Me.DubMode = New MetroFramework.Controls.MetroCheckBox() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox18 = New System.Windows.Forms.GroupBox() Me.ListViewAdd_True = New MetroFramework.Controls.MetroCheckBox() @@ -120,11 +121,13 @@ Partial Class Einstellungen Me.CB_Anime = New MetroFramework.Controls.MetroCheckBox() Me.TB_NameString = New MetroFramework.Controls.MetroTextBox() Me.MetroTabPage1 = New MetroFramework.Controls.MetroTabPage() + Me.GroupBox22 = New System.Windows.Forms.GroupBox() + Me.CB_Cap = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox20 = New System.Windows.Forms.GroupBox() Me.ChB_Chapters = New MetroFramework.Controls.MetroCheckBox() Me.GroupBox19 = New System.Windows.Forms.GroupBox() + Me.CB_OverrideDub = New MetroFramework.Controls.MetroCheckBox() Me.CB_CR_Audio = New MetroFramework.Controls.MetroComboBox() - Me.DubMode = New MetroFramework.Controls.MetroCheckBox() Me.TabPage6 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox15 = New System.Windows.Forms.GroupBox() Me.Bitrate_Funi = New MetroFramework.Controls.MetroComboBox() @@ -154,9 +157,8 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.CB_OverrideDub = New MetroFramework.Controls.MetroCheckBox() - Me.GroupBox22 = New System.Windows.Forms.GroupBox() - Me.CB_Cap = New MetroFramework.Controls.MetroCheckBox() + Me.GroupBox23 = New System.Windows.Forms.GroupBox() + Me.CB_Mod1 = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -184,6 +186,7 @@ Partial Class Einstellungen Me.GB_Filename_Pre.SuspendLayout() Me.GroupBox12.SuspendLayout() Me.MetroTabPage1.SuspendLayout() + Me.GroupBox22.SuspendLayout() Me.GroupBox20.SuspendLayout() Me.GroupBox19.SuspendLayout() Me.TabPage6.SuspendLayout() @@ -196,7 +199,7 @@ Partial Class Einstellungen Me.GroupBox8.SuspendLayout() Me.TabPage7.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox22.SuspendLayout() + Me.GroupBox23.SuspendLayout() Me.SuspendLayout() ' 'ToolTip1 @@ -300,9 +303,23 @@ Partial Class Einstellungen Me.CB_CR_Harsubs.TabIndex = 20 Me.CB_CR_Harsubs.UseSelectable = True ' + 'DubMode + ' + Me.DubMode.BackColor = System.Drawing.Color.Transparent + Me.DubMode.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween + Me.DubMode.Location = New System.Drawing.Point(70, 20) + Me.DubMode.Name = "DubMode" + Me.DubMode.Size = New System.Drawing.Size(348, 29) + Me.DubMode.TabIndex = 5 + Me.DubMode.Text = "skip hardsubs if unavailable on dubbed shows" + Me.DubMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.DubMode.UseCustomBackColor = True + Me.DubMode.UseSelectable = True + ' 'TabPage2 ' Me.TabPage2.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) + Me.TabPage2.Controls.Add(Me.GroupBox23) Me.TabPage2.Controls.Add(Me.GroupBox18) Me.TabPage2.Controls.Add(Me.GroupBox16) Me.TabPage2.Controls.Add(Me.GroupBox4) @@ -339,7 +356,7 @@ Partial Class Einstellungen ' Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 21) + Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 25) Me.ListViewAdd_True.Name = "ListViewAdd_True" Me.ListViewAdd_True.Size = New System.Drawing.Size(255, 19) Me.ListViewAdd_True.TabIndex = 5 @@ -467,7 +484,7 @@ Partial Class Einstellungen Me.GroupBox2.Controls.Add(Me.Panel1) Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox2.ForeColor = System.Drawing.Color.Black - Me.GroupBox2.Location = New System.Drawing.Point(5, 350) + Me.GroupBox2.Location = New System.Drawing.Point(5, 410) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(490, 63) Me.GroupBox2.TabIndex = 50 @@ -800,10 +817,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 44) + Me.TabPage1.Location = New System.Drawing.Point(4, 35) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 519) + Me.TabPage1.Size = New System.Drawing.Size(501, 528) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main" Me.TabPage1.VerticalScrollbar = True @@ -1037,7 +1054,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 3 + Me.TabControl1.SelectedIndex = 1 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1051,9 +1068,9 @@ Partial Class Einstellungen Me.MetroTabPage2.HorizontalScrollbarBarColor = True Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage2.HorizontalScrollbarSize = 10 - Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35) Me.MetroTabPage2.Name = "MetroTabPage2" - Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528) Me.MetroTabPage2.TabIndex = 8 Me.MetroTabPage2.Text = "Naming" Me.MetroTabPage2.VerticalScrollbarBarColor = True @@ -1366,6 +1383,30 @@ Partial Class Einstellungen Me.MetroTabPage1.VerticalScrollbarHighlightOnWheel = False Me.MetroTabPage1.VerticalScrollbarSize = 10 ' + 'GroupBox22 + ' + Me.GroupBox22.BackColor = System.Drawing.Color.Transparent + Me.GroupBox22.Controls.Add(Me.CB_Cap) + Me.GroupBox22.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox22.ForeColor = System.Drawing.Color.Black + Me.GroupBox22.Location = New System.Drawing.Point(3, 280) + Me.GroupBox22.Name = "GroupBox22" + Me.GroupBox22.Size = New System.Drawing.Size(490, 65) + Me.GroupBox22.TabIndex = 35 + Me.GroupBox22.TabStop = False + Me.GroupBox22.Text = "CC" + ' + 'CB_Cap + ' + Me.CB_Cap.AutoSize = True + Me.CB_Cap.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Cap.Location = New System.Drawing.Point(158, 23) + Me.CB_Cap.Name = "CB_Cap" + Me.CB_Cap.Size = New System.Drawing.Size(168, 19) + Me.CB_Cap.TabIndex = 5 + Me.CB_Cap.Text = "use captions if available" + Me.CB_Cap.UseSelectable = True + ' 'GroupBox20 ' Me.GroupBox20.BackColor = System.Drawing.Color.Transparent @@ -1404,6 +1445,19 @@ Partial Class Einstellungen Me.GroupBox19.TabStop = False Me.GroupBox19.Text = "Dubbed" ' + 'CB_OverrideDub + ' + Me.CB_OverrideDub.BackColor = System.Drawing.Color.Transparent + Me.CB_OverrideDub.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween + Me.CB_OverrideDub.Location = New System.Drawing.Point(70, 56) + Me.CB_OverrideDub.Name = "CB_OverrideDub" + Me.CB_OverrideDub.Size = New System.Drawing.Size(348, 29) + Me.CB_OverrideDub.TabIndex = 22 + Me.CB_OverrideDub.Text = "override Dub language" + Me.CB_OverrideDub.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.CB_OverrideDub.UseCustomBackColor = True + Me.CB_OverrideDub.UseSelectable = True + ' 'CB_CR_Audio ' Me.CB_CR_Audio.DropDownHeight = 275 @@ -1417,19 +1471,6 @@ Partial Class Einstellungen Me.CB_CR_Audio.TabIndex = 21 Me.CB_CR_Audio.UseSelectable = True ' - 'DubMode - ' - Me.DubMode.BackColor = System.Drawing.Color.Transparent - Me.DubMode.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween - Me.DubMode.Location = New System.Drawing.Point(70, 20) - Me.DubMode.Name = "DubMode" - Me.DubMode.Size = New System.Drawing.Size(348, 29) - Me.DubMode.TabIndex = 5 - Me.DubMode.Text = "skip hardsubs if unavailable on dubbed shows" - Me.DubMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.DubMode.UseCustomBackColor = True - Me.DubMode.UseSelectable = True - ' 'TabPage6 ' Me.TabPage6.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) @@ -1440,10 +1481,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 44) + Me.TabPage6.Location = New System.Drawing.Point(4, 35) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(501, 519) + Me.TabPage6.Size = New System.Drawing.Size(501, 528) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = " Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1677,9 +1718,9 @@ Partial Class Einstellungen Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label5) - Me.TabPage7.Location = New System.Drawing.Point(4, 44) + Me.TabPage7.Location = New System.Drawing.Point(4, 35) Me.TabPage7.Name = "TabPage7" - Me.TabPage7.Size = New System.Drawing.Size(501, 519) + Me.TabPage7.Size = New System.Drawing.Size(501, 528) Me.TabPage7.TabIndex = 5 Me.TabPage7.Text = " About " ' @@ -1811,42 +1852,32 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_OverrideDub + 'GroupBox23 ' - Me.CB_OverrideDub.BackColor = System.Drawing.Color.Transparent - Me.CB_OverrideDub.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween - Me.CB_OverrideDub.Location = New System.Drawing.Point(70, 56) - Me.CB_OverrideDub.Name = "CB_OverrideDub" - Me.CB_OverrideDub.Size = New System.Drawing.Size(348, 29) - Me.CB_OverrideDub.TabIndex = 22 - Me.CB_OverrideDub.Text = "override Dub language" - Me.CB_OverrideDub.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.CB_OverrideDub.UseCustomBackColor = True - Me.CB_OverrideDub.UseSelectable = True + Me.GroupBox23.BackColor = System.Drawing.Color.Transparent + Me.GroupBox23.Controls.Add(Me.CB_Mod1) + Me.GroupBox23.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox23.ForeColor = System.Drawing.Color.Black + Me.GroupBox23.Location = New System.Drawing.Point(5, 350) + Me.GroupBox23.Name = "GroupBox23" + Me.GroupBox23.Size = New System.Drawing.Size(490, 60) + Me.GroupBox23.TabIndex = 51 + Me.GroupBox23.TabStop = False + Me.GroupBox23.Text = "Subtitle Mods" ' - 'GroupBox22 + 'CB_Mod1 ' - Me.GroupBox22.BackColor = System.Drawing.Color.Transparent - Me.GroupBox22.Controls.Add(Me.CB_Cap) - Me.GroupBox22.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox22.ForeColor = System.Drawing.Color.Black - Me.GroupBox22.Location = New System.Drawing.Point(3, 280) - Me.GroupBox22.Name = "GroupBox22" - Me.GroupBox22.Size = New System.Drawing.Size(490, 65) - Me.GroupBox22.TabIndex = 35 - Me.GroupBox22.TabStop = False - Me.GroupBox22.Text = "CC" - ' - 'CB_Cap - ' - Me.CB_Cap.AutoSize = True - Me.CB_Cap.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_Cap.Location = New System.Drawing.Point(158, 23) - Me.CB_Cap.Name = "CB_Cap" - Me.CB_Cap.Size = New System.Drawing.Size(168, 19) - Me.CB_Cap.TabIndex = 5 - Me.CB_Cap.Text = "use captions if available" - Me.CB_Cap.UseSelectable = True + Me.CB_Mod1.AutoSize = True + Me.CB_Mod1.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_Mod1.ForeColor = System.Drawing.Color.Black + Me.CB_Mod1.Location = New System.Drawing.Point(87, 25) + Me.CB_Mod1.Name = "CB_Mod1" + Me.CB_Mod1.Size = New System.Drawing.Size(305, 19) + Me.CB_Mod1.TabIndex = 5 + Me.CB_Mod1.Text = "add 'ScaledBorderAndShadow:yes' to subtitles" + Me.ToolTip1.SetToolTip(Me.CB_Mod1, "adds the 'ScaledBorderAndShadow:yes' to the subtitles see more on https://github." & + "com/hama3254/Crunchyroll-Downloader-v3.0/issues/764") + Me.CB_Mod1.UseSelectable = True ' 'Einstellungen ' @@ -1900,6 +1931,8 @@ Partial Class Einstellungen Me.GroupBox12.ResumeLayout(False) Me.GroupBox12.PerformLayout() Me.MetroTabPage1.ResumeLayout(False) + Me.GroupBox22.ResumeLayout(False) + Me.GroupBox22.PerformLayout() Me.GroupBox20.ResumeLayout(False) Me.GroupBox20.PerformLayout() Me.GroupBox19.ResumeLayout(False) @@ -1915,8 +1948,8 @@ Partial Class Einstellungen Me.GroupBox8.PerformLayout() Me.TabPage7.ResumeLayout(False) CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox22.ResumeLayout(False) - Me.GroupBox22.PerformLayout() + Me.GroupBox23.ResumeLayout(False) + Me.GroupBox23.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -2056,4 +2089,6 @@ Partial Class Einstellungen Friend WithEvents CB_OverrideDub As MetroFramework.Controls.MetroCheckBox Friend WithEvents GroupBox22 As GroupBox Friend WithEvents CB_Cap As MetroFramework.Controls.MetroCheckBox + Friend WithEvents GroupBox23 As GroupBox + Friend WithEvents CB_Mod1 As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index ae3ac0c..df72ada 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -17,7 +17,7 @@ Public Class Einstellungen Dim LastVersionString As String = "v3.8-Beta" Public CR_SoftSubsTemp As New List(Of String) - + Dim TempCheckSubMod1 As Boolean = False Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -388,6 +388,7 @@ Public Class Einstellungen Main.IgnoreSeason = CB_Ignore.SelectedIndex My.Settings.IgnoreSeason = CB_Ignore.SelectedIndex + My.Settings.SubtitleMod1 = CB_Mod1.Checked If DubMode.Checked = True Then Main.DubMode = True @@ -1110,6 +1111,14 @@ Public Class Einstellungen TempTB.Enabled = False End If + If (CB_Merge.Text = "[merge disabled]") = False And DD_DLMode.Text = "Default - ffmpeg" Then + CB_Mod1.Enabled = False + CB_Mod1.Checked = False + Else + CB_Mod1.Enabled = True + CB_Mod1.Checked = TempCheckSubMod1 + End If + End Sub Private Sub TempTB_Click(sender As Object, e As EventArgs) Handles TempTB.Click @@ -1193,6 +1202,25 @@ Public Class Einstellungen Popup.Show() End Sub + Private Sub CB_Merge_SelectedIndexChanged(sender As Object, e As EventArgs) Handles CB_Merge.SelectedIndexChanged + + If (CB_Merge.Text = "[merge disabled]") = False And DD_DLMode.Text = "Default - ffmpeg" Then + CB_Mod1.Enabled = False + CB_Mod1.Checked = False + Else + CB_Mod1.Enabled = True + CB_Mod1.Checked = TempCheckSubMod1 + End If + + End Sub + + Private Sub CB_Mod1_CheckedChanged(sender As Object, e As EventArgs) Handles CB_Mod1.CheckedChanged + If CB_Mod1.Enabled = True Then + TempCheckSubMod1 = CB_Mod1.Checked + End If + + End Sub + 'Private Sub CB_CR_Audio_Click(sender As Object, e As EventArgs) Handles CB_CR_Audio.Click