diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 653b028..0b78d06 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/Anime_Add.Designer.vb b/Crunchyroll Downloader/Anime_Add.Designer.vb index 37f788d..115167c 100644 --- a/Crunchyroll Downloader/Anime_Add.Designer.vb +++ b/Crunchyroll Downloader/Anime_Add.Designer.vb @@ -31,17 +31,13 @@ Partial Class Anime_Add Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox() Me.TextBox4 = New MetroFramework.Controls.MetroTextBox() Me.textBox1 = New MetroFramework.Controls.MetroTextBox() - Me.TextBox2 = New MetroFramework.Controls.MetroTextBox() - - - Me.groupBox2 = New System.Windows.Forms.GroupBox() Me.comboBox4 = New MetroFramework.Controls.MetroComboBox() Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox() Me.comboBox3 = New MetroFramework.Controls.MetroComboBox() - Me.Add_Display = New MetroFramework.Controls.MetroLabel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() + Me.Add_Display = New MetroFramework.Controls.MetroLabel() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.ListBox1 = New System.Windows.Forms.ListBox() Me.Timer1 = New System.Windows.Forms.Timer(Me.components) @@ -194,43 +190,43 @@ Partial Class Anime_Add Me.textBox1.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) Me.textBox1.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) ' - + 'TextBox2 ' - Me.textBox2.BackColor = System.Drawing.Color.White - Me.textBox2.Cursor = System.Windows.Forms.Cursors.Hand + Me.TextBox2.BackColor = System.Drawing.Color.White + Me.TextBox2.Cursor = System.Windows.Forms.Cursors.Hand ' ' ' - Me.textBox2.CustomButton.Image = Nothing - Me.textBox2.CustomButton.Location = New System.Drawing.Point(665, 1) - Me.textBox2.CustomButton.Name = "" - Me.textBox2.CustomButton.Size = New System.Drawing.Size(27, 27) - Me.textBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue - Me.textBox2.CustomButton.TabIndex = 1 - Me.textBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light - Me.textBox2.CustomButton.UseSelectable = True - Me.textBox2.CustomButton.Visible = False - Me.textBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium - Me.textBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.textBox2.Lines = New String() {"Use Custom Name"} - Me.textBox2.Location = New System.Drawing.Point(18, 64) - Me.textBox2.MaxLength = 32767 - Me.textBox2.Name = "textBox2" - Me.textBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) - Me.textBox2.ScrollBars = System.Windows.Forms.ScrollBars.None - Me.textBox2.SelectedText = "" - Me.textBox2.SelectionLength = 0 - Me.textBox2.SelectionStart = 0 - Me.textBox2.ShortcutsEnabled = True - Me.textBox2.Size = New System.Drawing.Size(693, 29) - Me.textBox2.TabIndex = 5 - Me.textBox2.TabStop = False - Me.textBox2.Text = "Use Custom Name" - Me.textBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center - Me.textBox2.UseSelectable = True - Me.textBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) - Me.textBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) - + Me.TextBox2.CustomButton.Image = Nothing + Me.TextBox2.CustomButton.Location = New System.Drawing.Point(665, 1) + Me.TextBox2.CustomButton.Name = "" + Me.TextBox2.CustomButton.Size = New System.Drawing.Size(27, 27) + Me.TextBox2.CustomButton.Style = MetroFramework.MetroColorStyle.Blue + Me.TextBox2.CustomButton.TabIndex = 1 + Me.TextBox2.CustomButton.Theme = MetroFramework.MetroThemeStyle.Light + Me.TextBox2.CustomButton.UseSelectable = True + Me.TextBox2.CustomButton.Visible = False + Me.TextBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium + Me.TextBox2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.TextBox2.Lines = New String() {"Use Custom Name"} + Me.TextBox2.Location = New System.Drawing.Point(18, 64) + Me.TextBox2.MaxLength = 32767 + Me.TextBox2.Name = "TextBox2" + Me.TextBox2.PasswordChar = Global.Microsoft.VisualBasic.ChrW(0) + Me.TextBox2.ScrollBars = System.Windows.Forms.ScrollBars.None + Me.TextBox2.SelectedText = "" + Me.TextBox2.SelectionLength = 0 + Me.TextBox2.SelectionStart = 0 + Me.TextBox2.ShortcutsEnabled = True + Me.TextBox2.Size = New System.Drawing.Size(693, 29) + Me.TextBox2.TabIndex = 5 + Me.TextBox2.TabStop = False + Me.TextBox2.Text = "Use Custom Name" + Me.TextBox2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center + Me.TextBox2.UseSelectable = True + Me.TextBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer)) + Me.TextBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel) + ' 'groupBox2 ' Me.groupBox2.BackColor = System.Drawing.Color.Transparent @@ -279,6 +275,18 @@ Partial Class Anime_Add Me.comboBox3.TabIndex = 1 Me.comboBox3.UseSelectable = True ' + '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.add_mass_cancel + Me.PictureBox1.Location = New System.Drawing.Point(159, 231) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(403, 36) + Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage + Me.PictureBox1.TabIndex = 45 + Me.PictureBox1.TabStop = False + ' 'Add_Display ' Me.Add_Display.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -295,18 +303,6 @@ Partial Class Anime_Add Me.Add_Display.Text = "..." Me.Add_Display.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' - '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.add_mass_cancel - Me.PictureBox1.Location = New System.Drawing.Point(159, 231) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(403, 36) - Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage - Me.PictureBox1.TabIndex = 45 - Me.PictureBox1.TabStop = False - ' 'GroupBox3 ' Me.GroupBox3.BackColor = System.Drawing.Color.Transparent @@ -386,9 +382,6 @@ Partial Class Anime_Add ' Me.Timer3.Enabled = True ' - 'BackgroundWorker1 - ' - ' 'Anime_Add ' Me.ApplyImageInvert = True @@ -398,12 +391,10 @@ Partial Class Anime_Add Me.Controls.Add(Me.btn_dl) Me.Controls.Add(Me.Btn_min) Me.Controls.Add(Me.Btn_Close) - + Me.Controls.Add(Me.groupBox2) Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.GroupBox3) - Me.Controls.Add(Me.groupBox2) Me.Font = New System.Drawing.Font("Arial", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Name = "Anime_Add" Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20) Me.Text = "Add Video" diff --git a/Crunchyroll Downloader/Anime_Add.resx b/Crunchyroll Downloader/Anime_Add.resx index 03c11bf..16966ea 100644 --- a/Crunchyroll Downloader/Anime_Add.resx +++ b/Crunchyroll Downloader/Anime_Add.resx @@ -127,7 +127,7 @@ iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa + wwAADsMBx2+oZAAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg== diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 1920039..2cbebf7 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -1,25 +1,25 @@ - + - + - + - - + + - - + + - + - + diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index 075a460..1cc61d8 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -1,8 +1,8 @@  + + - - Debug @@ -421,10 +421,10 @@ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - + + \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index cd9dd1a..af80a40 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -2075,6 +2075,8 @@ Public Class Main End If End If #End Region + + If SubsOnly = False Then If Reso = 42 And HybridMode = False Then If MergeSubs = True Then @@ -2157,6 +2159,9 @@ Public Class Main If SubsOnly = True Then URL_DL = "-i [Subtitles only]" End If + + + Me.Invoke(New Action(Function() As Object ListItemAdd(Path.GetFileName(Pfad_DL.Replace(Chr(34), "")), L1Name, L2Name, ResoHTMLDisplay, Subsprache3, SubValuesToDisplay(), thumbnail3, URL_DL, Pfad_DL) Return Nothing @@ -3322,18 +3327,32 @@ Public Class Main Next End Select Next + Dim First As Integer = 0 Dim Last As Integer = 0 + Dim Anzahl As Integer = 0 + If Anime_Add.comboBox4.SelectedIndex > Anime_Add.comboBox3.SelectedIndex Then First = Anime_Add.comboBox3.SelectedIndex Last = Anime_Add.comboBox4.SelectedIndex + Anzahl = Last - First + 1 + ElseIf Anime_Add.comboBox4.SelectedIndex < Anime_Add.comboBox3.SelectedIndex Then + First = Anime_Add.comboBox4.SelectedIndex + Last = Anime_Add.comboBox3.SelectedIndex + + Anime_Add.comboBox4.SelectedIndex = Last + Anime_Add.comboBox3.SelectedIndex = First + Anzahl = Last - First + 1 ElseIf Anime_Add.comboBox4.SelectedIndex = Anime_Add.comboBox3.SelectedIndex Then - Exit Sub - Else + First = Anime_Add.comboBox4.SelectedIndex Last = Anime_Add.comboBox4.SelectedIndex + + Anzahl = Last - First + 1 End If - Dim Anzahl As Integer = Anime_Add.comboBox4.SelectedIndex - Anime_Add.comboBox3.SelectedIndex + + Anime_Add.Add_Display.Text = Anzahl.ToString + " episodes selected" + For i As Integer = First To Last For e As Integer = 0 To Integer.MaxValue If Funimation_Grapp_RDY = True Then @@ -5107,10 +5126,14 @@ Public Class Main MsgBox("No Token has been found...", MsgBoxStyle.Exclamation) Else FunimationToken = Token - MsgBox("Token found!", MsgBoxStyle.Information) + MsgBox("Token found!" + vbNewLine + Token, MsgBoxStyle.Information) End If End Sub + Private Sub ContextMenuStrip1_Opening(sender As Object, e As CancelEventArgs) Handles ContextMenuStrip1.Opening + + End Sub + #End Region End Class diff --git a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe index d80989e..670695e 100644 Binary files a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb index d30b703..6d19195 100644 Binary files a/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe index d80989e..670695e 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb index d30b703..6d19195 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.AssemblyReference.cache b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.AssemblyReference.cache index 204fdef..d1020ca 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.AssemblyReference.cache and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.AssemblyReference.cache differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache index eecf667..8a2b9de 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll_Downloader.Anime_Add.resources b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll_Downloader.Anime_Add.resources index 7035048..e50a9b5 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll_Downloader.Anime_Add.resources and b/Crunchyroll Downloader/obj/x64/Debug/Crunchyroll_Downloader.Anime_Add.resources differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache b/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache index b84a327..2499287 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache and b/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5195f7e..ae279ce 100644 Binary files a/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Crunchyroll Downloader/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Crunchyroll Downloader/packages.config b/Crunchyroll Downloader/packages.config index 913e020..66acd80 100644 --- a/Crunchyroll Downloader/packages.config +++ b/Crunchyroll Downloader/packages.config @@ -1,7 +1,7 @@  - - + +