diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 99c871e..b3342e5 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 20eb8e0..fdd9d95 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 20c0b99..b9a2746 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 85ce448..40d64e1 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/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index ce93a7a..ee2a00c 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -146,6 +146,12 @@ Form + + Funimation.vb + + + Form + GeckoFX.vb @@ -212,6 +218,9 @@ Form1.vb + + Funimation.vb + GeckoFX.vb @@ -273,6 +282,7 @@ + diff --git a/Crunchyroll Downloader/Funimation.Designer.vb b/Crunchyroll Downloader/Funimation.Designer.vb new file mode 100644 index 0000000..6f7cbb9 --- /dev/null +++ b/Crunchyroll Downloader/Funimation.Designer.vb @@ -0,0 +1,39 @@ + _ +Partial Class Funimation + 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.SuspendLayout() + ' + 'Funimation + ' + 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.Funimation + Me.ClientSize = New System.Drawing.Size(600, 400) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "Funimation" + Me.Text = "Funimation" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/Crunchyroll Downloader/Funimation.resx b/Crunchyroll Downloader/Funimation.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Crunchyroll Downloader/Funimation.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Funimation.vb b/Crunchyroll Downloader/Funimation.vb new file mode 100644 index 0000000..d92ed8b --- /dev/null +++ b/Crunchyroll Downloader/Funimation.vb @@ -0,0 +1,3 @@ +Public Class Funimation + +End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 1886b9e..462953e 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1958,8 +1958,13 @@ Public Class Main Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) UsedSub = SubTitle2(SubTitle2.Count - 1) + ".dfxp" Else - MsgBox("No Subtitle found in the website, a logfile was created.", "No Subtitle", MsgBoxStyle.Exclamation) - File.WriteAllText(Path.Combine(Application.StartupPath + "No Subtitle for" + FunimationName3 + ".log"), PlayerPage, Encoding.UTF8) + If MessageBox.Show("No Subtitle found in the website, a logfile was created." + vbNewLine + "Press 'Yes' to download the video without subtitle", "No Subtitle", MessageBoxButtons.YesNo) = DialogResult.Yes Then + File.WriteAllText(Path.Combine(Application.StartupPath + "No Subtitle for" + FunimationName3 + ".log"), PlayerPage, Encoding.UTF8) + Else + File.WriteAllText(Path.Combine(Application.StartupPath + "No Subtitle for" + FunimationName3 + ".log"), PlayerPage, Encoding.UTF8) + Exit Sub + End If + 'MsgBox("No Subtitle found in the website, a logfile was created.", MsgBoxStyle.OkCancel, "No Subtitle") End If Else @@ -2041,4 +2046,6 @@ Public Class Main Private Sub Main_Click(sender As Object, e As EventArgs) Handles Me.Click 'Form1.Show() End Sub + + End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/My Project/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb index 9e2d3c4..e25b107 100644 --- a/Crunchyroll Downloader/My Project/Resources.Designer.vb +++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb @@ -267,6 +267,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Funimation() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Funimation", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die src="/player/ ähnelt. ''' diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx index d11424f..d95a44e 100644 --- a/Crunchyroll Downloader/My Project/Resources.resx +++ b/Crunchyroll Downloader/My Project/Resources.resx @@ -391,4 +391,7 @@ I delete the curremt session with the unlock, if you want to be logged in with t ", "kind": "subtitle", "type": "Full", "language": "en" + + ..\Resources\Funimation.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/Funimation.png b/Crunchyroll Downloader/Resources/Funimation.png new file mode 100644 index 0000000..47eb6e2 Binary files /dev/null and b/Crunchyroll Downloader/Resources/Funimation.png differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index e5419b9..4d53498 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 d08d224..68ad9a2 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/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index e5419b9..4d53498 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 d08d224..68ad9a2 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 5ec28eb..38546d4 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 @@ -348eb56a763eaa729d1b1d6687372d0a26db13f4 +cefe51d20d88b736cd176d833fae1bd9693909fe diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 9935711..30f9711 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 ebe7e9e..4b50879 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