diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo
index 8f1b62c..51f71d2 100644
Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ
diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide
index 10389dc..9977424 100644
Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm
index b312833..407fd10 100644
Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal
index f69ee3d..f2712b5 100644
Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb
index ba52253..da3b88f 100644
--- a/Crunchyroll Downloader/Anime_Add.vb
+++ b/Crunchyroll Downloader/Anime_Add.vb
@@ -420,6 +420,8 @@ Public Class Anime_Add
End Sub
+
+
#End Region
End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
index 8cac8e4..2a281ba 100644
--- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
+++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
@@ -148,12 +148,6 @@
True
Resources.resx
-
- SoftSub.vb
-
-
- Form
-
Startup.vb
@@ -193,9 +187,6 @@
GeckoFX.vb
-
- SoftSub.vb
-
Startup.vb
@@ -248,6 +239,9 @@
+
+
+
diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb
index 560b081..b5bce32 100644
--- a/Crunchyroll Downloader/GeckoFX.vb
+++ b/Crunchyroll Downloader/GeckoFX.vb
@@ -8,7 +8,7 @@ Imports System.Net
Imports System.Net.WebUtility
Public Class GeckoFX
Public keks As String = Nothing
- Public c As Boolean = True
+ 'Public c As Boolean = True
Dim t As Thread
Dim ScanTrue As Boolean = False
Private Sub GeckoWebBrowser1_DocumentCompleted(sender As Object, e As EventArgs) Handles WebBrowser1.DocumentCompleted
@@ -76,10 +76,20 @@ Public Class GeckoFX
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
Main.b = True
- t = New Thread(AddressOf Main.GrappURL)
- t.Priority = ThreadPriority.Normal
- t.IsBackground = True
- t.Start()
+ If Main.d = False Then
+ Main.d = True
+ t = New Thread(AddressOf Main.DownloadSubsOnly)
+ t.Priority = ThreadPriority.Normal
+ t.IsBackground = True
+ t.Start()
+ Else
+ t = New Thread(AddressOf Main.GrappURL)
+ t.Priority = ThreadPriority.Normal
+ t.IsBackground = True
+ t.Start()
+ End If
+
+
ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "season-dropdown content-menu block")) Then
Main.b = True
@@ -87,29 +97,45 @@ Public Class GeckoFX
Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
- Main.SeasonDropdownGrapp()
+ If Main.d = False Then
+ Main.d = True
+ Main.SeasonDropdownGrappSubs()
+ einstellungen.StatusLabel.Text = "Status: Multi Download detected!"
+ Else
+ Main.SeasonDropdownGrapp()
+ End If
ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "wrapper container-shadow hover-classes")) Then
Main.b = True
Anime_Add.textBox2.Text = "Name of the Anime"
Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
- Main.MassGrapp()
+ If Main.d = False Then
+ Main.d = True
+ Main.MassGrappSubs()
+ einstellungen.StatusLabel.Text = "Status: Multi Download detected!"
+
+ Else
+ Main.MassGrapp()
+ End If
Else
MsgBox(Main.No_Stream, MsgBoxStyle.OkOnly)
End If
Catch ex As Exception
+ MsgBox(ex.ToString)
Main.LabelUpdate = "Status: idle"
End Try
- ElseIf c = False Then
+ ElseIf main.c = False Then
If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "hardsub_lang")) Then
- c = True
+ Main.c = True
Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
- SoftSub.DownloadSubs()
+ 'SoftSub.DownloadSubs()
Me.Close()
End If
+
+
End If
If Main.UserBowser = False Then
Main.WebbrowserURL = WebBrowser1.Url.ToString
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index 0fdbb67..c5faa8e 100644
--- a/Crunchyroll Downloader/Main.vb
+++ b/Crunchyroll Downloader/Main.vb
@@ -6,9 +6,11 @@ Imports System.ComponentModel
Public Class Main
Public LoggingBrowser As Boolean = False
Public Thumbnail As String = Nothing
+ Public MergeSubstoMP4 As Boolean = False
Dim ListOfStreams As New List(Of String)
Public NonCR_Timeout As Integer = 5
Public NonCR_URL As String = Nothing
+ Public DlSoftSubsRDY As Boolean = True
Public gIndexH As Integer = -1
Public DialogTaskString As String
Public UserCloseDialog As Boolean = False
@@ -17,10 +19,12 @@ Public Class Main
Public LabelUpdate As String = "Status: idle"
Public LabelEpisode As String = "..."
Public b As Boolean = True
+ Public c As Boolean = True
+ Public d As Boolean = True
Public LoginOnly As String = "False"
Public CreditsOnly As Boolean = False
Public Pfad As String = My.Computer.FileSystem.CurrentDirectory
- Dim ffmpeg_command As String
+ Dim ffmpeg_command As String = " -c copy -bsf:a aac_adtstoasc"
Public Resu As Integer
Dim Resu2 As String
Public ResuSave As String = "6666x6666"
@@ -175,12 +179,12 @@ Public Class Main
- Try
- Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
- ffmpeg_command = rkg.GetValue("ffmpeg_command").ToString
- Catch ex As Exception
- ffmpeg_command = "-c copy -bsf:a aac_adtstoasc -movflags +faststart"
- End Try
+ 'Try
+ ' Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
+ ' ffmpeg_command = rkg.GetValue("ffmpeg_command").ToString
+ 'Catch ex As Exception
+ ' ffmpeg_command = " -c copy -bsf:a aac_adtstoasc"
+ 'End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
Resu = Integer.Parse(rkg.GetValue("Resu").ToString)
@@ -209,6 +213,12 @@ Public Class Main
Catch ex As Exception
MaxDL = 1
End Try
+ Try
+ Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
+ MergeSubstoMP4 = CBool(Integer.Parse(rkg.GetValue("MergeMP4").ToString))
+ Catch ex As Exception
+
+ End Try
#Region "removed softsubtitle"
Try
@@ -237,7 +247,7 @@ Public Class Main
End Sub
- Public Sub ListAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String, ByVal VideoURL As String)
+ Public Sub ListAdd(ByVal NameKomplett As String, ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal ThumbnialURL As String)
'MsgBox(NameKomplett)
Dim ReDl As Boolean = False
Dim index As Integer = 0
@@ -500,17 +510,6 @@ Public Class Main
Aktuell = d.ToString
' AnzahlFertig.Text = d.ToString
Anime_Add.Add_Display.Text = Aktuell + " / " + Gesamt
- If CBool(InStr(WebbrowserText, Chr(34) + "premium_status" + Chr(34) + ":" + Chr(34) + "premium" + Chr(34))) Then
- ElseIf CBool(InStr(WebbrowserText, Chr(34) + "premium_status" + Chr(34) + ":" + Chr(34) + "free_trial" + Chr(34))) Then
- 'Else
- ' 'MsgBox(CR_Premium_Failed, MsgBoxStyle.Information)
- ' Anime_Add.groupBox1.Visible = True
- ' Anime_Add.groupBox2.Visible = False
- ' Anime_Add.GroupBox3.Visible = False
- ' Anime_Add.Mass_DL_Cancel = False
- ' Anime_Add.pictureBox4.Image = My.Resources.main_button_download_default
- ' Exit Sub
- End If
Next
@@ -538,6 +537,314 @@ Public Class Main
Anime_Add.pictureBox4.Image = My.Resources.main_button_download_default
End Sub
#End Region
+
+#Region "SubsOnly"
+
+ Public Sub MassGrappSubs()
+ einstellungen.MultiDLSoftSubs.Enabled = True
+ einstellungen.PictureBox3.Image = My.Resources.softsubs_download
+ einstellungen.ComboBox1.Items.Clear()
+ einstellungen.comboBox3.Items.Clear()
+ einstellungen.comboBox4.Items.Clear()
+ einstellungen.ComboBox2.Enabled = False
+ Dim Anzahl As String() = WebbrowserText.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim Titel As String() = Anzahl(0).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim Titel2 As String() = Titel(0).Split(New String() {">"}, System.StringSplitOptions.RemoveEmptyEntries)
+ 'MsgBox(Titel2(0))
+ einstellungen.ComboBox2.Items.Add(Titel2(1))
+ Next
+
+ End Sub
+
+ Public Sub DownloadSubsOnly()
+ 'Try
+ 'Throw New System.Exception("Test")
+ DlSoftSubsRDY = False
+ Dim CR_Anime_Titel As String = Nothing
+ Dim CR_Anime_Staffel As String = Nothing
+ Dim CR_Anime_Folge As String = Nothing
+#Region "Name + Pfad"
+ Dim Pfad2 As String
+ Dim CR_FilenName As String = Nothing
+ Dim SubfolderValue As String = Nothing
+ Dim CR_FilenName_Backup As String = Nothing
+
+
+#Region "Name von Crunchyroll"
+
+ Dim Bug_Deutsch As String = "-"
+ If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then
+ Bug_Deutsch = ":"
+ End If
+ Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries)
+ CR_FilenName = CR_Name_by_Titel_2(0).Trim()
+
+ If CBool(InStr(WebbrowserText, "
")) Then ' false on movie true on series
+ Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"
"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
+ Dim CR_Name_Staffel0_Folge1 As String()
+ If CBool(InStr(CR_Name_2(0), ",")) Then
+ CR_Name_Staffel0_Folge1 = CR_Name_2(0).Split(New [Char]() {System.Convert.ToChar(",")}, System.StringSplitOptions.RemoveEmptyEntries)
+ CR_Anime_Staffel = CR_Name_Staffel0_Folge1(0).Trim()
+ CR_Anime_Folge = CR_Name_Staffel0_Folge1(1).Trim()
+ CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
+ Else
+ CR_Anime_Staffel = Nothing
+ CR_Anime_Folge = CR_Name_2(0).Trim()
+ CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
+ End If
+
+
+ Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
+ Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
+ CR_Name_Anime0(0) = System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ")
+ CR_Anime_Titel = CR_Name_Anime0(0).Trim
+ If CR_Anime_Staffel = Nothing Then
+ CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge
+ Else
+ CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge
+ End If
+
+ CR_FilenName_Backup = RemoveExtraSpaces(CR_FilenName)
+
+
+ End If
+#End Region
+ CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
+ CR_FilenName = RemoveExtraSpaces(CR_FilenName)
+
+ If SubfolderValue = Nothing Then
+ Pfad2 = Pfad + "\" + CR_FilenName + ".mp4"
+ Else
+ Pfad2 = Pfad + "\" + SubfolderValue + CR_FilenName + ".mp4"
+ End If
+ If Not Directory.Exists(Path.GetDirectoryName(Pfad2)) Then
+ ' Nein! Jetzt erstellen...
+ Try
+ Directory.CreateDirectory(Path.GetDirectoryName(Pfad2))
+ Catch ex As Exception
+ ' Ordner wurde nich erstellt
+ Pfad2 = Pfad + "\" + CR_FilenName_Backup + ".mp4"
+ End Try
+ End If
+ Pfad2 = Chr(34) + Pfad2 + Chr(34)
+
+#End Region
+#Region "Subs"
+ Dim SoftSubs2 As New List(Of String)
+ If SoftSubs.Count > 0 Then
+ For i As Integer = 0 To SoftSubs.Count - 1
+ If CBool(InStr(WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs(i) + Chr(34) + ",")) Then
+ SoftSubs2.Add(SoftSubs(i))
+ Else
+ 'MsgBox("Softsubtitle for " + SoftSubs(i) + " is not avalible.", MsgBoxStyle.Information)
+ End If
+ Next
+
+ End If
+ If SubSprache = "None" Then
+ If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then
+ SubSprache2 = "null"
+ Else
+ Me.Invoke(New Action(Function()
+ ResoNotFoundString = WebbrowserText
+ DialogTaskString = "Language"
+ Reso.ShowDialog()
+ Return Nothing
+ End Function))
+ If UserCloseDialog = True Then
+ Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
+ Else
+ If ResoBackString = Nothing Then
+ Else
+ SubSprache2 = ResoBackString
+ End If
+ End If
+ 'Throw New System.Exception("Could not find the sub language")
+ End If
+
+
+ Else
+ If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then
+ SubSprache2 = Chr(34) + SubSprache + Chr(34)
+
+ ElseIf CBool(InStr(WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SubSprache + Chr(34) + ",")) Then
+ If MessageBox.Show("It look like only Softsubtitle are avalibe." + vbNewLine + "Are you want to use Softsubtitle this time instead?", "No Hardsubtitle", MessageBoxButtons.YesNo) = DialogResult.Yes Then
+ SubSprache2 = "null"
+ SoftSubs2.Add(SubSprache)
+ Else
+ Throw New System.Exception("Could not find the sub language")
+ End If
+
+
+ Else
+ Me.Invoke(New Action(Function()
+ ResoNotFoundString = WebbrowserText
+ DialogTaskString = "Language"
+ Reso.ShowDialog()
+ Return Nothing
+ End Function))
+ If UserCloseDialog = True Then
+ Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
+ Else
+ If ResoBackString = Nothing Then
+ Else
+ SubSprache2 = ResoBackString
+ End If
+ End If
+ End If
+ End If
+
+
+#End Region
+ If Grapp_Abord = True Then
+ Grapp_RDY = True
+ Grapp_Abord = False
+ 'MsgBox("grapp_abourd")
+ Exit Sub
+
+ End If
+
+
+#Region "Download softsub file"
+
+ If SoftSubs2.Count > 0 Then
+ For i As Integer = 0 To SoftSubs2.Count - 1
+ LabelUpdate = "Status: downloading subtitle file"
+ LabelEpisode = SoftSubs2(i)
+ Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
+ Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/")
+ Dim client0 As New WebClient
+ client0.Encoding = Encoding.UTF8
+ Dim str0 As String = client0.DownloadString(SoftSub_3)
+ Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
+ Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + " " + SoftSubs2(i) + Path.GetExtension(Pfad3)), "ass")
+ 'MsgBox(FN)
+ If i = 0 Then
+ FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
+ 'MsgBox(FN)
+ End If
+ Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
+ 'MsgBox(Pfad4)
+ File.WriteAllText(Pfad4, str0, Encoding.UTF8)
+ Pause(1)
+ Next
+
+
+ End If
+#End Region
+
+ DlSoftSubsRDY = True
+
+ 'Catch ex As Exception
+ 'End Try
+ End Sub
+
+ Public Async Sub MassSubsDL()
+ If einstellungen.comboBox3.Text = Nothing Then
+ Exit Sub
+ ElseIf einstellungen.comboBox4.Text = Nothing Then
+ Exit Sub
+ End If
+ einstellungen.SoftSubsMass.Text = "preparing ..."
+ Dim Website As String = WebbrowserText
+
+ If einstellungen.ComboBox2.Enabled = True Then
+ Dim SeasonDropdownAnzahl As String() = Website.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Array.Reverse(SeasonDropdownAnzahl)
+ Dim SDV As Integer = 0
+ For i As Integer = 0 To SeasonDropdownAnzahl.Count - 1
+ If InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + einstellungen.ComboBox2.SelectedItem.ToString + "") Then
+ SDV = i
+ End If
+ Next
+ Website = SeasonDropdownAnzahl(SDV)
+ End If
+ Try
+ Dim Anzahl As String() = Website.Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Array.Reverse(Anzahl)
+ Dim c As Integer = einstellungen.comboBox4.SelectedIndex - einstellungen.comboBox3.SelectedIndex + 1
+ 'AnzahlGesamt.Text = c.ToString
+ Gesamt = c.ToString
+ Aktuell = "0"
+ If einstellungen.comboBox4.SelectedIndex > einstellungen.comboBox3.SelectedIndex Then
+
+ For i As Integer = einstellungen.comboBox3.SelectedIndex To einstellungen.comboBox4.SelectedIndex
+
+ For e As Integer = 0 To Integer.MaxValue
+
+ If DlSoftSubsRDY = True Then
+ Exit For
+ Else
+ Await Task.Delay(2000)
+ End If
+ Next
+
+ Dim dd As Integer = i - einstellungen.comboBox3.SelectedIndex + 1
+ Dim URLGrapp As String() = Anzahl(i).Split(New String() {" 0 Then
- For i As Integer = 0 To SoftSubs2.Count - 1
- 'EpisodeLabel.Text = SoftSubs2(i)
- 'StatusLabel.Text = "Status: downloading subtitle file"
- LabelUpdate = "Status: downloading subtitle file"
- LabelEpisode = SoftSubs2(i)
- Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
- Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
- Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/")
- Dim client0 As New WebClient
- client0.Encoding = Encoding.UTF8
- Dim str0 As String = client0.DownloadString(SoftSub_3)
- Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
- Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + " " + SoftSubs2(i) + Path.GetExtension(Pfad3)), "ass")
- 'MsgBox(FN)
- If i = 0 Then
- FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
+ If MergeSubstoMP4 = True Then
+ For i As Integer = 0 To SoftSubs2.Count - 1
+ Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
+ Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/")
+ If SoftSubMergeURLs = Nothing Then
+ SoftSubMergeURLs = " -i " + Chr(34) + SoftSub_3 + Chr(34)
+ Else
+ SoftSubMergeURLs = SoftSubMergeURLs + " -i " + Chr(34) + SoftSub_3 + Chr(34)
+ End If
+ SoftSubMergeMaps = SoftSubMergeMaps + " -map " + (i + 1).ToString
+ If SoftSubMergeMetatata = Nothing Then
+ SoftSubMergeMetatata = " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i))
+ Else
+ SoftSubMergeMetatata = SoftSubMergeMetatata + " -metadata:s:s:" + i.ToString + " language=" + CCtoMP4CC(SoftSubs2(i))
+ End If
+
+ Next
+
+ Else
+ For i As Integer = 0 To SoftSubs2.Count - 1
+ LabelUpdate = "Status: downloading subtitle file"
+ LabelEpisode = SoftSubs2(i)
+ Dim SoftSub As String() = WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
+ Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/")
+ Dim client0 As New WebClient
+ client0.Encoding = Encoding.UTF8
+ Dim str0 As String = client0.DownloadString(SoftSub_3)
+ Dim Pfad3 As String = Pfad2.Replace(Chr(34), "")
+ Dim FN As String = Path.ChangeExtension(Path.Combine(Path.GetFileNameWithoutExtension(Pfad3) + " " + SoftSubs2(i) + Path.GetExtension(Pfad3)), "ass")
'MsgBox(FN)
- End If
- Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
- 'MsgBox(Pfad4)
- File.WriteAllText(Pfad4, str0, Encoding.UTF8)
- Pause(1)
- Next
+ If i = 0 Then
+ FN = Path.ChangeExtension(Path.GetFileName(Pfad3), "ass")
+ 'MsgBox(FN)
+ End If
+ Dim Pfad4 As String = Path.Combine(Path.GetDirectoryName(Pfad3), FN)
+ 'MsgBox(Pfad4)
+ File.WriteAllText(Pfad4, str0, Encoding.UTF8)
+ Pause(1)
+ Next
+
+ End If
End If
#End Region
@@ -940,7 +1301,12 @@ Public Class Main
End If
#End Region
If Resu = 42 Then
- URL_DL = CR_URI_Master
+ If MergeSubstoMP4 = True Then
+ URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata
+ Else
+ URL_DL = CR_URI_Master
+ End If
+ MsgBox(URL_DL)
Else
@@ -977,7 +1343,12 @@ Public Class Main
Dim VLC_URI_1 As String() = str.Split(New String() {Resu2 + ","}, System.StringSplitOptions.RemoveEmptyEntries)
Dim VLC_URI_2 As String() = VLC_URI_1(1).Split(New [Char]() {Chr(34)})
Dim VLC_URI_3 As String() = VLC_URI_2(2).Split(New [Char]() {System.Convert.ToChar("#")})
- URL_DL = VLC_URI_3(0).Trim()
+ If MergeSubstoMP4 = True Then
+ URL_DL = "-i " + Chr(34) + VLC_URI_3(0).Trim() + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata
+ Else
+ URL_DL = VLC_URI_3(0).Trim()
+ End If
+ MsgBox(URL_DL)
End If
#Region "thumbnail"
Dim thumbnail As String() = WebbrowserText.Split(New String() {My.Resources.thumbnailString}, System.StringSplitOptions.RemoveEmptyEntries)
@@ -1008,10 +1379,11 @@ Public Class Main
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim L1Name As String = L1Name_Split(1).Replace("www.", "")
Me.Invoke(New Action(Function()
- ListAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL)
+ ListAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3)
Return Nothing
End Function))
#End Region
+
AsyncWorkerX.RunAsync(AddressOf DownloadFFMPEG, URL_DL, Pfad_DL, Pfad_DL)
Grapp_RDY = True
Me.Invoke(New Action(Function()
@@ -1100,6 +1472,10 @@ Public Class Main
Dim startinfo As New System.Diagnostics.ProcessStartInfo
'Dim cmd As String = "-i " + Chr(34) + URL_DL + Chr(34) + " -c copy -bsf:a aac_adtstoasc " + Pfad_DL 'start ffmpeg with command strFFCMD string
Dim cmd As String = "-i " + Chr(34) + URL_DL + Chr(34) + " " + ffmpeg_command + " " + DL_Pfad 'start ffmpeg with command strFFCMD string
+ If MergeSubstoMP4 = True Then
+ cmd = DL_URL + " " + DL_Pfad
+ End If
+
'MsgBox(cmd)
'all parameters required to run the process
startinfo.FileName = exepath
@@ -1131,43 +1507,44 @@ Public Class Main
Dim pr As Process = sender
Dim FileNameSplit As String() = pr.StartInfo.Arguments.ToString().Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim FileName As String = Chr(34) + FileNameSplit(FileNameSplit.Count - 1) + Chr(34)
- If CBool(InStr(e.Data, "Stream #")) And CBool(InStr(e.Data, "Video")) = True Then
- 'MsgBox(True.ToString + vbNewLine + e.Data)
- ListOfStreams.Add(e.Data)
- End If
- If InStr(e.Data, "Stream #") And InStr(e.Data, " -> ") Then
- 'UsesStreams.Add(e.Data)
- 'MsgBox(e.Data)
- Dim StreamSearch() As String = e.Data.Split(New String() {" -> "}, System.StringSplitOptions.RemoveEmptyEntries)
- Dim StreamSearch2 As String = StreamSearch(0) + ":"
- For i As Integer = 0 To ListOfStreams.Count - 1
- If CBool(InStr(ListOfStreams(i), StreamSearch2)) Then 'And CBool(InStr(ListOfStreams(i), " Video:")) Then
- 'MsgBox(ListOfStreams(i))
- Dim ResoSearch() As String = ListOfStreams(i).Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries)
- 'MsgBox(ResoSearch(1))
- If CBool(InStr(ResoSearch(2), " [")) = True Then
- Dim ResoSearch2() As String = ResoSearch(2).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries)
- For ii As Integer = 0 To PB_list.Count - 1
- If PB_list(ii).Name = FileName Then
- Dim p As PictureBox = PB_list(ii)
- p.Image = p.BackgroundImage
- Dim g As Graphics = Graphics.FromImage(p.Image)
- Dim TextPointL4 As Point = New Point(195, 101)
- Dim Weiß As Brush = New SolidBrush(Color.FromArgb(242, 242, 242))
- g.FillRectangle(Weiß, TextPointL4.X - 3, TextPointL4.Y - 3, 70, 30)
- g.DrawString(ResoSearch2(0) + "p", FontLabel.Font, Brushes.Black, TextPointL4)
- Dim brGradient As Brush = New SolidBrush(Color.FromArgb(125, 0, 0))
- g.Dispose()
- Exit For
- End If
- Next
+ If MergeSubstoMP4 = False Then
+ If CBool(InStr(e.Data, "Stream #")) And CBool(InStr(e.Data, "Video")) = True Then
+ 'MsgBox(True.ToString + vbNewLine + e.Data)
+ ListOfStreams.Add(e.Data)
+ End If
+ If InStr(e.Data, "Stream #") And InStr(e.Data, " -> ") Then
+ 'UsesStreams.Add(e.Data)
+ 'MsgBox(e.Data)
+ Dim StreamSearch() As String = e.Data.Split(New String() {" -> "}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim StreamSearch2 As String = StreamSearch(0) + ":"
+ For i As Integer = 0 To ListOfStreams.Count - 1
+ If CBool(InStr(ListOfStreams(i), StreamSearch2)) Then 'And CBool(InStr(ListOfStreams(i), " Video:")) Then
+ 'MsgBox(ListOfStreams(i))
+ Dim ResoSearch() As String = ListOfStreams(i).Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries)
+ 'MsgBox(ResoSearch(1))
+ If CBool(InStr(ResoSearch(2), " [")) = True Then
+ Dim ResoSearch2() As String = ResoSearch(2).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries)
+ For ii As Integer = 0 To PB_list.Count - 1
+ If PB_list(ii).Name = FileName Then
+ Dim p As PictureBox = PB_list(ii)
+ p.Image = p.BackgroundImage
+ Dim g As Graphics = Graphics.FromImage(p.Image)
+ Dim TextPointL4 As Point = New Point(195, 101)
+ Dim Weiß As Brush = New SolidBrush(Color.FromArgb(242, 242, 242))
+ g.FillRectangle(Weiß, TextPointL4.X - 3, TextPointL4.Y - 3, 70, 30)
+ g.DrawString(ResoSearch2(0) + "p", FontLabel.Font, Brushes.Black, TextPointL4)
+ Dim brGradient As Brush = New SolidBrush(Color.FromArgb(125, 0, 0))
+ g.Dispose()
+ Exit For
+ End If
+ Next
+ End If
+
End If
-
- End If
- Next
+ Next
+ End If
End If
-
If Me.Visible = False Or AbourtList.Contains(FileName) Then
' Try
pr.Kill()
@@ -1180,11 +1557,13 @@ Public Class Main
For i As Integer = 0 To PB_list.Count - 1
If PB_list(i).Name = FileName Then
+ If InStr(e.Data, "Duration: N/A, bitrate: N/A") Then
- If InStr(e.Data, "Duration: ") Then
+ ElseIf InStr(e.Data, "Duration: ") Then
Dim ZeitGesamt As String() = e.Data.Split(New String() {"Duration: "}, System.StringSplitOptions.RemoveEmptyEntries)
Dim ZeitGesamt2 As String() = ZeitGesamt(1).Split(New [Char]() {System.Convert.ToChar(".")})
Dim ZeitGesamtSplit() As String = ZeitGesamt2(0).Split(New [Char]() {System.Convert.ToChar(":")})
+ MsgBox(ZeitGesamt2(0))
Dim ZeitGesamtInteger As Integer = CInt(ZeitGesamtSplit(0)) * 3600 + CInt(ZeitGesamtSplit(1)) * 60 + CInt(ZeitGesamtSplit(2))
ListView1.Items.Item(i).Text = ZeitGesamtInteger
@@ -1554,7 +1933,7 @@ Public Class Main
Dim L1Name As String = L1Name_Split(1)
Pfad_DL = Chr(34) + Pfad + "\" + Video_FilenName + Chr(34)
Me.Invoke(New Action(Function()
- ListAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail4, URL_DL)
+ ListAdd(Pfad_DL, L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail4)
Return Nothing
End Function))
#End Region
diff --git a/Crunchyroll Downloader/My Project/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb
index 129a33d..a9a0a4c 100644
--- a/Crunchyroll Downloader/My Project/Resources.Designer.vb
+++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb
@@ -576,6 +576,36 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property softsubs_download() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("softsubs_download", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property softsubs_download_gray() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("softsubs_download_gray", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ '''
+ Friend ReadOnly Property softsubs_download_hover() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("softsubs_download_hover", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Zeichenfolge, die <!DOCTYPE html>
'''<html>
diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx
index e601b29..b73bf22 100644
--- a/Crunchyroll Downloader/My Project/Resources.resx
+++ b/Crunchyroll Downloader/My Project/Resources.resx
@@ -345,4 +345,13 @@
<img id="footer_country_flag" src="https://www.crunchyroll.com/i/country_flags/
+
+ ..\Resources\softsubs_download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\softsubs_download_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\softsubs_download_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Resources/crdSettings_Background.png b/Crunchyroll Downloader/Resources/crdSettings_Background.png
index a9ce2c4..7fb3518 100644
Binary files a/Crunchyroll Downloader/Resources/crdSettings_Background.png and b/Crunchyroll Downloader/Resources/crdSettings_Background.png differ
diff --git a/Crunchyroll Downloader/Resources/softsubs_download.png b/Crunchyroll Downloader/Resources/softsubs_download.png
new file mode 100644
index 0000000..e6f69f5
Binary files /dev/null and b/Crunchyroll Downloader/Resources/softsubs_download.png differ
diff --git a/Crunchyroll Downloader/Resources/softsubs_download_gray.png b/Crunchyroll Downloader/Resources/softsubs_download_gray.png
new file mode 100644
index 0000000..2647443
Binary files /dev/null and b/Crunchyroll Downloader/Resources/softsubs_download_gray.png differ
diff --git a/Crunchyroll Downloader/Resources/softsubs_download_hover.png b/Crunchyroll Downloader/Resources/softsubs_download_hover.png
new file mode 100644
index 0000000..37677df
Binary files /dev/null and b/Crunchyroll Downloader/Resources/softsubs_download_hover.png differ
diff --git a/Crunchyroll Downloader/SoftSub.Designer.vb b/Crunchyroll Downloader/SoftSub.Designer.vb
deleted file mode 100644
index 18a0347..0000000
--- a/Crunchyroll Downloader/SoftSub.Designer.vb
+++ /dev/null
@@ -1,287 +0,0 @@
-
-Partial Class SoftSub
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-
- Private Sub InitializeComponent()
- Me.pictureBox1 = New System.Windows.Forms.PictureBox()
- Me.pictureBox4 = New System.Windows.Forms.PictureBox()
- Me.textBox1 = New System.Windows.Forms.TextBox()
- Me.PictureBox2 = New System.Windows.Forms.PictureBox()
- Me.Label2 = New System.Windows.Forms.Label()
- Me.SoftSubs = New System.Windows.Forms.GroupBox()
- Me.CBesES = New System.Windows.Forms.CheckBox()
- Me.CBitIT = New System.Windows.Forms.CheckBox()
- Me.CBruRU = New System.Windows.Forms.CheckBox()
- Me.CBarME = New System.Windows.Forms.CheckBox()
- Me.CBfrFR = New System.Windows.Forms.CheckBox()
- Me.CBesLA = New System.Windows.Forms.CheckBox()
- Me.CBptBR = New System.Windows.Forms.CheckBox()
- Me.CBdeDE = New System.Windows.Forms.CheckBox()
- Me.CBenUS = New System.Windows.Forms.CheckBox()
- Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.SoftSubs.SuspendLayout()
- Me.GroupBox1.SuspendLayout()
- Me.SuspendLayout()
- '
- 'pictureBox1
- '
- Me.pictureBox1.BackColor = System.Drawing.Color.Transparent
- Me.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
- Me.pictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close
- Me.pictureBox1.Location = New System.Drawing.Point(479, 1)
- Me.pictureBox1.Name = "pictureBox1"
- Me.pictureBox1.Size = New System.Drawing.Size(50, 40)
- Me.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
- Me.pictureBox1.TabIndex = 8
- Me.pictureBox1.TabStop = False
- '
- 'pictureBox4
- '
- Me.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand
- Me.pictureBox4.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Button_SafeExit
- Me.pictureBox4.Location = New System.Drawing.Point(76, 207)
- Me.pictureBox4.Name = "pictureBox4"
- Me.pictureBox4.Size = New System.Drawing.Size(355, 30)
- Me.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
- Me.pictureBox4.TabIndex = 9
- Me.pictureBox4.TabStop = False
- '
- 'textBox1
- '
- Me.textBox1.BackColor = System.Drawing.Color.White
- Me.textBox1.Cursor = System.Windows.Forms.Cursors.Hand
- Me.textBox1.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.textBox1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
- Me.textBox1.Location = New System.Drawing.Point(34, 48)
- Me.textBox1.Name = "textBox1"
- Me.textBox1.Size = New System.Drawing.Size(417, 22)
- Me.textBox1.TabIndex = 43
- Me.textBox1.TabStop = False
- Me.textBox1.Text = "URL"
- Me.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
- '
- 'PictureBox2
- '
- Me.PictureBox2.BackColor = System.Drawing.Color.Transparent
- Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox2.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.download_subs
- Me.PictureBox2.Location = New System.Drawing.Point(140, 85)
- Me.PictureBox2.Name = "PictureBox2"
- Me.PictureBox2.Size = New System.Drawing.Size(199, 40)
- Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
- Me.PictureBox2.TabIndex = 45
- Me.PictureBox2.TabStop = False
- '
- 'Label2
- '
- Me.Label2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
- Or System.Windows.Forms.AnchorStyles.Left) _
- Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label2.BackColor = System.Drawing.Color.Transparent
- Me.Label2.Font = New System.Drawing.Font("Arial", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label2.ForeColor = System.Drawing.Color.Black
- Me.Label2.Location = New System.Drawing.Point(6, 91)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(475, 29)
- Me.Label2.TabIndex = 47
- Me.Label2.Text = "Status : idle"
- Me.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- '
- 'SoftSubs
- '
- Me.SoftSubs.BackColor = System.Drawing.Color.Transparent
- Me.SoftSubs.Controls.Add(Me.CBesES)
- Me.SoftSubs.Controls.Add(Me.CBitIT)
- Me.SoftSubs.Controls.Add(Me.CBruRU)
- Me.SoftSubs.Controls.Add(Me.CBarME)
- Me.SoftSubs.Controls.Add(Me.CBfrFR)
- Me.SoftSubs.Controls.Add(Me.CBesLA)
- Me.SoftSubs.Controls.Add(Me.CBptBR)
- Me.SoftSubs.Controls.Add(Me.CBdeDE)
- Me.SoftSubs.Controls.Add(Me.CBenUS)
- Me.SoftSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.SoftSubs.Location = New System.Drawing.Point(18, 64)
- Me.SoftSubs.Name = "SoftSubs"
- Me.SoftSubs.Size = New System.Drawing.Size(487, 137)
- Me.SoftSubs.TabIndex = 48
- Me.SoftSubs.TabStop = False
- Me.SoftSubs.Text = "SoftSubs"
- '
- 'CBesES
- '
- Me.CBesES.AutoSize = True
- Me.CBesES.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBesES.Location = New System.Drawing.Point(162, 69)
- Me.CBesES.Name = "CBesES"
- Me.CBesES.Size = New System.Drawing.Size(151, 20)
- Me.CBesES.TabIndex = 5
- Me.CBesES.Text = "Español (España)"
- Me.CBesES.UseVisualStyleBackColor = True
- '
- 'CBitIT
- '
- Me.CBitIT.AutoSize = True
- Me.CBitIT.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBitIT.Location = New System.Drawing.Point(21, 106)
- Me.CBitIT.Name = "CBitIT"
- Me.CBitIT.Size = New System.Drawing.Size(134, 20)
- Me.CBitIT.TabIndex = 5
- Me.CBitIT.Text = "Italiano (Italian)"
- Me.CBitIT.UseVisualStyleBackColor = True
- '
- 'CBruRU
- '
- Me.CBruRU.AutoSize = True
- Me.CBruRU.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBruRU.Location = New System.Drawing.Point(326, 31)
- Me.CBruRU.Name = "CBruRU"
- Me.CBruRU.Size = New System.Drawing.Size(158, 20)
- Me.CBruRU.TabIndex = 5
- Me.CBruRU.Text = "Русский (Russian)"
- Me.CBruRU.UseVisualStyleBackColor = True
- '
- 'CBarME
- '
- Me.CBarME.AutoSize = True
- Me.CBarME.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBarME.Location = New System.Drawing.Point(162, 106)
- Me.CBarME.Name = "CBarME"
- Me.CBarME.Size = New System.Drawing.Size(124, 20)
- Me.CBarME.TabIndex = 5
- Me.CBarME.Text = "العربية (Arabic)"
- Me.CBarME.UseVisualStyleBackColor = True
- '
- 'CBfrFR
- '
- Me.CBfrFR.AutoSize = True
- Me.CBfrFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBfrFR.Location = New System.Drawing.Point(326, 106)
- Me.CBfrFR.Name = "CBfrFR"
- Me.CBfrFR.Size = New System.Drawing.Size(149, 20)
- Me.CBfrFR.TabIndex = 4
- Me.CBfrFR.Text = "Français (France)"
- Me.CBfrFR.UseVisualStyleBackColor = True
- '
- 'CBesLA
- '
- Me.CBesLA.AutoSize = True
- Me.CBesLA.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBesLA.Location = New System.Drawing.Point(162, 31)
- Me.CBesLA.Name = "CBesLA"
- Me.CBesLA.Size = New System.Drawing.Size(116, 20)
- Me.CBesLA.TabIndex = 3
- Me.CBesLA.Text = "Español (LA)"
- Me.CBesLA.UseVisualStyleBackColor = True
- '
- 'CBptBR
- '
- Me.CBptBR.AutoSize = True
- Me.CBptBR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBptBR.Location = New System.Drawing.Point(326, 69)
- Me.CBptBR.Name = "CBptBR"
- Me.CBptBR.Size = New System.Drawing.Size(151, 20)
- Me.CBptBR.TabIndex = 2
- Me.CBptBR.Text = "Português (Brasil)"
- Me.CBptBR.UseVisualStyleBackColor = True
- '
- 'CBdeDE
- '
- Me.CBdeDE.AutoSize = True
- Me.CBdeDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBdeDE.Location = New System.Drawing.Point(21, 69)
- Me.CBdeDE.Name = "CBdeDE"
- Me.CBdeDE.Size = New System.Drawing.Size(83, 20)
- Me.CBdeDE.TabIndex = 1
- Me.CBdeDE.Text = "Deutsch"
- Me.CBdeDE.UseVisualStyleBackColor = True
- '
- 'CBenUS
- '
- Me.CBenUS.AutoSize = True
- Me.CBenUS.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.CBenUS.Location = New System.Drawing.Point(21, 31)
- Me.CBenUS.Name = "CBenUS"
- Me.CBenUS.Size = New System.Drawing.Size(78, 20)
- Me.CBenUS.TabIndex = 0
- Me.CBenUS.Text = "English"
- Me.CBenUS.UseVisualStyleBackColor = True
- '
- 'GroupBox1
- '
- Me.GroupBox1.BackColor = System.Drawing.Color.Transparent
- Me.GroupBox1.Controls.Add(Me.textBox1)
- Me.GroupBox1.Controls.Add(Me.PictureBox2)
- Me.GroupBox1.Controls.Add(Me.Label2)
- Me.GroupBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.GroupBox1.Location = New System.Drawing.Point(18, 252)
- Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(487, 135)
- Me.GroupBox1.TabIndex = 49
- Me.GroupBox1.TabStop = False
- Me.GroupBox1.Text = "Download only Subtitle"
- '
- 'SoftSub
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.SoftSubs_Baclground
- Me.ClientSize = New System.Drawing.Size(530, 400)
- Me.Controls.Add(Me.GroupBox1)
- Me.Controls.Add(Me.SoftSubs)
- Me.Controls.Add(Me.pictureBox4)
- Me.Controls.Add(Me.pictureBox1)
- Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
- Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
- Me.Name = "SoftSub"
- Me.Text = "SoftSubs"
- CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
- Me.SoftSubs.ResumeLayout(False)
- Me.SoftSubs.PerformLayout()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- Me.ResumeLayout(False)
- Me.PerformLayout()
-
- End Sub
-
- Private WithEvents pictureBox1 As PictureBox
- Private WithEvents pictureBox4 As PictureBox
- Public WithEvents textBox1 As TextBox
- Private WithEvents PictureBox2 As PictureBox
- Public WithEvents Label2 As Label
- Friend WithEvents SoftSubs As GroupBox
- Friend WithEvents CBesES As CheckBox
- Friend WithEvents CBitIT As CheckBox
- Friend WithEvents CBruRU As CheckBox
- Friend WithEvents CBarME As CheckBox
- Friend WithEvents CBfrFR As CheckBox
- Friend WithEvents CBesLA As CheckBox
- Friend WithEvents CBptBR As CheckBox
- Friend WithEvents CBdeDE As CheckBox
- Friend WithEvents CBenUS As CheckBox
- Friend WithEvents GroupBox1 As GroupBox
-End Class
diff --git a/Crunchyroll Downloader/SoftSub.resx b/Crunchyroll Downloader/SoftSub.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/Crunchyroll Downloader/SoftSub.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/Crunchyroll Downloader/SoftSub.vb b/Crunchyroll Downloader/SoftSub.vb
deleted file mode 100644
index 1344b88..0000000
--- a/Crunchyroll Downloader/SoftSub.vb
+++ /dev/null
@@ -1,320 +0,0 @@
-Imports System.Net
-Imports System.Text
-Imports System.IO
-Imports Microsoft.Win32
-Imports System.ComponentModel
-Public Class SoftSub
-#Region "UI"
-
-#Region " Move Form "
-
- ' [ Move Form ]
- '
- ' // By Elektro
-
- Public MoveForm As Boolean
- Public MoveForm_MousePosition As Point
-
- Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _
- MyBase.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown)
-
- If e.Button = MouseButtons.Left Then
- MoveForm = True
- Me.Cursor = Cursors.NoMove2D
- MoveForm_MousePosition = e.Location
- End If
-
- End Sub
-
- Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _
- MyBase.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove)
-
- If MoveForm Then
- Me.Location = Me.Location + (e.Location - MoveForm_MousePosition)
- End If
-
- End Sub
-
- Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _
- MyBase.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp)
-
- If e.Button = MouseButtons.Left Then
- MoveForm = False
- Me.Cursor = Cursors.Default
- End If
-
- End Sub
-#End Region
-
-
- Private Sub PictureBox2_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox2.MouseEnter
- PictureBox2.Image = My.Resources.download_subs_hover
- End Sub
-
- Private Sub PictureBox2_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox2.MouseLeave
- PictureBox2.Image = My.Resources.download_subs
- End Sub
- Private Sub PictureBox4_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox4.MouseEnter
- pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit_hover
- End Sub
-
- Private Sub PictureBox4_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox4.MouseLeave
- pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit
- End Sub
- Private Sub PictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox1.MouseEnter
- pictureBox1.BackColor = SystemColors.Control
- End Sub
-
- Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox1.MouseLeave
- pictureBox1.BackColor = Color.Transparent
- End Sub
-
- Private Sub TextBox1_Click(sender As Object, e As EventArgs) Handles textBox1.Click
- If textBox1.Text = "URL" Then
- textBox1.Text = Nothing
- End If
- End Sub
-#End Region
- Dim LocalSoftSubs As New List(Of String)
- Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles pictureBox1.Click
- Me.Close()
- End Sub
-
- Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
- Main.SoftSubs.Clear()
- If CBdeDE.Checked = True Then
- Main.SoftSubs.Add("deDE")
- End If
- If CBenUS.Checked = True Then
- Main.SoftSubs.Add("enUS")
- End If
- If CBptBR.Checked = True Then
- Main.SoftSubs.Add("ptBR")
- End If
- If CBesLA.Checked = True Then
- Main.SoftSubs.Add("esLA")
- End If
- If CBfrFR.Checked = True Then
- Main.SoftSubs.Add("frFR")
- End If
- If CBarME.Checked = True Then
- Main.SoftSubs.Add("arME")
- End If
- If CBruRU.Checked = True Then
- Main.SoftSubs.Add("ruRU")
- End If
- If CBitIT.Checked = True Then
- Main.SoftSubs.Add("itIT")
- End If
- If CBesES.Checked = True Then
- Main.SoftSubs.Add("esES")
- End If
-
- Dim SaveString As String = Nothing
- For ii As Integer = 0 To Main.SoftSubs.Count - 1
- If SaveString = Nothing Then
- SaveString = Main.SoftSubs(ii)
- Else
- SaveString = SaveString + "," + Main.SoftSubs(ii)
- End If
- Next
- If SaveString = Nothing Then
- SaveString = "none"
- End If
- Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
- rk.SetValue("AddedSubs", SaveString, RegistryValueKind.String)
- Me.Close()
- End Sub
-
- Private Sub SoftSubs_Load(sender As Object, e As EventArgs) Handles MyBase.Load
- Me.Icon = My.Resources.icon
- Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2)
-
- For i As Integer = 0 To Main.SoftSubs.Count - 1
- If Main.SoftSubs(i) = "deDE" Then
- CBdeDE.Checked = True
- ElseIf Main.SoftSubs(i) = "enUS" Then
- CBenUS.Checked = True
- ElseIf Main.SoftSubs(i) = "ptBR" Then
- CBptBR.Checked = True
- ElseIf Main.SoftSubs(i) = "esLA" Then
- CBesLA.Checked = True
- ElseIf Main.SoftSubs(i) = "frFR" Then
- CBfrFR.Checked = True
- ElseIf Main.SoftSubs(i) = "arME" Then
- CBarME.Checked = True
- ElseIf Main.SoftSubs(i) = "ruRU" Then
- CBruRU.Checked = True
- ElseIf Main.SoftSubs(i) = "itIT" Then
- CBitIT.Checked = True
- ElseIf Main.SoftSubs(i) = "esES" Then
- CBesES.Checked = True
- End If
- Next
- End Sub
- Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles PictureBox2.Click
- Try
- LocalSoftSubs.Clear()
-
- If CBdeDE.Checked = True Then
- LocalSoftSubs.Add("deDE")
- End If
- If CBenUS.Checked = True Then
- LocalSoftSubs.Add("enUS")
- End If
- If CBptBR.Checked = True Then
- LocalSoftSubs.Add("ptBR")
- End If
- If CBesLA.Checked = True Then
- LocalSoftSubs.Add("esLA")
- End If
- If CBfrFR.Checked = True Then
- LocalSoftSubs.Add("frFR")
- End If
- If CBarME.Checked = True Then
- LocalSoftSubs.Add("arME")
- End If
- If CBruRU.Checked = True Then
- LocalSoftSubs.Add("ruRU")
- End If
- If CBitIT.Checked = True Then
- LocalSoftSubs.Add("itIT")
- End If
- If CBesES.Checked = True Then
- LocalSoftSubs.Add("esES")
- End If
- Catch ex As Exception
- 'MsgBox(ex.ToString)
- End Try
- If LocalSoftSubs.Count > 0 Then
- If CBool(InStr(textBox1.Text, "crunchyroll.com")) Then
- GeckoFX.WebBrowser1.Navigate(textBox1.Text)
- GeckoFX.c = False
- Label2.Text = "Status: looking for sub file"
- PictureBox2.Visible = False
- End If
- Else
- 'Label2.Text = "Status: Error - nothing selected"
- MsgBox("Error: no language selected", MsgBoxStyle.Information, "CRD Subtitel")
- PictureBox2.Visible = True
- End If
- End Sub
- Public Sub DownloadSubs()
-
- Try
-
-#Region "Name + Pfad"
- Dim NameTextBox As Boolean = False
- Dim Pfad2 As String
- Dim CR_FilenName As String
- Dim Bug_Deutsch As String = "-"
- Dim CR_Anime_Titel As String
- Dim CR_Anime_Staffel As String
- Dim CR_Anime_Folge As String
- 'Dim CR_Name_by_Titel As String() = GeckoFX.WebBrowser1.Document.Body.OuterHtml.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
- 'Dim CR_Name_by_Titel_2_Patch As String =CR_Name_by_Titel(1).Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
- If CBool(InStr(GeckoFX.WebBrowser1.DocumentTitle, "Anschauen auf Crunchyroll")) Then
- Bug_Deutsch = ":"
- 'Throw New System.Exception("Test")
- Else
- End If
- Dim CR_Name_by_Titel_2 As String() = Main.WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries)
- 'Dim CR_Name_by_Script As String() = Main.WebbrowserText.Split(New String() {Chr(34) + "name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
- 'Dim CR_Name_by_Script2 As String() = CR_Name_by_Script(1).Split(New [Char]() {Chr(34)})
- CR_FilenName = CR_Name_by_Titel_2(0).Trim() '+ " " + CR_Name_by_Script2(0).Trim
-
- Dim CR_FilenName_Backup As String = Nothing
-
- Dim SubfolderValue As String = Nothing
- If CBool(InStr(GeckoFX.WebBrowser1.Document.Body.OuterHtml, "")) Then ' Film statt Serie
- Dim CR_Name_1 As String() = Main.WebbrowserText.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
- Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"
"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
- Dim CR_Name_Staffel0_Folge1 As String()
- If CBool(InStr(CR_Name_2(0), ",")) Then
- CR_Name_Staffel0_Folge1 = CR_Name_2(0).Split(New [Char]() {System.Convert.ToChar(",")}, System.StringSplitOptions.RemoveEmptyEntries)
- CR_Anime_Staffel = CR_Name_Staffel0_Folge1(0).Trim()
- CR_Anime_Folge = CR_Name_Staffel0_Folge1(1).Trim()
- CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
- Else
- CR_Anime_Staffel = ""
- CR_Anime_Folge = CR_Name_2(0).Trim()
- CR_Anime_Folge = System.Text.RegularExpressions.Regex.Replace(CR_Anime_Folge, "[^\w\\-]", " ")
- End If
-
-
- Dim CR_Name_4 As String() = CR_Name_1(0).Split(New String() {"class=" + Chr(34) + "text-link" + Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"})
- Dim CR_Name_Anime0 As String() = CR_Name_4(CR_Name_4.Length - 1).Split(New String() {"
"}, System.StringSplitOptions.RemoveEmptyEntries)
- CR_Name_Anime0(0) = System.Text.RegularExpressions.Regex.Replace(CR_Name_Anime0(0), "[^\w\\-]", " ")
- CR_Anime_Titel = CR_Name_Anime0(0).Trim
- If CR_Anime_Staffel = Nothing Then
- CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Folge
- Else
- CR_FilenName = CR_Anime_Titel + " " + CR_Anime_Staffel + " " + CR_Anime_Folge
- End If
-
- CR_FilenName_Backup = Main.RemoveExtraSpaces(CR_FilenName)
- If Anime_Add.ComboBox2.Text = Main.SubFolder_automatic Then
- If Main.SubFolder = 2 Then
- SubfolderValue = CR_Anime_Titel + "\" + CR_Anime_Staffel + "\"
- ElseIf Main.SubFolder = 1 Then
- SubfolderValue = CR_Anime_Titel + "\"
- End If
- ElseIf Anime_Add.ComboBox2.Text = Main.SubFolder_Nothing Then
- Else
- SubfolderValue = Anime_Add.ComboBox2.Text + "\"
- End If
- End If
- CR_FilenName = System.Text.RegularExpressions.Regex.Replace(CR_FilenName, "[^\w\\-]", " ")
- CR_FilenName = Main.RemoveExtraSpaces(CR_FilenName)
-
- Pfad2 = Main.Pfad + "\" + CR_FilenName + ".ass"
-
-#End Region
-#Region "Subs"
- Dim SoftSubs2 As New List(Of String)
- If LocalSoftSubs.Count > 0 Then
- For i As Integer = 0 To LocalSoftSubs.Count - 1
- If CBool(InStr(Main.WebbrowserText, Chr(34) + "language" + Chr(34) + ":" + Chr(34) + LocalSoftSubs(i) + Chr(34) + ",")) Then
- SoftSubs2.Add(LocalSoftSubs(i))
- Else
- MsgBox("Softsubtitle for " + LocalSoftSubs(i) + " is not avalible.", MsgBoxStyle.Information)
- End If
- Next
-
- End If
-
-#End Region
-
-
-#Region "Download softsub file"
- If SoftSubs2.Count > 0 Then
- For i As Integer = 0 To SoftSubs2.Count - 1
- Label2.Text = "Status: downloading subtitle file - " + SoftSubs2(i)
- Dim SoftSub As String() = Main.WebbrowserText.Split(New String() {Chr(34) + "language" + Chr(34) + ":" + Chr(34) + SoftSubs2(i) + Chr(34) + "," + Chr(34) + "url" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
- Dim SoftSub_2 As String() = SoftSub(1).Split(New [Char]() {Chr(34)})
- Dim SoftSub_3 As String = SoftSub_2(0).Replace("\/", "/")
- Dim client0 As New Net.WebClient
- client0.Encoding = Encoding.UTF8
- Dim str0 As String = client0.DownloadString(SoftSub_3)
- If File.Exists(Pfad2) Then
- Pfad2 = Main.Pfad + "\" + CR_FilenName + " " + SoftSubs2(i) + ".ass"
- End If
- 'MsgBox(Pfad2 + vbNewLine + Main.Pfad)
- File.WriteAllText(Pfad2, str0, Encoding.UTF8)
- Main.Pause(1)
- Next
- End If
-#End Region
-
- Catch ex As Exception
-
- End Try
- Label2.Text = "Status: idle"
- PictureBox2.Visible = True
- End Sub
-
-
-
-
-
-End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe
index 548bc3f..d1005e4 100644
Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb
index b790ac5..def3505 100644
Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml
index 459cbde..0dcb4ad 100644
--- a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml
+++ b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml
@@ -306,6 +306,21 @@ Crunchyroll Downloader
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
Sucht eine lokalisierte Zeichenfolge, die <!DOCTYPE html>
diff --git a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe
index c7ece3c..ad45d60 100644
Binary files a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb
index 6c8e6e6..1a8b076 100644
Binary files a/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Release/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb
index c69b397..656ee75 100644
--- a/Crunchyroll Downloader/einstellungen.Designer.vb
+++ b/Crunchyroll Downloader/einstellungen.Designer.vb
@@ -23,172 +23,76 @@ Partial Class einstellungen
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
+ Me.GB_Sub_Path = New System.Windows.Forms.GroupBox()
+ Me.RBStaffel = New System.Windows.Forms.RadioButton()
+ Me.RBAnime = New System.Windows.Forms.RadioButton()
+ Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+ Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox()
+ Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
+ Me.pictureBox1 = New System.Windows.Forms.PictureBox()
+ Me.pictureBox4 = New System.Windows.Forms.PictureBox()
+ Me.TabControl1 = New System.Windows.Forms.TabControl()
+ Me.TabPage1 = New System.Windows.Forms.TabPage()
+ Me.PictureBox6 = New System.Windows.Forms.PictureBox()
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+ Me.Label1 = New System.Windows.Forms.Label()
+ Me.TextBox1 = New System.Windows.Forms.TextBox()
+ Me.Firefox_True = New System.Windows.Forms.CheckBox()
+ Me.GroupBox4 = New System.Windows.Forms.GroupBox()
+ Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+ Me.TabPage2 = New System.Windows.Forms.TabPage()
+ Me.SoftSubs = New System.Windows.Forms.GroupBox()
+ Me.MergeMP4 = New System.Windows.Forms.CheckBox()
+ Me.CBesES = New System.Windows.Forms.CheckBox()
+ Me.CBitIT = New System.Windows.Forms.CheckBox()
+ Me.CBruRU = New System.Windows.Forms.CheckBox()
+ Me.CBarME = New System.Windows.Forms.CheckBox()
+ Me.CBfrFR = New System.Windows.Forms.CheckBox()
+ Me.CBesLA = New System.Windows.Forms.CheckBox()
+ Me.CBptBR = New System.Windows.Forms.CheckBox()
+ Me.CBdeDE = New System.Windows.Forms.CheckBox()
+ Me.CBenUS = New System.Windows.Forms.CheckBox()
+ Me.GB_SubLanguage = New System.Windows.Forms.GroupBox()
+ Me.ComboBox1 = New System.Windows.Forms.ComboBox()
Me.GB_Resolution = New System.Windows.Forms.GroupBox()
Me.AAuto = New System.Windows.Forms.RadioButton()
Me.A480p = New System.Windows.Forms.RadioButton()
Me.A360p = New System.Windows.Forms.RadioButton()
Me.A720p = New System.Windows.Forms.RadioButton()
Me.A1080p = New System.Windows.Forms.RadioButton()
- Me.GB_SubLanguage = New System.Windows.Forms.GroupBox()
+ Me.TabPage3 = New System.Windows.Forms.TabPage()
+ Me.GroupBox3 = New System.Windows.Forms.GroupBox()
Me.PictureBox5 = New System.Windows.Forms.PictureBox()
- Me.ComboBox1 = New System.Windows.Forms.ComboBox()
- Me.GB_Sub_Path = New System.Windows.Forms.GroupBox()
- Me.RBStaffel = New System.Windows.Forms.RadioButton()
- Me.RBAnime = New System.Windows.Forms.RadioButton()
- Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
- Me.GroupBox4 = New System.Windows.Forms.GroupBox()
- Me.PictureBox2 = New System.Windows.Forms.PictureBox()
- Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox()
- Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
- Me.pictureBox1 = New System.Windows.Forms.PictureBox()
- Me.pictureBox4 = New System.Windows.Forms.PictureBox()
- Me.GroupBox1 = New System.Windows.Forms.GroupBox()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.TextBox1 = New System.Windows.Forms.TextBox()
- Me.Firefox_True = New System.Windows.Forms.CheckBox()
- Me.PictureBox6 = New System.Windows.Forms.PictureBox()
- Me.TabControl1 = New System.Windows.Forms.TabControl()
- Me.TabPage1 = New System.Windows.Forms.TabPage()
- Me.TabPage2 = New System.Windows.Forms.TabPage()
- Me.GB_Resolution.SuspendLayout()
- Me.GB_SubLanguage.SuspendLayout()
- CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.StatusLabel = New System.Windows.Forms.Label()
+ Me.TextBox2 = New System.Windows.Forms.TextBox()
+ Me.MultiDLSoftSubs = New System.Windows.Forms.GroupBox()
+ Me.SoftSubsMass = New System.Windows.Forms.Label()
+ Me.PictureBox3 = New System.Windows.Forms.PictureBox()
+ Me.comboBox4 = New System.Windows.Forms.ComboBox()
+ Me.ComboBox2 = New System.Windows.Forms.ComboBox()
+ Me.comboBox3 = New System.Windows.Forms.ComboBox()
Me.GB_Sub_Path.SuspendLayout()
- Me.GroupBox4.SuspendLayout()
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.DL_Count_simultaneous.SuspendLayout()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.GroupBox1.SuspendLayout()
- CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabControl1.SuspendLayout()
Me.TabPage1.SuspendLayout()
+ CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.GroupBox1.SuspendLayout()
+ Me.GroupBox4.SuspendLayout()
+ CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.TabPage2.SuspendLayout()
+ Me.SoftSubs.SuspendLayout()
+ Me.GB_SubLanguage.SuspendLayout()
+ Me.GB_Resolution.SuspendLayout()
+ Me.TabPage3.SuspendLayout()
+ Me.GroupBox3.SuspendLayout()
+ CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.MultiDLSoftSubs.SuspendLayout()
+ CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
- 'GB_Resolution
- '
- Me.GB_Resolution.BackColor = System.Drawing.Color.Transparent
- Me.GB_Resolution.Controls.Add(Me.AAuto)
- Me.GB_Resolution.Controls.Add(Me.A480p)
- Me.GB_Resolution.Controls.Add(Me.A360p)
- Me.GB_Resolution.Controls.Add(Me.A720p)
- Me.GB_Resolution.Controls.Add(Me.A1080p)
- Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
- Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
- Me.GB_Resolution.Location = New System.Drawing.Point(6, 158)
- Me.GB_Resolution.Name = "GB_Resolution"
- Me.GB_Resolution.Size = New System.Drawing.Size(339, 68)
- Me.GB_Resolution.TabIndex = 0
- Me.GB_Resolution.TabStop = False
- Me.GB_Resolution.Text = "Auflösung"
- '
- 'AAuto
- '
- Me.AAuto.AutoSize = True
- Me.AAuto.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.AAuto.ForeColor = System.Drawing.Color.Black
- Me.AAuto.Location = New System.Drawing.Point(267, 22)
- Me.AAuto.Name = "AAuto"
- Me.AAuto.Size = New System.Drawing.Size(66, 22)
- Me.AAuto.TabIndex = 3
- Me.AAuto.TabStop = True
- Me.AAuto.Text = "[Auto]"
- Me.AAuto.UseVisualStyleBackColor = True
- '
- 'A480p
- '
- Me.A480p.AutoSize = True
- Me.A480p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.A480p.ForeColor = System.Drawing.Color.Black
- Me.A480p.Location = New System.Drawing.Point(141, 21)
- Me.A480p.Name = "A480p"
- Me.A480p.Size = New System.Drawing.Size(62, 22)
- Me.A480p.TabIndex = 2
- Me.A480p.TabStop = True
- Me.A480p.Text = "480p"
- Me.A480p.UseVisualStyleBackColor = True
- '
- 'A360p
- '
- Me.A360p.AutoSize = True
- Me.A360p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.A360p.ForeColor = System.Drawing.Color.Black
- Me.A360p.Location = New System.Drawing.Point(205, 22)
- Me.A360p.Name = "A360p"
- Me.A360p.Size = New System.Drawing.Size(62, 22)
- Me.A360p.TabIndex = 2
- Me.A360p.TabStop = True
- Me.A360p.Text = "360p"
- Me.A360p.UseVisualStyleBackColor = True
- '
- 'A720p
- '
- Me.A720p.AutoSize = True
- Me.A720p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.A720p.ForeColor = System.Drawing.Color.Black
- Me.A720p.Location = New System.Drawing.Point(82, 21)
- Me.A720p.Name = "A720p"
- Me.A720p.Size = New System.Drawing.Size(62, 22)
- Me.A720p.TabIndex = 1
- Me.A720p.TabStop = True
- Me.A720p.Text = "720p"
- Me.A720p.UseVisualStyleBackColor = True
- '
- 'A1080p
- '
- Me.A1080p.AutoSize = True
- Me.A1080p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.A1080p.ForeColor = System.Drawing.Color.Black
- Me.A1080p.Location = New System.Drawing.Point(9, 21)
- Me.A1080p.Name = "A1080p"
- Me.A1080p.Size = New System.Drawing.Size(71, 22)
- Me.A1080p.TabIndex = 0
- Me.A1080p.TabStop = True
- Me.A1080p.Text = "1080p"
- Me.A1080p.UseVisualStyleBackColor = True
- '
- 'GB_SubLanguage
- '
- Me.GB_SubLanguage.BackColor = System.Drawing.Color.Transparent
- Me.GB_SubLanguage.Controls.Add(Me.PictureBox5)
- Me.GB_SubLanguage.Controls.Add(Me.ComboBox1)
- Me.GB_SubLanguage.Font = New System.Drawing.Font("Arial", 9.75!)
- Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black
- Me.GB_SubLanguage.Location = New System.Drawing.Point(3, 232)
- Me.GB_SubLanguage.Name = "GB_SubLanguage"
- Me.GB_SubLanguage.Size = New System.Drawing.Size(342, 95)
- Me.GB_SubLanguage.TabIndex = 1
- Me.GB_SubLanguage.TabStop = False
- Me.GB_SubLanguage.Text = "Sub Sprache"
- '
- 'PictureBox5
- '
- Me.PictureBox5.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox5.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.settings_add_softsubs
- Me.PictureBox5.Location = New System.Drawing.Point(102, 59)
- Me.PictureBox5.Name = "PictureBox5"
- Me.PictureBox5.Size = New System.Drawing.Size(127, 30)
- Me.PictureBox5.TabIndex = 34
- Me.PictureBox5.TabStop = False
- '
- 'ComboBox1
- '
- Me.ComboBox1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
- Me.ComboBox1.DropDownHeight = 250
- Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
- Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.ComboBox1.FormattingEnabled = True
- Me.ComboBox1.IntegralHeight = False
- Me.ComboBox1.ItemHeight = 16
- Me.ComboBox1.Items.AddRange(New Object() {"Deutsch", "English", "Español (España)", "Español (LA)", "Français (France)", "Italiano (Italian)", "Português (Brasil)", "Русский (Russian)", "العربية (Arabic)"})
- Me.ComboBox1.Location = New System.Drawing.Point(44, 25)
- Me.ComboBox1.Name = "ComboBox1"
- Me.ComboBox1.Size = New System.Drawing.Size(265, 22)
- Me.ComboBox1.Sorted = True
- Me.ComboBox1.TabIndex = 33
- '
'GB_Sub_Path
'
Me.GB_Sub_Path.BackColor = System.Drawing.Color.Transparent
@@ -198,7 +102,7 @@ Partial Class einstellungen
Me.GB_Sub_Path.ForeColor = System.Drawing.Color.Black
Me.GB_Sub_Path.Location = New System.Drawing.Point(6, 85)
Me.GB_Sub_Path.Name = "GB_Sub_Path"
- Me.GB_Sub_Path.Size = New System.Drawing.Size(342, 67)
+ Me.GB_Sub_Path.Size = New System.Drawing.Size(456, 51)
Me.GB_Sub_Path.TabIndex = 3
Me.GB_Sub_Path.TabStop = False
Me.GB_Sub_Path.Text = "Unterordner "
@@ -208,7 +112,7 @@ Partial Class einstellungen
Me.RBStaffel.AutoSize = True
Me.RBStaffel.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.RBStaffel.ForeColor = System.Drawing.Color.Black
- Me.RBStaffel.Location = New System.Drawing.Point(159, 24)
+ Me.RBStaffel.Location = New System.Drawing.Point(251, 21)
Me.RBStaffel.Name = "RBStaffel"
Me.RBStaffel.Size = New System.Drawing.Size(174, 22)
Me.RBStaffel.TabIndex = 1
@@ -222,7 +126,7 @@ Partial Class einstellungen
Me.RBAnime.AutoSize = True
Me.RBAnime.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.RBAnime.ForeColor = System.Drawing.Color.Black
- Me.RBAnime.Location = New System.Drawing.Point(9, 24)
+ Me.RBAnime.Location = New System.Drawing.Point(30, 21)
Me.RBAnime.Name = "RBAnime"
Me.RBAnime.Size = New System.Drawing.Size(113, 22)
Me.RBAnime.TabIndex = 1
@@ -231,45 +135,22 @@ Partial Class einstellungen
Me.ToolTip1.SetToolTip(Me.RBAnime, "Erstelle einen Ordner für den Anime, unabhänig der Staffeln")
Me.RBAnime.UseVisualStyleBackColor = True
'
- 'GroupBox4
- '
- Me.GroupBox4.BackColor = System.Drawing.Color.Transparent
- Me.GroupBox4.Controls.Add(Me.PictureBox2)
- Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
- Me.GroupBox4.ForeColor = System.Drawing.Color.Black
- Me.GroupBox4.Location = New System.Drawing.Point(6, 173)
- Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(339, 81)
- Me.GroupBox4.TabIndex = 4
- Me.GroupBox4.TabStop = False
- Me.GroupBox4.Text = "Crunchyroll US"
- '
- 'PictureBox2
- '
- Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox2.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdsettings_setUScookie_button
- Me.PictureBox2.Location = New System.Drawing.Point(94, 32)
- Me.PictureBox2.Name = "PictureBox2"
- Me.PictureBox2.Size = New System.Drawing.Size(150, 30)
- Me.PictureBox2.TabIndex = 4
- Me.PictureBox2.TabStop = False
- '
'DL_Count_simultaneous
'
Me.DL_Count_simultaneous.BackColor = System.Drawing.Color.Transparent
Me.DL_Count_simultaneous.Controls.Add(Me.NumericUpDown1)
Me.DL_Count_simultaneous.Font = New System.Drawing.Font("Arial", 9.75!)
Me.DL_Count_simultaneous.ForeColor = System.Drawing.Color.Black
- Me.DL_Count_simultaneous.Location = New System.Drawing.Point(12, 11)
+ Me.DL_Count_simultaneous.Location = New System.Drawing.Point(6, 11)
Me.DL_Count_simultaneous.Name = "DL_Count_simultaneous"
- Me.DL_Count_simultaneous.Size = New System.Drawing.Size(333, 68)
+ Me.DL_Count_simultaneous.Size = New System.Drawing.Size(456, 68)
Me.DL_Count_simultaneous.TabIndex = 5
Me.DL_Count_simultaneous.TabStop = False
Me.DL_Count_simultaneous.Text = "simultaneous downloads"
'
'NumericUpDown1
'
- Me.NumericUpDown1.Location = New System.Drawing.Point(35, 31)
+ Me.NumericUpDown1.Location = New System.Drawing.Point(98, 30)
Me.NumericUpDown1.Maximum = New Decimal(New Integer() {12, 0, 0, 0})
Me.NumericUpDown1.Name = "NumericUpDown1"
Me.NumericUpDown1.Size = New System.Drawing.Size(265, 22)
@@ -282,7 +163,7 @@ Partial Class einstellungen
Me.pictureBox1.BackColor = System.Drawing.Color.Transparent
Me.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand
Me.pictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close
- Me.pictureBox1.Location = New System.Drawing.Point(328, 1)
+ Me.pictureBox1.Location = New System.Drawing.Point(449, 1)
Me.pictureBox1.Name = "pictureBox1"
Me.pictureBox1.Size = New System.Drawing.Size(50, 40)
Me.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
@@ -293,13 +174,50 @@ Partial Class einstellungen
'
Me.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand
Me.pictureBox4.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Button_SafeExit
- Me.pictureBox4.Location = New System.Drawing.Point(10, 429)
+ Me.pictureBox4.Location = New System.Drawing.Point(67, 505)
Me.pictureBox4.Name = "pictureBox4"
Me.pictureBox4.Size = New System.Drawing.Size(355, 30)
Me.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.pictureBox4.TabIndex = 8
Me.pictureBox4.TabStop = False
'
+ 'TabControl1
+ '
+ Me.TabControl1.Controls.Add(Me.TabPage1)
+ Me.TabControl1.Controls.Add(Me.TabPage2)
+ Me.TabControl1.Controls.Add(Me.TabPage3)
+ Me.TabControl1.Location = New System.Drawing.Point(12, 47)
+ Me.TabControl1.Name = "TabControl1"
+ Me.TabControl1.SelectedIndex = 0
+ Me.TabControl1.Size = New System.Drawing.Size(476, 441)
+ Me.TabControl1.TabIndex = 38
+ '
+ 'TabPage1
+ '
+ Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
+ Me.TabPage1.Controls.Add(Me.PictureBox6)
+ Me.TabPage1.Controls.Add(Me.GroupBox1)
+ Me.TabPage1.Controls.Add(Me.GroupBox4)
+ Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous)
+ Me.TabPage1.Controls.Add(Me.GB_Sub_Path)
+ Me.TabPage1.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage1.Name = "TabPage1"
+ Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage1.Size = New System.Drawing.Size(468, 415)
+ Me.TabPage1.TabIndex = 0
+ Me.TabPage1.Text = "Settings"
+ '
+ 'PictureBox6
+ '
+ Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default
+ Me.PictureBox6.Location = New System.Drawing.Point(195, 359)
+ Me.PictureBox6.Name = "PictureBox6"
+ Me.PictureBox6.Size = New System.Drawing.Size(76, 39)
+ Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
+ Me.PictureBox6.TabIndex = 41
+ Me.PictureBox6.TabStop = False
+ '
'GroupBox1
'
Me.GroupBox1.BackColor = System.Drawing.Color.Transparent
@@ -308,17 +226,17 @@ Partial Class einstellungen
Me.GroupBox1.Controls.Add(Me.Firefox_True)
Me.GroupBox1.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox1.ForeColor = System.Drawing.Color.Black
- Me.GroupBox1.Location = New System.Drawing.Point(6, 17)
+ Me.GroupBox1.Location = New System.Drawing.Point(6, 215)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(339, 138)
- Me.GroupBox1.TabIndex = 4
+ Me.GroupBox1.Size = New System.Drawing.Size(456, 138)
+ Me.GroupBox1.TabIndex = 7
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Browser Settings"
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(120, 28)
+ Me.Label1.Location = New System.Drawing.Point(186, 29)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(100, 16)
Me.Label1.TabIndex = 2
@@ -328,76 +246,451 @@ Partial Class einstellungen
'
Me.TextBox1.Location = New System.Drawing.Point(6, 57)
Me.TextBox1.Name = "TextBox1"
- Me.TextBox1.Size = New System.Drawing.Size(327, 22)
+ Me.TextBox1.Size = New System.Drawing.Size(444, 22)
Me.TextBox1.TabIndex = 1
Me.TextBox1.Text = "https://www.crunchyroll.com/"
+ Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
'
'Firefox_True
'
Me.Firefox_True.AutoSize = True
Me.Firefox_True.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Firefox_True.ForeColor = System.Drawing.Color.Black
- Me.Firefox_True.Location = New System.Drawing.Point(88, 99)
+ Me.Firefox_True.Location = New System.Drawing.Point(141, 99)
Me.Firefox_True.Name = "Firefox_True"
Me.Firefox_True.Size = New System.Drawing.Size(166, 20)
Me.Firefox_True.TabIndex = 0
Me.Firefox_True.Text = "Use Firefox Profil Folder"
Me.Firefox_True.UseVisualStyleBackColor = True
'
- 'PictureBox6
+ 'GroupBox4
'
- Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand
- Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default
- Me.PictureBox6.Location = New System.Drawing.Point(131, 276)
- Me.PictureBox6.Name = "PictureBox6"
- Me.PictureBox6.Size = New System.Drawing.Size(76, 39)
- Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
- Me.PictureBox6.TabIndex = 37
- Me.PictureBox6.TabStop = False
+ Me.GroupBox4.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox4.Controls.Add(Me.PictureBox2)
+ Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.GroupBox4.ForeColor = System.Drawing.Color.Black
+ Me.GroupBox4.Location = New System.Drawing.Point(6, 142)
+ Me.GroupBox4.Name = "GroupBox4"
+ Me.GroupBox4.Size = New System.Drawing.Size(456, 67)
+ Me.GroupBox4.TabIndex = 6
+ Me.GroupBox4.TabStop = False
+ Me.GroupBox4.Text = "Crunchyroll US"
'
- 'TabControl1
+ 'PictureBox2
'
- Me.TabControl1.Controls.Add(Me.TabPage1)
- Me.TabControl1.Controls.Add(Me.TabPage2)
- Me.TabControl1.Location = New System.Drawing.Point(10, 46)
- Me.TabControl1.Name = "TabControl1"
- Me.TabControl1.SelectedIndex = 0
- Me.TabControl1.Size = New System.Drawing.Size(359, 364)
- Me.TabControl1.TabIndex = 38
- '
- 'TabPage1
- '
- Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
- Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous)
- Me.TabPage1.Controls.Add(Me.GB_SubLanguage)
- Me.TabPage1.Controls.Add(Me.GB_Resolution)
- Me.TabPage1.Controls.Add(Me.GB_Sub_Path)
- Me.TabPage1.Location = New System.Drawing.Point(4, 22)
- Me.TabPage1.Name = "TabPage1"
- Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(351, 338)
- Me.TabPage1.TabIndex = 0
- Me.TabPage1.Text = "Download Settings"
+ Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox2.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdsettings_setUScookie_button
+ Me.PictureBox2.Location = New System.Drawing.Point(154, 21)
+ Me.PictureBox2.Name = "PictureBox2"
+ Me.PictureBox2.Size = New System.Drawing.Size(150, 30)
+ Me.PictureBox2.TabIndex = 4
+ Me.PictureBox2.TabStop = False
'
'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.GroupBox1)
- Me.TabPage2.Controls.Add(Me.PictureBox6)
- Me.TabPage2.Controls.Add(Me.GroupBox4)
+ Me.TabPage2.Controls.Add(Me.SoftSubs)
+ Me.TabPage2.Controls.Add(Me.GB_SubLanguage)
+ Me.TabPage2.Controls.Add(Me.GB_Resolution)
Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage2.Size = New System.Drawing.Size(351, 338)
+ Me.TabPage2.Size = New System.Drawing.Size(468, 415)
Me.TabPage2.TabIndex = 1
- Me.TabPage2.Text = "Additional Settings"
+ Me.TabPage2.Text = "Output Settings"
+ '
+ 'SoftSubs
+ '
+ Me.SoftSubs.BackColor = System.Drawing.Color.Transparent
+ Me.SoftSubs.Controls.Add(Me.MergeMP4)
+ Me.SoftSubs.Controls.Add(Me.CBesES)
+ Me.SoftSubs.Controls.Add(Me.CBitIT)
+ Me.SoftSubs.Controls.Add(Me.CBruRU)
+ Me.SoftSubs.Controls.Add(Me.CBarME)
+ Me.SoftSubs.Controls.Add(Me.CBfrFR)
+ Me.SoftSubs.Controls.Add(Me.CBesLA)
+ Me.SoftSubs.Controls.Add(Me.CBptBR)
+ Me.SoftSubs.Controls.Add(Me.CBdeDE)
+ Me.SoftSubs.Controls.Add(Me.CBenUS)
+ Me.SoftSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.SoftSubs.Location = New System.Drawing.Point(6, 134)
+ Me.SoftSubs.Name = "SoftSubs"
+ Me.SoftSubs.Size = New System.Drawing.Size(449, 203)
+ Me.SoftSubs.TabIndex = 49
+ Me.SoftSubs.TabStop = False
+ Me.SoftSubs.Text = "SoftSubs"
+ '
+ 'MergeMP4
+ '
+ Me.MergeMP4.AutoSize = True
+ Me.MergeMP4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.MergeMP4.Location = New System.Drawing.Point(129, 165)
+ Me.MergeMP4.Name = "MergeMP4"
+ Me.MergeMP4.Size = New System.Drawing.Size(194, 20)
+ Me.MergeMP4.TabIndex = 6
+ Me.MergeMP4.Text = "Merge softubs with video file"
+ Me.MergeMP4.UseVisualStyleBackColor = True
+ '
+ 'CBesES
+ '
+ Me.CBesES.AutoSize = True
+ Me.CBesES.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBesES.Location = New System.Drawing.Point(166, 74)
+ Me.CBesES.Name = "CBesES"
+ Me.CBesES.Size = New System.Drawing.Size(135, 20)
+ Me.CBesES.TabIndex = 5
+ Me.CBesES.Text = "Español (España)"
+ Me.CBesES.UseVisualStyleBackColor = True
+ '
+ 'CBitIT
+ '
+ Me.CBitIT.AutoSize = True
+ Me.CBitIT.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBitIT.Location = New System.Drawing.Point(25, 111)
+ Me.CBitIT.Name = "CBitIT"
+ Me.CBitIT.Size = New System.Drawing.Size(116, 20)
+ Me.CBitIT.TabIndex = 5
+ Me.CBitIT.Text = "Italiano (Italian)"
+ Me.CBitIT.UseVisualStyleBackColor = True
+ '
+ 'CBruRU
+ '
+ Me.CBruRU.AutoSize = True
+ Me.CBruRU.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBruRU.Location = New System.Drawing.Point(306, 111)
+ Me.CBruRU.Name = "CBruRU"
+ Me.CBruRU.Size = New System.Drawing.Size(141, 20)
+ Me.CBruRU.TabIndex = 5
+ Me.CBruRU.Text = "Русский (Russian)"
+ Me.CBruRU.UseVisualStyleBackColor = True
+ '
+ 'CBarME
+ '
+ Me.CBarME.AutoSize = True
+ Me.CBarME.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBarME.Location = New System.Drawing.Point(166, 111)
+ Me.CBarME.Name = "CBarME"
+ Me.CBarME.Size = New System.Drawing.Size(108, 20)
+ Me.CBarME.TabIndex = 5
+ Me.CBarME.Text = "العربية (Arabic)"
+ Me.CBarME.UseVisualStyleBackColor = True
+ '
+ 'CBfrFR
+ '
+ Me.CBfrFR.AutoSize = True
+ Me.CBfrFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBfrFR.Location = New System.Drawing.Point(306, 36)
+ Me.CBfrFR.Name = "CBfrFR"
+ Me.CBfrFR.Size = New System.Drawing.Size(132, 20)
+ Me.CBfrFR.TabIndex = 4
+ Me.CBfrFR.Text = "Français (France)"
+ Me.CBfrFR.UseVisualStyleBackColor = True
+ '
+ 'CBesLA
+ '
+ Me.CBesLA.AutoSize = True
+ Me.CBesLA.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBesLA.Location = New System.Drawing.Point(166, 36)
+ Me.CBesLA.Name = "CBesLA"
+ Me.CBesLA.Size = New System.Drawing.Size(104, 20)
+ Me.CBesLA.TabIndex = 3
+ Me.CBesLA.Text = "Español (LA)"
+ Me.CBesLA.UseVisualStyleBackColor = True
+ '
+ 'CBptBR
+ '
+ Me.CBptBR.AutoSize = True
+ Me.CBptBR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBptBR.Location = New System.Drawing.Point(306, 74)
+ Me.CBptBR.Name = "CBptBR"
+ Me.CBptBR.Size = New System.Drawing.Size(133, 20)
+ Me.CBptBR.TabIndex = 2
+ Me.CBptBR.Text = "Português (Brasil)"
+ Me.CBptBR.UseVisualStyleBackColor = True
+ '
+ 'CBdeDE
+ '
+ Me.CBdeDE.AutoSize = True
+ Me.CBdeDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBdeDE.Location = New System.Drawing.Point(25, 74)
+ Me.CBdeDE.Name = "CBdeDE"
+ Me.CBdeDE.Size = New System.Drawing.Size(76, 20)
+ Me.CBdeDE.TabIndex = 1
+ Me.CBdeDE.Text = "Deutsch"
+ Me.CBdeDE.UseVisualStyleBackColor = True
+ '
+ 'CBenUS
+ '
+ Me.CBenUS.AutoSize = True
+ Me.CBenUS.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.CBenUS.Location = New System.Drawing.Point(25, 36)
+ Me.CBenUS.Name = "CBenUS"
+ Me.CBenUS.Size = New System.Drawing.Size(71, 20)
+ Me.CBenUS.TabIndex = 0
+ Me.CBenUS.Text = "English"
+ Me.CBenUS.UseVisualStyleBackColor = True
+ '
+ 'GB_SubLanguage
+ '
+ Me.GB_SubLanguage.BackColor = System.Drawing.Color.Transparent
+ Me.GB_SubLanguage.Controls.Add(Me.ComboBox1)
+ Me.GB_SubLanguage.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black
+ Me.GB_SubLanguage.Location = New System.Drawing.Point(6, 65)
+ Me.GB_SubLanguage.Name = "GB_SubLanguage"
+ Me.GB_SubLanguage.Size = New System.Drawing.Size(449, 63)
+ Me.GB_SubLanguage.TabIndex = 39
+ Me.GB_SubLanguage.TabStop = False
+ Me.GB_SubLanguage.Text = "Sub Sprache"
+ '
+ 'ComboBox1
+ '
+ Me.ComboBox1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.ComboBox1.DropDownHeight = 250
+ Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.ComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.ComboBox1.FormattingEnabled = True
+ Me.ComboBox1.IntegralHeight = False
+ Me.ComboBox1.ItemHeight = 16
+ Me.ComboBox1.Items.AddRange(New Object() {"Deutsch", "English", "Español (España)", "Español (LA)", "Français (France)", "Italiano (Italian)", "Português (Brasil)", "Русский (Russian)", "العربية (Arabic)"})
+ Me.ComboBox1.Location = New System.Drawing.Point(60, 25)
+ Me.ComboBox1.Name = "ComboBox1"
+ Me.ComboBox1.Size = New System.Drawing.Size(326, 22)
+ Me.ComboBox1.Sorted = True
+ Me.ComboBox1.TabIndex = 33
+ '
+ 'GB_Resolution
+ '
+ Me.GB_Resolution.BackColor = System.Drawing.Color.Transparent
+ Me.GB_Resolution.Controls.Add(Me.AAuto)
+ Me.GB_Resolution.Controls.Add(Me.A480p)
+ Me.GB_Resolution.Controls.Add(Me.A360p)
+ Me.GB_Resolution.Controls.Add(Me.A720p)
+ Me.GB_Resolution.Controls.Add(Me.A1080p)
+ Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
+ Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
+ Me.GB_Resolution.Location = New System.Drawing.Point(6, 6)
+ Me.GB_Resolution.Name = "GB_Resolution"
+ Me.GB_Resolution.Size = New System.Drawing.Size(449, 53)
+ Me.GB_Resolution.TabIndex = 38
+ Me.GB_Resolution.TabStop = False
+ Me.GB_Resolution.Text = "Auflösung"
+ '
+ 'AAuto
+ '
+ Me.AAuto.AutoSize = True
+ Me.AAuto.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.AAuto.ForeColor = System.Drawing.Color.Black
+ Me.AAuto.Location = New System.Drawing.Point(377, 21)
+ Me.AAuto.Name = "AAuto"
+ Me.AAuto.Size = New System.Drawing.Size(66, 22)
+ Me.AAuto.TabIndex = 3
+ Me.AAuto.TabStop = True
+ Me.AAuto.Text = "[Auto]"
+ Me.AAuto.UseVisualStyleBackColor = True
+ '
+ 'A480p
+ '
+ Me.A480p.AutoSize = True
+ Me.A480p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.A480p.ForeColor = System.Drawing.Color.Black
+ Me.A480p.Location = New System.Drawing.Point(198, 21)
+ Me.A480p.Name = "A480p"
+ Me.A480p.Size = New System.Drawing.Size(62, 22)
+ Me.A480p.TabIndex = 2
+ Me.A480p.TabStop = True
+ Me.A480p.Text = "480p"
+ Me.A480p.UseVisualStyleBackColor = True
+ '
+ 'A360p
+ '
+ Me.A360p.AutoSize = True
+ Me.A360p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.A360p.ForeColor = System.Drawing.Color.Black
+ Me.A360p.Location = New System.Drawing.Point(286, 21)
+ Me.A360p.Name = "A360p"
+ Me.A360p.Size = New System.Drawing.Size(62, 22)
+ Me.A360p.TabIndex = 2
+ Me.A360p.TabStop = True
+ Me.A360p.Text = "360p"
+ Me.A360p.UseVisualStyleBackColor = True
+ '
+ 'A720p
+ '
+ Me.A720p.AutoSize = True
+ Me.A720p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.A720p.ForeColor = System.Drawing.Color.Black
+ Me.A720p.Location = New System.Drawing.Point(119, 21)
+ Me.A720p.Name = "A720p"
+ Me.A720p.Size = New System.Drawing.Size(62, 22)
+ Me.A720p.TabIndex = 1
+ Me.A720p.TabStop = True
+ Me.A720p.Text = "720p"
+ Me.A720p.UseVisualStyleBackColor = True
+ '
+ 'A1080p
+ '
+ Me.A1080p.AutoSize = True
+ Me.A1080p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.A1080p.ForeColor = System.Drawing.Color.Black
+ Me.A1080p.Location = New System.Drawing.Point(25, 21)
+ Me.A1080p.Name = "A1080p"
+ Me.A1080p.Size = New System.Drawing.Size(71, 22)
+ Me.A1080p.TabIndex = 0
+ Me.A1080p.TabStop = True
+ Me.A1080p.Text = "1080p"
+ Me.A1080p.UseVisualStyleBackColor = True
+ '
+ 'TabPage3
+ '
+ Me.TabPage3.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer))
+ Me.TabPage3.Controls.Add(Me.GroupBox3)
+ Me.TabPage3.Controls.Add(Me.MultiDLSoftSubs)
+ Me.TabPage3.Location = New System.Drawing.Point(4, 22)
+ Me.TabPage3.Name = "TabPage3"
+ Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
+ Me.TabPage3.Size = New System.Drawing.Size(468, 415)
+ Me.TabPage3.TabIndex = 2
+ Me.TabPage3.Text = "Subtile Download"
+ '
+ 'GroupBox3
+ '
+ Me.GroupBox3.BackColor = System.Drawing.Color.Transparent
+ Me.GroupBox3.Controls.Add(Me.PictureBox5)
+ Me.GroupBox3.Controls.Add(Me.StatusLabel)
+ Me.GroupBox3.Controls.Add(Me.TextBox2)
+ Me.GroupBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox3.Location = New System.Drawing.Point(9, 6)
+ Me.GroupBox3.Name = "GroupBox3"
+ Me.GroupBox3.Size = New System.Drawing.Size(450, 162)
+ Me.GroupBox3.TabIndex = 46
+ Me.GroupBox3.TabStop = False
+ Me.GroupBox3.Text = "Single Download "
+ '
+ 'PictureBox5
+ '
+ Me.PictureBox5.BackColor = System.Drawing.Color.Transparent
+ Me.PictureBox5.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox5.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.softsubs_download
+ Me.PictureBox5.Location = New System.Drawing.Point(24, 116)
+ Me.PictureBox5.Name = "PictureBox5"
+ Me.PictureBox5.Size = New System.Drawing.Size(403, 36)
+ Me.PictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+ Me.PictureBox5.TabIndex = 46
+ Me.PictureBox5.TabStop = False
+ '
+ 'StatusLabel
+ '
+ Me.StatusLabel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.StatusLabel.BackColor = System.Drawing.Color.Transparent
+ Me.StatusLabel.Font = New System.Drawing.Font("Arial", 12.0!)
+ Me.StatusLabel.ForeColor = System.Drawing.SystemColors.InactiveCaptionText
+ Me.StatusLabel.Location = New System.Drawing.Point(8, 71)
+ Me.StatusLabel.Name = "StatusLabel"
+ Me.StatusLabel.Size = New System.Drawing.Size(433, 29)
+ Me.StatusLabel.TabIndex = 38
+ Me.StatusLabel.Text = "Status: idle"
+ Me.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+ '
+ 'TextBox2
+ '
+ Me.TextBox2.BackColor = System.Drawing.Color.White
+ Me.TextBox2.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.TextBox2.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.TextBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+ Me.TextBox2.Location = New System.Drawing.Point(6, 35)
+ Me.TextBox2.Name = "TextBox2"
+ Me.TextBox2.Size = New System.Drawing.Size(435, 22)
+ Me.TextBox2.TabIndex = 4
+ Me.TextBox2.TabStop = False
+ Me.TextBox2.Text = "URL"
+ Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center
+ '
+ 'MultiDLSoftSubs
+ '
+ Me.MultiDLSoftSubs.BackColor = System.Drawing.Color.Transparent
+ Me.MultiDLSoftSubs.Controls.Add(Me.SoftSubsMass)
+ Me.MultiDLSoftSubs.Controls.Add(Me.PictureBox3)
+ Me.MultiDLSoftSubs.Controls.Add(Me.comboBox4)
+ Me.MultiDLSoftSubs.Controls.Add(Me.ComboBox2)
+ Me.MultiDLSoftSubs.Controls.Add(Me.comboBox3)
+ Me.MultiDLSoftSubs.Enabled = False
+ Me.MultiDLSoftSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.MultiDLSoftSubs.Location = New System.Drawing.Point(9, 174)
+ Me.MultiDLSoftSubs.Name = "MultiDLSoftSubs"
+ Me.MultiDLSoftSubs.Size = New System.Drawing.Size(450, 223)
+ Me.MultiDLSoftSubs.TabIndex = 45
+ Me.MultiDLSoftSubs.TabStop = False
+ Me.MultiDLSoftSubs.Text = "Multi Download"
+ '
+ 'SoftSubsMass
+ '
+ Me.SoftSubsMass.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+ Or System.Windows.Forms.AnchorStyles.Left) _
+ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.SoftSubsMass.BackColor = System.Drawing.Color.Transparent
+ Me.SoftSubsMass.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.SoftSubsMass.ForeColor = System.Drawing.Color.Black
+ Me.SoftSubsMass.Location = New System.Drawing.Point(6, 130)
+ Me.SoftSubsMass.Name = "SoftSubsMass"
+ Me.SoftSubsMass.Size = New System.Drawing.Size(438, 26)
+ Me.SoftSubsMass.TabIndex = 46
+ Me.SoftSubsMass.Text = "Status: idle"
+ Me.SoftSubsMass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+ '
+ 'PictureBox3
+ '
+ Me.PictureBox3.BackColor = System.Drawing.Color.Transparent
+ Me.PictureBox3.Cursor = System.Windows.Forms.Cursors.Hand
+ Me.PictureBox3.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.softsubs_download_gray
+ Me.PictureBox3.Location = New System.Drawing.Point(24, 169)
+ Me.PictureBox3.Name = "PictureBox3"
+ Me.PictureBox3.Size = New System.Drawing.Size(403, 36)
+ Me.PictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+ Me.PictureBox3.TabIndex = 45
+ Me.PictureBox3.TabStop = False
+ '
+ 'comboBox4
+ '
+ Me.comboBox4.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.comboBox4.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.comboBox4.FormattingEnabled = True
+ Me.comboBox4.Location = New System.Drawing.Point(6, 97)
+ Me.comboBox4.Name = "comboBox4"
+ Me.comboBox4.Size = New System.Drawing.Size(441, 23)
+ Me.comboBox4.TabIndex = 2
+ '
+ 'ComboBox2
+ '
+ Me.ComboBox2.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.ComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.ComboBox2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.ComboBox2.FormattingEnabled = True
+ Me.ComboBox2.Location = New System.Drawing.Point(6, 25)
+ Me.ComboBox2.Name = "ComboBox2"
+ Me.ComboBox2.Size = New System.Drawing.Size(441, 23)
+ Me.ComboBox2.TabIndex = 1
+ '
+ 'comboBox3
+ '
+ Me.comboBox3.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
+ Me.comboBox3.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.comboBox3.FormattingEnabled = True
+ Me.comboBox3.Location = New System.Drawing.Point(6, 62)
+ Me.comboBox3.Name = "comboBox3"
+ Me.comboBox3.Size = New System.Drawing.Size(441, 23)
+ Me.comboBox3.TabIndex = 1
'
'einstellungen
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background
- Me.ClientSize = New System.Drawing.Size(379, 470)
+ Me.ClientSize = New System.Drawing.Size(500, 550)
Me.Controls.Add(Me.TabControl1)
Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.pictureBox1)
@@ -406,55 +699,82 @@ Partial Class einstellungen
Me.MinimizeBox = False
Me.Name = "einstellungen"
Me.Text = "crunchyroll downloader"
- Me.GB_Resolution.ResumeLayout(False)
- Me.GB_Resolution.PerformLayout()
- Me.GB_SubLanguage.ResumeLayout(False)
- CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
Me.GB_Sub_Path.ResumeLayout(False)
Me.GB_Sub_Path.PerformLayout()
- Me.GroupBox4.ResumeLayout(False)
- CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
Me.DL_Count_simultaneous.ResumeLayout(False)
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
- Me.GroupBox1.ResumeLayout(False)
- Me.GroupBox1.PerformLayout()
- CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabControl1.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False)
+ Me.TabPage1.PerformLayout()
+ CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.GroupBox1.ResumeLayout(False)
+ Me.GroupBox1.PerformLayout()
+ Me.GroupBox4.ResumeLayout(False)
+ CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
Me.TabPage2.ResumeLayout(False)
- Me.TabPage2.PerformLayout()
+ Me.SoftSubs.ResumeLayout(False)
+ Me.SoftSubs.PerformLayout()
+ Me.GB_SubLanguage.ResumeLayout(False)
+ Me.GB_Resolution.ResumeLayout(False)
+ Me.GB_Resolution.PerformLayout()
+ Me.TabPage3.ResumeLayout(False)
+ Me.GroupBox3.ResumeLayout(False)
+ Me.GroupBox3.PerformLayout()
+ CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.MultiDLSoftSubs.ResumeLayout(False)
+ CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
End Sub
-
- Friend WithEvents GB_Resolution As GroupBox
- Friend WithEvents GB_SubLanguage As GroupBox
- Friend WithEvents A360p As RadioButton
- Friend WithEvents A720p As RadioButton
- Friend WithEvents A1080p As RadioButton
Friend WithEvents GB_Sub_Path As GroupBox
Friend WithEvents RBStaffel As RadioButton
Friend WithEvents RBAnime As RadioButton
Friend WithEvents ToolTip1 As ToolTip
- Friend WithEvents GroupBox4 As GroupBox
- Friend WithEvents A480p As RadioButton
Friend WithEvents DL_Count_simultaneous As GroupBox
Friend WithEvents NumericUpDown1 As NumericUpDown
- Friend WithEvents ComboBox1 As ComboBox
Private WithEvents pictureBox1 As PictureBox
Private WithEvents pictureBox4 As PictureBox
- Private WithEvents PictureBox2 As PictureBox
- Friend WithEvents GroupBox1 As GroupBox
- Friend WithEvents Firefox_True As CheckBox
- Private WithEvents PictureBox5 As PictureBox
- Private WithEvents PictureBox6 As PictureBox
Friend WithEvents TabControl1 As TabControl
Friend WithEvents TabPage1 As TabPage
Friend WithEvents TabPage2 As TabPage
+ Friend WithEvents GroupBox1 As GroupBox
Friend WithEvents Label1 As Label
Friend WithEvents TextBox1 As TextBox
+ Friend WithEvents Firefox_True As CheckBox
+ Friend WithEvents GroupBox4 As GroupBox
+ Private WithEvents PictureBox2 As PictureBox
+ Friend WithEvents GB_SubLanguage As GroupBox
+ Friend WithEvents ComboBox1 As ComboBox
+ Friend WithEvents GB_Resolution As GroupBox
Friend WithEvents AAuto As RadioButton
+ Friend WithEvents A480p As RadioButton
+ Friend WithEvents A360p As RadioButton
+ Friend WithEvents A720p As RadioButton
+ Friend WithEvents A1080p As RadioButton
+ Friend WithEvents SoftSubs As GroupBox
+ Friend WithEvents CBesES As CheckBox
+ Friend WithEvents CBitIT As CheckBox
+ Friend WithEvents CBruRU As CheckBox
+ Friend WithEvents CBarME As CheckBox
+ Friend WithEvents CBfrFR As CheckBox
+ Friend WithEvents CBesLA As CheckBox
+ Friend WithEvents CBptBR As CheckBox
+ Friend WithEvents CBdeDE As CheckBox
+ Friend WithEvents CBenUS As CheckBox
+ Private WithEvents PictureBox6 As PictureBox
+ Friend WithEvents MergeMP4 As CheckBox
+ Friend WithEvents TabPage3 As TabPage
+ Public WithEvents GroupBox3 As GroupBox
+ Public WithEvents PictureBox5 As PictureBox
+ Public WithEvents StatusLabel As Label
+ Public WithEvents TextBox2 As TextBox
+ Public WithEvents MultiDLSoftSubs As GroupBox
+ Public WithEvents SoftSubsMass As Label
+ Public WithEvents PictureBox3 As PictureBox
+ Public WithEvents comboBox4 As ComboBox
+ Public WithEvents ComboBox2 As ComboBox
+ Public WithEvents comboBox3 As ComboBox
End Class
diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx
index beae4c1..e733a2d 100644
--- a/Crunchyroll Downloader/einstellungen.resx
+++ b/Crunchyroll Downloader/einstellungen.resx
@@ -120,4 +120,7 @@
17, 17
+
+ 17, 17
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb
index 5e884d1..4d956c2 100644
--- a/Crunchyroll Downloader/einstellungen.vb
+++ b/Crunchyroll Downloader/einstellungen.vb
@@ -6,8 +6,32 @@ Imports System.Net
Public Class einstellungen
Private Sub einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ For i As Integer = 0 To Main.SoftSubs.Count - 1
+ If Main.SoftSubs(i) = "deDE" Then
+ CBdeDE.Checked = True
+ ElseIf Main.SoftSubs(i) = "enUS" Then
+ CBenUS.Checked = True
+ ElseIf Main.SoftSubs(i) = "ptBR" Then
+ CBptBR.Checked = True
+ ElseIf Main.SoftSubs(i) = "esLA" Then
+ CBesLA.Checked = True
+ ElseIf Main.SoftSubs(i) = "frFR" Then
+ CBfrFR.Checked = True
+ ElseIf Main.SoftSubs(i) = "arME" Then
+ CBarME.Checked = True
+ ElseIf Main.SoftSubs(i) = "ruRU" Then
+ CBruRU.Checked = True
+ ElseIf Main.SoftSubs(i) = "itIT" Then
+ CBitIT.Checked = True
+ ElseIf Main.SoftSubs(i) = "esES" Then
+ CBesES.Checked = True
+ End If
+ Next
Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2)
Me.Icon = My.Resources.icon
+ If Main.MergeSubstoMP4 = True Then
+ MergeMP4.Checked = True
+ End If
Try
GB_Resolution.Text = Main.GB_Resolution_Text
GB_SubLanguage.Text = Main.GB_SubLanguage_Text
@@ -155,6 +179,13 @@ Public Class einstellungen
rk.SetValue("Sub", "None", RegistryValueKind.String)
End If
+ If MergeMP4.Checked = True Then
+ Main.MergeSubstoMP4 = True
+ rk.SetValue("MergeMP4", "1", RegistryValueKind.String)
+ Else
+ Main.MergeSubstoMP4 = False
+ rk.SetValue("MergeMP4", "0", RegistryValueKind.String)
+ End If
'If RawVideo.Checked = True Then
' Main.SoftSubs = True
' rk.SetValue("RawVideo", 1, RegistryValueKind.String)
@@ -177,6 +208,49 @@ Public Class einstellungen
ElseIf Firefox_True.Checked = False Then
rk.SetValue("NoUse", 0, RegistryValueKind.String)
End If
+#Region "sof subs"
+ Main.SoftSubs.Clear()
+ If CBdeDE.Checked = True Then
+ Main.SoftSubs.Add("deDE")
+ End If
+ If CBenUS.Checked = True Then
+ Main.SoftSubs.Add("enUS")
+ End If
+ If CBptBR.Checked = True Then
+ Main.SoftSubs.Add("ptBR")
+ End If
+ If CBesLA.Checked = True Then
+ Main.SoftSubs.Add("esLA")
+ End If
+ If CBfrFR.Checked = True Then
+ Main.SoftSubs.Add("frFR")
+ End If
+ If CBarME.Checked = True Then
+ Main.SoftSubs.Add("arME")
+ End If
+ If CBruRU.Checked = True Then
+ Main.SoftSubs.Add("ruRU")
+ End If
+ If CBitIT.Checked = True Then
+ Main.SoftSubs.Add("itIT")
+ End If
+ If CBesES.Checked = True Then
+ Main.SoftSubs.Add("esES")
+ End If
+
+ Dim SaveString As String = Nothing
+ For ii As Integer = 0 To Main.SoftSubs.Count - 1
+ If SaveString = Nothing Then
+ SaveString = Main.SoftSubs(ii)
+ Else
+ SaveString = SaveString + "," + Main.SoftSubs(ii)
+ End If
+ Next
+ If SaveString = Nothing Then
+ SaveString = "none"
+ End If
+ rk.SetValue("AddedSubs", SaveString, RegistryValueKind.String)
+#End Region
Me.Close()
End Sub
@@ -194,44 +268,13 @@ Public Class einstellungen
Next
Return C
End Function
- Private Sub pictureBox3_Click(sender As Object, e As EventArgs)
- Main.LoginOnly = "US_UnBlock"
- GeckoFX.keks = InputBox("Please insert the cookie below.")
- If GeckoFX.keks = Nothing Then Exit Sub
- GeckoFX.Show()
- GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/")
- End Sub
-
- Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles PictureBox2.Click
+ Private Sub PictureBox2_Click(sender As Object, e As EventArgs)
Main.LoginOnly = "US_UnBlock"
Dim wb As New WebClient
Dim Session As String = wb.DownloadString("https://api.criater-stiftung.org/cr-cookie-hama3254.php") '"https://api1.cr-unblocker.com/getsession.php?version=1.1&device_type=com.crunchyroll.windows.desktop&access_token=LNDJgOit5yaRIWN&device_id=" + GeräteID())
- 'MsgBox(Session)
- 'If CBool(InStr(Session, "bad_request")) Then
- 'Session = wb.DownloadString("https://api2.cr-unblocker.com/start_session?version=1.1&device_type=com.crunchyroll.iphone&access_token=QWjz212GspMHH9h&device_id=" + GeräteID())
- 'End If
- 'If CBool(InStr(Session, "bad_request")) Then
- ' MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
- ' Exit Sub
- 'ElseIf CBool(InStr(Session, "Unauthenticated request")) Then
- ' MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
- ' Exit Sub
- ' 'ElseIf CBool(InStr(Session, chr(34) + "country_code" + chr(34) + ":" + chr(34) + "US" + chr(34))) = False Then
- ' 'MsgBox(Main.CR_Unlock_Error_String, MsgBoxStyle.OkOnly)
- ' 'Exit Sub
- 'Else
- 'MsgBox(Session)
GeckoFX.Show()
- GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/")
- 'Dim SessionID1 As String() = Session.Split(New String() {Chr(34) + "session_id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
- 'Dim SessionID2 As String() = SessionID1(1).Split(New [Char]() {Chr(34)})
- GeckoFX.keks = Session.Replace(" ", "") 'SessionID2(0)
-
- 'End If
- 'MsgBox(Session)
- 'Dim JS As String = "javascript:console.log(`got session id.Setting cookie " + GeckoFX.keks + ".`);browser.cookies.set({url:`http:name:'session_id',value:" + GeckoFX.keks + ",domain:`crunchyroll.com`,httpOnly:true},()=>{browser.cookies.set({url:`http:name:'sess_id',value:" + GeckoFX.keks + ",domain:`crunchyroll.com`,httpOnly:true},()=>{browser.cookies.set({url:`http:name:'c_locale',value:'enUS',domain:`crunchyroll.com`,httpOnly:true}})});"
-
+ GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/")
End Sub
Private Function GeräteID() As String
@@ -258,14 +301,6 @@ Public Class einstellungen
pictureBox1.BackColor = Color.Transparent
End Sub
- Private Sub pictureBox3_MouseEnter(sender As Object, e As EventArgs)
- 'pictureBox3.Image = My.Resources.crdsettings_setowncookie_button_hover
- End Sub
-
- Private Sub pictureBox3_MouseLeave(sender As Object, e As EventArgs)
- 'pictureBox3.Image = My.Resources.crdsettings_setowncookie_button
- End Sub
-
Private Sub pictureBox4_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox4.MouseEnter
pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit_hover
End Sub
@@ -322,7 +357,7 @@ Public Class einstellungen
- Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem
+ Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem
sender.BackColor = Color.White
If e.Index >= 0 Then
Using st As New StringFormat With {.Alignment = StringAlignment.Center}
@@ -335,18 +370,6 @@ Public Class einstellungen
End If
End Sub
- Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
- 'MsgBox("Crunchyroll removed the softsubs, there are not available anymore.", MsgBoxStyle.OkOnly)
- SoftSub.ShowDialog()
- End Sub
-
- Private Sub PictureBox5_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox5.MouseEnter
- PictureBox5.Image = My.Resources.settings_add_softsubs_hover
- End Sub
-
- Private Sub PictureBox5_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox5.MouseLeave
- PictureBox5.Image = My.Resources.settings_add_softsubs
- End Sub
Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click
Startup.ShowDialog()
@@ -354,27 +377,97 @@ Public Class einstellungen
#End Region
- Private Sub PictureBox6_MouseEnter(sender As Object, e As EventArgs)
+ Private Sub PictureBox6_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox6.MouseEnter
PictureBox6.Image = My.Resources.main_credits_hover
End Sub
- Private Sub PictureBox6_MouseLeave(sender As Object, e As EventArgs)
+ Private Sub PictureBox6_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox6.MouseLeave
PictureBox6.Image = My.Resources.main_credits_default
End Sub
- Private Sub Button1_Click_1(sender As Object, e As EventArgs)
- GeckoFX.WebBrowser1.Navigate("about:config")
+ Private Sub AAuto_Click(sender As Object, e As EventArgs) Handles AAuto.Click
+ If MergeMP4.Checked = True 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
+ End If
+ End If
+ End If
End Sub
- Private Sub RadioButton1_CheckedChanged(sender As Object, e As EventArgs) Handles AAuto.CheckedChanged
+ Private Sub MergeMP4_Click(sender As Object, e As EventArgs) Handles MergeMP4.Click
+ If MergeMP4.Checked = True 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
+ End If
+ End If
+ End If
+ End Sub
+
+ Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
+ If CBool(InStr(TextBox2.Text, "crunchyroll.com")) Then
+ GeckoFX.WebBrowser1.Navigate(TextBox2.Text)
+ StatusLabel.Text = "Status: looking for subtitles"
+ Main.d = False
+ Main.b = False
+ End If
End Sub
- Private Sub GB_SubLanguage_Enter(sender As Object, e As EventArgs) Handles GB_SubLanguage.Enter
-
+ Private Sub PictureBox3_Click(sender As Object, e As EventArgs) Handles PictureBox3.Click
+ Main.MassSubsDL()
End Sub
+ Private Sub PictureBox3_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox3.MouseEnter
+ PictureBox3.Image = My.Resources.softsubs_download_hover
+ End Sub
+ Private Sub PictureBox3_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox3.MouseLeave
+ PictureBox3.Image = My.Resources.softsubs_download
+ End Sub
+ Private Sub PictureBox5_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox5.MouseEnter
+ PictureBox5.Image = My.Resources.softsubs_download_hover
+ End Sub
+
+ Private Sub PictureBox5_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox5.MouseLeave
+ PictureBox5.Image = My.Resources.softsubs_download
+ End Sub
+
+ Private Sub TextBox2_Click(sender As Object, e As EventArgs) Handles TextBox2.Click
+ If TextBox2.Text = "URL" Then
+ TextBox2.Text = Nothing
+ End If
+ End Sub
+
+ Private Sub ComboBox2_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox2.SelectedIndexChanged
+
+ comboBox3.Items.Clear()
+ comboBox4.Items.Clear()
+ Dim SeasonDropdownAnzahl As String() = Main.WebbrowserText.Split(New String() {"season-dropdown content-menu block"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Array.Reverse(SeasonDropdownAnzahl)
+ Dim SDV As Integer = 0
+ For i As Integer = 0 To SeasonDropdownAnzahl.Count - 1
+ If InStr(SeasonDropdownAnzahl(i), Chr(34) + ">" + ComboBox2.SelectedItem.ToString + "") Then
+ SDV = i
+ End If
+ Next
+ Dim Anzahl As String() = SeasonDropdownAnzahl(SDV).Split(New String() {"wrapper container-shadow hover-classes"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim c As Integer = Anzahl.Count - 1
+ Array.Reverse(Anzahl)
+ For i As Integer = 0 To Anzahl.Count - 2
+ Dim URLGrapp As String() = Anzahl(i).Split(New String() {"title=" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ Dim URLGrapp2 As String() = URLGrapp(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+ comboBox3.Items.Add(URLGrapp2(0))
+ comboBox4.Items.Add(URLGrapp2(0))
+ Next
+ End Sub
#End Region
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe
index 548bc3f..d1005e4 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb
index b790ac5..def3505 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
index b12ab83..541f5ae 100644
--- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
+++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-2f3d561e57fba3d5ed06087aba83d29826ede4fb
+03c44a8ecd06599a1e72803d9a2714315e3ebee0
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
index 3f73334..4115113 100644
--- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
+++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
@@ -29,7 +29,6 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crun
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Anime_Add.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.einstellungen.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.GeckoFX.resources
-D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.SoftSub.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Startup.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Resources.resources
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache
index c7ad70c..6065d3b 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml
index 459cbde..0dcb4ad 100644
--- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml
+++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml
@@ -306,6 +306,21 @@ Crunchyroll Downloader
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
+
+
+ Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+
+
Sucht eine lokalisierte Zeichenfolge, die <!DOCTYPE html>
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources
index 22486b2..b7a11d8 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.SoftSub.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.SoftSub.resources
deleted file mode 100644
index 6c05a97..0000000
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.SoftSub.resources and /dev/null differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index c720afd..ef888ec 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll
index 02a6ce4..37ec8df 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll and b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll differ
diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe
index c7ece3c..ad45d60 100644
Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb
index 6c8e6e6..1a8b076 100644
Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache
index 26e7235..d03aa06 100644
Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll Downloader.vbproj.GenerateResource.cache differ
diff --git a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources
index 22486b2..05411fb 100644
Binary files a/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources and b/Crunchyroll Downloader/obj/x86/Release/Crunchyroll_Downloader.Resources.resources differ