diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 5c9a4d6..fc1d500 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 56b67ae..c67c630 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -147,6 +147,9 @@ 0 + + False + diff --git a/Crunchyroll Downloader/CRD-Classes.vb b/Crunchyroll Downloader/CRD-Classes.vb index 4069e51..bb12881 100644 --- a/Crunchyroll Downloader/CRD-Classes.vb +++ b/Crunchyroll Downloader/CRD-Classes.vb @@ -140,6 +140,7 @@ Public Class ServerResponse End Function End Class + Public Class NameValuePair Public Name As String diff --git a/Crunchyroll Downloader/CRD_List_Item.Designer.vb b/Crunchyroll Downloader/CRD_List_Item.Designer.vb index 27790fd..8827479 100644 --- a/Crunchyroll Downloader/CRD_List_Item.Designer.vb +++ b/Crunchyroll Downloader/CRD_List_Item.Designer.vb @@ -40,6 +40,7 @@ Partial Class CRD_List_Item Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.ProgressBar1 = New MetroFramework.Controls.MetroProgressBar() Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) + Me.TN_DL = New System.Windows.Forms.Timer(Me.components) CType(Me.PB_Thumbnail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.bt_pause, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.bt_del, System.ComponentModel.ISupportInitialize).BeginInit() @@ -197,6 +198,10 @@ Partial Class CRD_List_Item Me.MetroStyleManager1.Owner = Me Me.MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Orange ' + 'TN_DL + ' + Me.TN_DL.Interval = 5000 + ' 'CRD_List_Item ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -243,4 +248,5 @@ Partial Class CRD_List_Item Friend WithEvents Label_percent As MetroFramework.Controls.MetroLabel Friend WithEvents LogTocClipboard As ToolStripMenuItem Friend WithEvents SaveToFile As ToolStripMenuItem + Friend WithEvents TN_DL As Timer End Class diff --git a/Crunchyroll Downloader/CRD_List_Item.resx b/Crunchyroll Downloader/CRD_List_Item.resx index 0a82192..73e6c7a 100644 --- a/Crunchyroll Downloader/CRD_List_Item.resx +++ b/Crunchyroll Downloader/CRD_List_Item.resx @@ -126,4 +126,7 @@ 364, 15 + + 530, 15 + \ No newline at end of file diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index f43df57..a218138 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -141,10 +141,14 @@ Public Class CRD_List_Item Dim bytes As Byte() = wc.DownloadData(ThumbnialURL) Dim ms As New MemoryStream(bytes) Thumbnail = System.Drawing.Image.FromStream(ms) + + Catch ex As Exception 'MsgBox(ex.ToString) End Try + PB_Thumbnail.BackgroundImage = Thumbnail + End Sub #End Region #Region "Get Variables" @@ -417,6 +421,10 @@ Public Class CRD_List_Item Threads = 2 End If + If My.Settings.SaveThumbnail = True Then + TN_DL.Enabled = True + End If + End Sub Public Function GetTextBound() As Rectangle @@ -1609,7 +1617,24 @@ Public Class CRD_List_Item End Try End Sub + Private Sub TN_DL_Tick(sender As Object, e As EventArgs) Handles TN_DL.Tick + If My.Settings.SaveThumbnail = True Then + Dim FilePath As String = DownloadPfad.Replace(Chr(34), "") + Dim FilePath2 As String = Path.GetFullPath(FilePath).Replace(Path.GetExtension(FilePath), "") + ".png" + If Not Directory.Exists(Path.GetDirectoryName(FilePath2)) Then + ' Nein! Jetzt erstellen... + Directory.CreateDirectory(Path.GetDirectoryName(FilePath2)) + End If + + Debug.WriteLine(FilePath2) + + Dim BackgroundImage As Bitmap = CType(PB_Thumbnail.BackgroundImage, Bitmap) + BackgroundImage.Save(FilePath2, System.Drawing.Imaging.ImageFormat.Png) + + End If + TN_DL.Enabled = False + End Sub End Class diff --git a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb new file mode 100644 index 0000000..c17d877 --- /dev/null +++ b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb @@ -0,0 +1,50 @@ + +Partial Class CheckBoxComboBox + Inherits MetroFramework.Forms.MetroForm + + '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.components = New System.ComponentModel.Container() + Me.Animation = New System.Windows.Forms.Timer(Me.components) + Me.SuspendLayout() + ' + 'Animation + ' + Me.Animation.Interval = 10 + ' + 'CheckBoxComboBox + ' + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None + Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle + Me.ClientSize = New System.Drawing.Size(320, 302) + Me.ControlBox = False + Me.DisplayHeader = False + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "CheckBoxComboBox" + Me.Padding = New System.Windows.Forms.Padding(10, 30, 10, 10) + Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents Animation As Timer +End Class diff --git a/Crunchyroll Downloader/CheckBoxComboBox.resx b/Crunchyroll Downloader/CheckBoxComboBox.resx new file mode 100644 index 0000000..bff66b7 --- /dev/null +++ b/Crunchyroll Downloader/CheckBoxComboBox.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/Crunchyroll Downloader/CheckBoxComboBox.vb b/Crunchyroll Downloader/CheckBoxComboBox.vb new file mode 100644 index 0000000..fc31980 --- /dev/null +++ b/Crunchyroll Downloader/CheckBoxComboBox.vb @@ -0,0 +1,168 @@ +Option Strict On + +Imports System.ComponentModel +Imports MetroFramework +Imports MetroFramework.Components +Imports MetroFramework.Controls +Imports MetroFramework.Drawing + +Public Class CheckBoxComboBox + + Dim Manager As New MetroStyleManager + Dim Dubs As New List(Of MetroCheckBox) + Dim Subs As New List(Of MetroCheckBox) + Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Manager.Owner = Me + Me.StyleManager = Manager + + Me.Height = 15 + Animation.Enabled = True + + Me.StyleManager.Style = MetroColorStyle.Orange + + If Me.Text = "CR Dub selection" Then + + 'CB_CR_Audio.Items.Clear() + + For i As Integer = 1 To Main.LangValueEnum.Count - 1 ' index 0 = 'null' | last index = jp + + Dim Dub As New MetroCheckBox + Dub.Text = Main.LangValueEnum(i).Name + Dub.FontSize = MetroCheckBoxSize.SomethingInBetween + Dub.TextAlign = ContentAlignment.MiddleCenter + Dub.SetBounds(2, 30 * Dubs.Count + 1, 316, 25) + Dub.UseCustomBackColor = True + Dub.UseCustomForeColor = True + Dub.ForeColor = Color.Black + + AddHandler Dub.MouseEnter, AddressOf ItemMouseEnter + AddHandler Dub.MouseLeave, AddressOf ItemMouseLeave + + If Main.LangValueEnum(i).CR_Value = Main.DubSprache.CR_Value Then + Dub.Checked = True + End If + + Dubs.Add(Dub) + Me.Controls.Add(Dub) + Next + + ElseIf Me.Text = "CR Sub selection" Then + + For i As Integer = 1 To Main.LangValueEnum.Count - 2 ' index 0 = 'null' | last index = jp + + Dim SubT As New MetroCheckBox + SubT.Text = Main.LangValueEnum(i).Name + SubT.Name = Main.LangValueEnum(i).CR_Value + SubT.FontSize = MetroCheckBoxSize.SomethingInBetween + SubT.TextAlign = ContentAlignment.MiddleCenter + SubT.SetBounds(2, 30 * Subs.Count + 1, 316, 25) + SubT.UseCustomBackColor = True + SubT.UseCustomForeColor = True + SubT.ForeColor = Color.Black + + AddHandler SubT.MouseEnter, AddressOf ItemMouseEnter + AddHandler SubT.MouseLeave, AddressOf ItemMouseLeave + AddHandler SubT.CheckedChanged, AddressOf ItemCheckedChanged + + If Einstellungen.CR_SoftSubsTemp.Contains(Main.LangValueEnum(i).CR_Value) Then + SubT.Checked = True + End If + + Subs.Add(SubT) + Me.Controls.Add(SubT) + Next + + + End If + + + + + End Sub + + Private Sub ItemCheckedChanged(sender As Object, e As EventArgs) + + Dim Box As MetroCheckBox = CType(sender, MetroCheckBox) + + If Box.Checked = True Then + If Einstellungen.CR_SoftSubDefault.Items.Contains(Box.Text) Then + Else + Einstellungen.CR_SoftSubDefault.Items.Add(Box.Text) + End If + Else + If Einstellungen.CR_SoftSubDefault.Items.Contains(Box.Text) And Einstellungen.CR_SoftSubDefault.SelectedItem.ToString = Box.Text Then + Einstellungen.CR_SoftSubDefault.Items.Remove(Box.Text) + Einstellungen.CR_SoftSubDefault.SelectedIndex = 0 + ElseIf Einstellungen.CR_SoftSubDefault.Items.Contains(Box.Text) Then + Einstellungen.CR_SoftSubDefault.Items.Remove(Box.Text) + End If + End If + + + End Sub + Private Sub ItemMouseEnter(sender As Object, e As EventArgs) + DirectCast(sender, MetroCheckBox).BackColor = Color.FromArgb(&HFFDEDEDE) + End Sub + + Private Sub ItemMouseLeave(sender As Object, e As EventArgs) + DirectCast(sender, MetroCheckBox).BackColor = Me.BackColor + End Sub + + Private Sub CheckBoxComboBox_LocationChanged(sender As Object, e As EventArgs) Handles Me.LocationChanged + If Me.Text = "CR Dub selection" Then + Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 204) + ElseIf Me.Text = "CR Sub selection" Then + Me.Location = New Point(Einstellungen.Location.X + 116, Einstellungen.Location.Y + 344) + End If + + + End Sub + + Private Sub CheckBoxComboBox_Deactivate(sender As Object, e As EventArgs) Handles Me.Deactivate + Me.Close() + End Sub + + Private Sub CheckBoxComboBox_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing + +#Region "sof subs" + + + Einstellungen.CR_SoftSubsTemp.Clear() + + For i As Integer = 0 To Subs.Count - 1 + Dim Box As MetroCheckBox = Subs(i) + + If Box.Checked = True Then + Einstellungen.CR_SoftSubsTemp.Add(Box.Name) + End If + + Next + + + +#End Region + End Sub + + Private Sub Animation_Tick(sender As Object, e As EventArgs) Handles Animation.Tick + If Me.Text = "CR Dub selection" Then + If Me.Height < 300 Then + Me.Height = Me.Height + 30 + Else + Me.Height = 300 + Animation.Enabled = False + End If + + + ElseIf Me.Text = "CR Sub selection" Then + If Me.Height < 270 Then + Me.Height = Me.Height + 30 + Else + Me.Height = 270 + Animation.Enabled = False + End If + + End If + End Sub + + +End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index 8ab47f2..5100d85 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -104,8 +104,9 @@ 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036 - - ..\..\metroframework-modern-ui\MetroFramework\bin\x64\Debug\MetroFramework.dll + + False + ..\..\..\metroframework-modern-ui\MetroFramework\bin\x64\Debug\MetroFramework.dll ..\packages\Microsoft.Web.WebView2.1.0.1418.22\lib\net45\Microsoft.Web.WebView2.Core.dll @@ -156,6 +157,12 @@ Form + + CheckBoxComboBox.vb + + + Form + queue.vb @@ -229,6 +236,9 @@ ffmpeg_option.vb + + CheckBoxComboBox.vb + queue.vb @@ -368,6 +378,7 @@ + diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 5f0a3a2..31f0b29 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -51,6 +51,7 @@ Partial Class Main Me.Panel1 = New System.Windows.Forms.Panel() Me.ScanTimeout = New System.Windows.Forms.Timer(Me.components) Me.Btn_Queue = New System.Windows.Forms.Button() + Me.SaveThumbnailAsImageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ConsoleBar, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -159,7 +160,7 @@ Partial Class Main ' 'ContextMenuStrip1 ' - Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.Funimation_Token, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem}) + Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.QueueToolStripMenuItem, Me.SaveThumbnailAsImageToolStripMenuItem, Me.ToggleDebugModeToolStripMenuItem, Me.Funimation_Token, Me.CheckCRBetaTokenToolStripMenuItem, Me.Timer3OffToolStripMenuItem, Me.ThreadCount, Me.CRCookieToolStripMenuItem, Me.UrlJsonsToolStripMenuItem, Me.DummyItemToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1") ' @@ -228,6 +229,11 @@ Partial Class Main Me.Btn_Queue.Name = "Btn_Queue" Me.Btn_Queue.UseVisualStyleBackColor = False ' + 'SaveThumbnailAsImageToolStripMenuItem + ' + Me.SaveThumbnailAsImageToolStripMenuItem.Name = "SaveThumbnailAsImageToolStripMenuItem" + resources.ApplyResources(Me.SaveThumbnailAsImageToolStripMenuItem, "SaveThumbnailAsImageToolStripMenuItem") + ' 'Main ' Me.ApplyImageInvert = True @@ -285,4 +291,5 @@ Partial Class Main Friend WithEvents ScanTimeout As Timer Friend WithEvents QueueToolStripMenuItem As ToolStripMenuItem Friend WithEvents Btn_Queue As Button + Friend WithEvents SaveThumbnailAsImageToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index 77f5f27..34e7dd9 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -231,6 +231,24 @@ 900, 630 + + Zoom + + + Flat + + + NoControl + + + 575, 18 + + + 80, 35 + + + 70 + Btn_Queue @@ -243,6 +261,21 @@ 1 + + True + + + 1, 71 + + + 898, 403 + + + 898, 546 + + + 0 + Panel1 @@ -255,6 +288,24 @@ 2 + + None + + + Flat + + + NoControl + + + 800, 1 + + + 35, 35 + + + 5 + Btn_Close @@ -267,6 +318,24 @@ 3 + + None + + + Flat + + + NoControl + + + 757, 1 + + + 30, 30 + + + 4 + Btn_min @@ -279,6 +348,24 @@ 4 + + Zoom + + + Flat + + + NoControl + + + 665, 18 + + + 80, 35 + + + 3 + Btn_Settings @@ -291,6 +378,21 @@ 5 + + Zoom + + + Flat + + + 140, 18 + + + 80, 35 + + + 2 + Btn_Browser @@ -303,6 +405,24 @@ 6 + + Zoom + + + Flat + + + NoControl + + + 20, 18 + + + 80, 35 + + + 1 + Btn_add @@ -423,6 +543,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SaveThumbnailAsImageToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main @@ -432,153 +558,6 @@ 276, 52 - - Zoom - - - Flat - - - NoControl - - - 20, 18 - - - 80, 35 - - - 1 - - - Btn_add - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - - - Zoom - - - Flat - - - 140, 18 - - - 80, 35 - - - 2 - - - Btn_Browser - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - - - Zoom - - - Flat - - - NoControl - - - 665, 18 - - - 80, 35 - - - 3 - - - Btn_Settings - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - None - - - Flat - - - NoControl - - - 757, 1 - - - 30, 30 - - - 4 - - - Btn_min - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - - - None - - - Flat - - - NoControl - - - 800, 1 - - - 35, 35 - - - 5 - - - Btn_Close - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 352, 49 @@ -588,6 +567,12 @@ ffmpeg option + + 233, 22 + + + save thumbnail as image + 233, 22 @@ -637,7 +622,7 @@ Dummy_Item - 234, 202 + 234, 246 ContextMenuStrip1 @@ -645,64 +630,7 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - 1, 71 - - - 898, 403 - - - 898, 546 - - - 0 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - 167, 10 - - Zoom - - - Flat - - - NoControl - - - 575, 18 - - - 80, 35 - - - 70 - - - Btn_Queue - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 42a1778..e0dcf81 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -21,6 +21,7 @@ Imports System.Net.Http Public Class Main Inherits MetroForm + Dim t As Thread Dim HTML As String = Nothing Public CR_Cookies As String = "Cookie: " @@ -421,6 +422,8 @@ Public Class Main Private Sub Main_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + FillArray() @@ -4328,6 +4331,8 @@ Public Class Main End Sub + + Private Sub QueueToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles QueueToolStripMenuItem.Click 'ffmpeg_options.ShowDialog() Dim newCmd As New ffmpeg_options @@ -4636,6 +4641,20 @@ Public Class Main End Sub + Private Sub SaveThumbnailAsImageToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SaveThumbnailAsImageToolStripMenuItem.Click + If My.Settings.SaveThumbnail = False Then + My.Settings.SaveThumbnail = True + MsgBox("Thumbnails will be saved into the video folder") + My.Settings.Save() + + Else + My.Settings.SaveThumbnail = False + MsgBox("Thumbnail saving disabled") + My.Settings.Save() + + End If + End Sub + #End Region End Class diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 978e06e..78a5242 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index 8176a1e..1bc58f8 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -557,6 +557,18 @@ Namespace My Me("HideSF") = value End Set End Property + + _ + Public Property SaveThumbnail() As Boolean + Get + Return CType(Me("SaveThumbnail"),Boolean) + End Get + Set + Me("SaveThumbnail") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index d7a46cf..61dcfff 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -128,5 +128,8 @@ 0 + + False + \ No newline at end of file diff --git a/Crunchyroll Downloader/Resources/BG.png b/Crunchyroll Downloader/Resources/BG.png new file mode 100644 index 0000000..d8805c7 Binary files /dev/null and b/Crunchyroll Downloader/Resources/BG.png differ diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 5efe69f..fa18e5e 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -29,15 +29,7 @@ Partial Class Einstellungen Me.GroupBox14 = New System.Windows.Forms.GroupBox() Me.CR_SoftSubDefault = New MetroFramework.Controls.MetroComboBox() Me.SoftSubs = New System.Windows.Forms.GroupBox() - Me.CBesES = New MetroFramework.Controls.MetroCheckBox() - Me.CBitIT = New MetroFramework.Controls.MetroCheckBox() - Me.CBruRU = New MetroFramework.Controls.MetroCheckBox() - Me.CBarME = New MetroFramework.Controls.MetroCheckBox() - Me.CBfrFR = New MetroFramework.Controls.MetroCheckBox() - Me.CBesLA = New MetroFramework.Controls.MetroCheckBox() - Me.CBptBR = New MetroFramework.Controls.MetroCheckBox() - Me.CBdeDE = New MetroFramework.Controls.MetroCheckBox() - Me.CBenUS = New MetroFramework.Controls.MetroCheckBox() + Me.CR_SoftSubs = New MetroFramework.Controls.MetroComboBox() Me.GB_SubLanguage = New System.Windows.Forms.GroupBox() Me.CB_CR_Harsubs = New MetroFramework.Controls.MetroComboBox() Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() @@ -92,6 +84,8 @@ Partial Class Einstellungen Me.A720p = New MetroFramework.Controls.MetroRadioButton() Me.A1080p = New MetroFramework.Controls.MetroRadioButton() Me.TabPage1 = New MetroFramework.Controls.MetroTabPage() + Me.GroupBox21 = New System.Windows.Forms.GroupBox() + Me.CB_HideSF = New MetroFramework.Controls.MetroComboBox() Me.GroupBox6 = New System.Windows.Forms.GroupBox() Me.MetroLabel1 = New MetroFramework.Controls.MetroLabel() Me.CheckBox2 = New MetroFramework.Controls.MetroCheckBox() @@ -160,8 +154,6 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.GroupBox21 = New System.Windows.Forms.GroupBox() - Me.CB_HideSF = New MetroFramework.Controls.MetroComboBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -175,6 +167,7 @@ Partial Class Einstellungen Me.MenuStrip1.SuspendLayout() Me.GB_Resolution.SuspendLayout() Me.TabPage1.SuspendLayout() + Me.GroupBox21.SuspendLayout() Me.GroupBox6.SuspendLayout() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox5.SuspendLayout() @@ -200,7 +193,6 @@ Partial Class Einstellungen Me.GroupBox8.SuspendLayout() Me.TabPage7.SuspendLayout() CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox21.SuspendLayout() Me.SuspendLayout() ' 'ToolTip1 @@ -228,9 +220,9 @@ Partial Class Einstellungen Me.GroupBox14.Controls.Add(Me.CR_SoftSubDefault) Me.GroupBox14.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox14.ForeColor = System.Drawing.Color.Black - Me.GroupBox14.Location = New System.Drawing.Point(5, 351) + Me.GroupBox14.Location = New System.Drawing.Point(5, 255) Me.GroupBox14.Name = "GroupBox14" - Me.GroupBox14.Size = New System.Drawing.Size(490, 69) + Me.GroupBox14.Size = New System.Drawing.Size(490, 70) Me.GroupBox14.TabIndex = 30 Me.GroupBox14.TabStop = False Me.GroupBox14.Text = "Default Subtitle" @@ -243,9 +235,9 @@ Partial Class Einstellungen Me.CR_SoftSubDefault.IntegralHeight = False Me.CR_SoftSubDefault.ItemHeight = 23 Me.CR_SoftSubDefault.Items.AddRange(New Object() {"[Disabled]"}) - Me.CR_SoftSubDefault.Location = New System.Drawing.Point(82, 30) + Me.CR_SoftSubDefault.Location = New System.Drawing.Point(85, 30) Me.CR_SoftSubDefault.Name = "CR_SoftSubDefault" - Me.CR_SoftSubDefault.Size = New System.Drawing.Size(326, 29) + Me.CR_SoftSubDefault.Size = New System.Drawing.Size(320, 29) Me.CR_SoftSubDefault.Sorted = True Me.CR_SoftSubDefault.TabIndex = 30 Me.CR_SoftSubDefault.UseSelectable = True @@ -253,130 +245,29 @@ Partial Class Einstellungen '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.Controls.Add(Me.CR_SoftSubs) 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(5, 184) + Me.SoftSubs.Location = New System.Drawing.Point(5, 190) Me.SoftSubs.Name = "SoftSubs" - Me.SoftSubs.Size = New System.Drawing.Size(490, 161) + Me.SoftSubs.Size = New System.Drawing.Size(490, 65) Me.SoftSubs.TabIndex = 20 Me.SoftSubs.TabStop = False Me.SoftSubs.Text = "SoftSubs" ' - 'CBesES + 'CR_SoftSubs ' - Me.CBesES.AutoSize = True - Me.CBesES.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBesES.ForeColor = System.Drawing.Color.Black - Me.CBesES.Location = New System.Drawing.Point(164, 73) - Me.CBesES.Name = "CBesES" - Me.CBesES.Size = New System.Drawing.Size(127, 19) - Me.CBesES.TabIndex = 25 - Me.CBesES.Text = "Español (España)" - Me.CBesES.UseSelectable = True - ' - 'CBitIT - ' - Me.CBitIT.AutoSize = True - Me.CBitIT.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBitIT.ForeColor = System.Drawing.Color.Black - Me.CBitIT.Location = New System.Drawing.Point(24, 110) - Me.CBitIT.Name = "CBitIT" - Me.CBitIT.Size = New System.Drawing.Size(119, 19) - Me.CBitIT.TabIndex = 27 - Me.CBitIT.Text = "Italiano (Italian)" - Me.CBitIT.UseSelectable = True - ' - 'CBruRU - ' - Me.CBruRU.AutoSize = True - Me.CBruRU.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBruRU.ForeColor = System.Drawing.Color.Black - Me.CBruRU.Location = New System.Drawing.Point(304, 110) - Me.CBruRU.Name = "CBruRU" - Me.CBruRU.Size = New System.Drawing.Size(133, 19) - Me.CBruRU.TabIndex = 29 - Me.CBruRU.Text = "Русский (Russian)" - Me.CBruRU.UseSelectable = True - ' - 'CBarME - ' - Me.CBarME.AutoSize = True - Me.CBarME.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBarME.ForeColor = System.Drawing.Color.Black - Me.CBarME.Location = New System.Drawing.Point(164, 110) - Me.CBarME.Name = "CBarME" - Me.CBarME.Size = New System.Drawing.Size(115, 19) - Me.CBarME.TabIndex = 28 - Me.CBarME.Text = "العربية (Arabic)" - Me.CBarME.UseSelectable = True - ' - 'CBfrFR - ' - Me.CBfrFR.AutoSize = True - Me.CBfrFR.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBfrFR.ForeColor = System.Drawing.Color.Black - Me.CBfrFR.Location = New System.Drawing.Point(304, 35) - Me.CBfrFR.Name = "CBfrFR" - Me.CBfrFR.Size = New System.Drawing.Size(126, 19) - Me.CBfrFR.TabIndex = 23 - Me.CBfrFR.Text = "Français (France)" - Me.CBfrFR.UseSelectable = True - ' - 'CBesLA - ' - Me.CBesLA.AutoSize = True - Me.CBesLA.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBesLA.ForeColor = System.Drawing.Color.Black - Me.CBesLA.Location = New System.Drawing.Point(164, 35) - Me.CBesLA.Name = "CBesLA" - Me.CBesLA.Size = New System.Drawing.Size(100, 19) - Me.CBesLA.TabIndex = 22 - Me.CBesLA.Text = "Español (LA)" - Me.CBesLA.UseSelectable = True - ' - 'CBptBR - ' - Me.CBptBR.AutoSize = True - Me.CBptBR.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBptBR.ForeColor = System.Drawing.Color.Black - Me.CBptBR.Location = New System.Drawing.Point(304, 73) - Me.CBptBR.Name = "CBptBR" - Me.CBptBR.Size = New System.Drawing.Size(131, 19) - Me.CBptBR.TabIndex = 26 - Me.CBptBR.Text = "Português (Brasil)" - Me.CBptBR.UseSelectable = True - ' - 'CBdeDE - ' - Me.CBdeDE.AutoSize = True - Me.CBdeDE.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBdeDE.ForeColor = System.Drawing.Color.Black - Me.CBdeDE.Location = New System.Drawing.Point(24, 73) - Me.CBdeDE.Name = "CBdeDE" - Me.CBdeDE.Size = New System.Drawing.Size(75, 19) - Me.CBdeDE.TabIndex = 24 - Me.CBdeDE.Text = "Deutsch" - Me.CBdeDE.UseSelectable = True - ' - 'CBenUS - ' - Me.CBenUS.AutoSize = True - Me.CBenUS.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CBenUS.ForeColor = System.Drawing.Color.Black - Me.CBenUS.Location = New System.Drawing.Point(24, 35) - Me.CBenUS.Name = "CBenUS" - Me.CBenUS.Size = New System.Drawing.Size(68, 19) - Me.CBenUS.TabIndex = 21 - Me.CBenUS.Text = "English" - Me.CBenUS.UseSelectable = True + Me.CR_SoftSubs.DropDownHeight = 1 + Me.CR_SoftSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CR_SoftSubs.FormattingEnabled = True + Me.CR_SoftSubs.IntegralHeight = False + Me.CR_SoftSubs.ItemHeight = 23 + Me.CR_SoftSubs.Items.AddRange(New Object() {"select Softsubs"}) + Me.CR_SoftSubs.Location = New System.Drawing.Point(85, 21) + Me.CR_SoftSubs.MaxDropDownItems = 1 + Me.CR_SoftSubs.Name = "CR_SoftSubs" + Me.CR_SoftSubs.Size = New System.Drawing.Size(320, 29) + Me.CR_SoftSubs.TabIndex = 22 + Me.CR_SoftSubs.UseSelectable = True ' 'GB_SubLanguage ' @@ -384,9 +275,9 @@ Partial Class Einstellungen Me.GB_SubLanguage.Controls.Add(Me.CB_CR_Harsubs) 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(5, 115) + Me.GB_SubLanguage.Location = New System.Drawing.Point(5, 120) Me.GB_SubLanguage.Name = "GB_SubLanguage" - Me.GB_SubLanguage.Size = New System.Drawing.Size(490, 63) + Me.GB_SubLanguage.Size = New System.Drawing.Size(490, 65) Me.GB_SubLanguage.TabIndex = 10 Me.GB_SubLanguage.TabStop = False Me.GB_SubLanguage.Text = "Sub Sprache" @@ -398,9 +289,9 @@ Partial Class Einstellungen Me.CB_CR_Harsubs.FormattingEnabled = True Me.CB_CR_Harsubs.IntegralHeight = False Me.CB_CR_Harsubs.ItemHeight = 23 - Me.CB_CR_Harsubs.Location = New System.Drawing.Point(82, 25) + Me.CB_CR_Harsubs.Location = New System.Drawing.Point(85, 25) Me.CB_CR_Harsubs.Name = "CB_CR_Harsubs" - Me.CB_CR_Harsubs.Size = New System.Drawing.Size(326, 29) + Me.CB_CR_Harsubs.Size = New System.Drawing.Size(320, 29) Me.CB_CR_Harsubs.TabIndex = 20 Me.CB_CR_Harsubs.UseSelectable = True ' @@ -415,10 +306,10 @@ Partial Class Einstellungen Me.TabPage2.HorizontalScrollbarBarColor = True Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False Me.TabPage2.HorizontalScrollbarSize = 10 - Me.TabPage2.Location = New System.Drawing.Point(4, 44) + Me.TabPage2.Location = New System.Drawing.Point(4, 35) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(501, 519) + Me.TabPage2.Size = New System.Drawing.Size(501, 528) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Output" Me.TabPage2.VerticalScrollbarBarColor = True @@ -904,10 +795,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 44) + Me.TabPage1.Location = New System.Drawing.Point(4, 35) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 519) + Me.TabPage1.Size = New System.Drawing.Size(501, 528) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main" Me.TabPage1.VerticalScrollbar = True @@ -915,6 +806,33 @@ Partial Class Einstellungen Me.TabPage1.VerticalScrollbarHighlightOnWheel = False Me.TabPage1.VerticalScrollbarSize = 10 ' + 'GroupBox21 + ' + Me.GroupBox21.BackColor = System.Drawing.Color.Transparent + Me.GroupBox21.Controls.Add(Me.CB_HideSF) + Me.GroupBox21.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox21.ForeColor = System.Drawing.Color.Black + Me.GroupBox21.Location = New System.Drawing.Point(5, 417) + Me.GroupBox21.Name = "GroupBox21" + Me.GroupBox21.Size = New System.Drawing.Size(490, 67) + Me.GroupBox21.TabIndex = 81 + Me.GroupBox21.TabStop = False + Me.GroupBox21.Text = "Subfolder" + ' + 'CB_HideSF + ' + Me.CB_HideSF.DropDownHeight = 275 + Me.CB_HideSF.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CB_HideSF.FormattingEnabled = True + Me.CB_HideSF.IntegralHeight = False + Me.CB_HideSF.ItemHeight = 23 + Me.CB_HideSF.Items.AddRange(New Object() {"show all subfolder", "hide all subfolder", "hide subfolder by last accessed [> 1 week]", "hide subfolder by last accessed [> 1 month]", "hide subfolder by last accessed [> 3 months]", "hide subfolder by last accessed [> 6 months]"}) + Me.CB_HideSF.Location = New System.Drawing.Point(82, 25) + Me.CB_HideSF.Name = "CB_HideSF" + Me.CB_HideSF.Size = New System.Drawing.Size(326, 29) + Me.CB_HideSF.TabIndex = 21 + Me.CB_HideSF.UseSelectable = True + ' 'GroupBox6 ' Me.GroupBox6.BackColor = System.Drawing.Color.Transparent @@ -1114,7 +1032,7 @@ Partial Class Einstellungen Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.SelectedIndex = 3 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1128,9 +1046,9 @@ Partial Class Einstellungen Me.MetroTabPage2.HorizontalScrollbarBarColor = True Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage2.HorizontalScrollbarSize = 10 - Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage2.Location = New System.Drawing.Point(4, 35) Me.MetroTabPage2.Name = "MetroTabPage2" - Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage2.Size = New System.Drawing.Size(501, 528) Me.MetroTabPage2.TabIndex = 8 Me.MetroTabPage2.Text = "Naming" Me.MetroTabPage2.VerticalScrollbarBarColor = True @@ -1448,9 +1366,9 @@ Partial Class Einstellungen Me.GroupBox20.Controls.Add(Me.ChB_Chapters) Me.GroupBox20.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox20.ForeColor = System.Drawing.Color.Black - Me.GroupBox20.Location = New System.Drawing.Point(3, 426) + Me.GroupBox20.Location = New System.Drawing.Point(3, 330) Me.GroupBox20.Name = "GroupBox20" - Me.GroupBox20.Size = New System.Drawing.Size(490, 62) + Me.GroupBox20.Size = New System.Drawing.Size(490, 65) Me.GroupBox20.TabIndex = 34 Me.GroupBox20.TabStop = False Me.GroupBox20.Text = "Chapters" @@ -1473,7 +1391,7 @@ Partial Class Einstellungen Me.GroupBox19.Controls.Add(Me.DubMode) Me.GroupBox19.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox19.ForeColor = System.Drawing.Color.Black - Me.GroupBox19.Location = New System.Drawing.Point(5, 14) + Me.GroupBox19.Location = New System.Drawing.Point(5, 15) Me.GroupBox19.Name = "GroupBox19" Me.GroupBox19.Size = New System.Drawing.Size(490, 100) Me.GroupBox19.TabIndex = 33 @@ -1487,21 +1405,23 @@ Partial Class Einstellungen Me.CB_CR_Audio.FormattingEnabled = True Me.CB_CR_Audio.IntegralHeight = False Me.CB_CR_Audio.ItemHeight = 23 - Me.CB_CR_Audio.Location = New System.Drawing.Point(82, 55) + Me.CB_CR_Audio.Location = New System.Drawing.Point(85, 55) Me.CB_CR_Audio.Name = "CB_CR_Audio" - Me.CB_CR_Audio.Size = New System.Drawing.Size(326, 29) + Me.CB_CR_Audio.Size = New System.Drawing.Size(320, 29) Me.CB_CR_Audio.TabIndex = 21 Me.CB_CR_Audio.UseSelectable = True ' 'DubMode ' - Me.DubMode.AutoSize = True - Me.DubMode.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.DubMode.Location = New System.Drawing.Point(115, 21) + Me.DubMode.BackColor = System.Drawing.Color.Transparent + Me.DubMode.FontSize = MetroFramework.MetroCheckBoxSize.SomethingInBetween + Me.DubMode.Location = New System.Drawing.Point(85, 21) Me.DubMode.Name = "DubMode" - Me.DubMode.Size = New System.Drawing.Size(258, 19) + Me.DubMode.Size = New System.Drawing.Size(320, 28) Me.DubMode.TabIndex = 5 Me.DubMode.Text = "accept no hardsubs for dubbed shows" + Me.DubMode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.DubMode.UseCustomBackColor = True Me.DubMode.UseSelectable = True ' 'TabPage6 @@ -1514,10 +1434,10 @@ Partial Class Einstellungen Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarSize = 10 - Me.TabPage6.Location = New System.Drawing.Point(4, 44) + Me.TabPage6.Location = New System.Drawing.Point(4, 35) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(501, 519) + Me.TabPage6.Size = New System.Drawing.Size(501, 528) Me.TabPage6.TabIndex = 4 Me.TabPage6.Text = " Funimation" Me.TabPage6.VerticalScrollbarBarColor = True @@ -1751,9 +1671,9 @@ Partial Class Einstellungen Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label5) - Me.TabPage7.Location = New System.Drawing.Point(4, 44) + Me.TabPage7.Location = New System.Drawing.Point(4, 35) Me.TabPage7.Name = "TabPage7" - Me.TabPage7.Size = New System.Drawing.Size(501, 519) + Me.TabPage7.Size = New System.Drawing.Size(501, 528) Me.TabPage7.TabIndex = 5 Me.TabPage7.Text = " About " ' @@ -1885,33 +1805,6 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'GroupBox21 - ' - Me.GroupBox21.BackColor = System.Drawing.Color.Transparent - Me.GroupBox21.Controls.Add(Me.CB_HideSF) - Me.GroupBox21.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox21.ForeColor = System.Drawing.Color.Black - Me.GroupBox21.Location = New System.Drawing.Point(5, 417) - Me.GroupBox21.Name = "GroupBox21" - Me.GroupBox21.Size = New System.Drawing.Size(490, 67) - Me.GroupBox21.TabIndex = 81 - Me.GroupBox21.TabStop = False - Me.GroupBox21.Text = "Subfolder" - ' - 'CB_HideSF - ' - Me.CB_HideSF.DropDownHeight = 275 - Me.CB_HideSF.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CB_HideSF.FormattingEnabled = True - Me.CB_HideSF.IntegralHeight = False - Me.CB_HideSF.ItemHeight = 23 - Me.CB_HideSF.Items.AddRange(New Object() {"show all subfolder", "hide all subfolder", "hide subfolder by last accessed [> 1 week]", "hide subfolder by last accessed [> 1 month]", "hide subfolder by last accessed [> 3 months]", "hide subfolder by last accessed [> 6 months]"}) - Me.CB_HideSF.Location = New System.Drawing.Point(82, 25) - Me.CB_HideSF.Name = "CB_HideSF" - Me.CB_HideSF.Size = New System.Drawing.Size(326, 29) - Me.CB_HideSF.TabIndex = 21 - Me.CB_HideSF.UseSelectable = True - ' 'Einstellungen ' Me.ApplyImageInvert = True @@ -1933,7 +1826,6 @@ Partial Class Einstellungen CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox14.ResumeLayout(False) Me.SoftSubs.ResumeLayout(False) - Me.SoftSubs.PerformLayout() Me.GB_SubLanguage.ResumeLayout(False) Me.TabPage2.ResumeLayout(False) Me.GroupBox18.ResumeLayout(False) @@ -1948,6 +1840,7 @@ Partial Class Einstellungen Me.GB_Resolution.ResumeLayout(False) Me.GB_Resolution.PerformLayout() Me.TabPage1.ResumeLayout(False) + Me.GroupBox21.ResumeLayout(False) Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit() @@ -1967,7 +1860,6 @@ Partial Class Einstellungen Me.GroupBox20.ResumeLayout(False) Me.GroupBox20.PerformLayout() Me.GroupBox19.ResumeLayout(False) - Me.GroupBox19.PerformLayout() Me.TabPage6.ResumeLayout(False) Me.GroupBox15.ResumeLayout(False) Me.GroupBox10.ResumeLayout(False) @@ -1980,7 +1872,6 @@ Partial Class Einstellungen Me.GroupBox8.PerformLayout() Me.TabPage7.ResumeLayout(False) CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox21.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -2031,15 +1922,6 @@ Partial Class Einstellungen Friend WithEvents GroupBox11 As GroupBox Friend WithEvents Button1 As Button Friend WithEvents Label1 As MetroFramework.Controls.MetroLabel - Public WithEvents CBesES As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBitIT As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBruRU As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBarME As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBfrFR As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBesLA As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBptBR As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBdeDE As MetroFramework.Controls.MetroCheckBox - Public WithEvents CBenUS As MetroFramework.Controls.MetroCheckBox Friend WithEvents Label2 As MetroFramework.Controls.MetroLabel Public WithEvents Label4 As MetroFramework.Controls.MetroLabel Public WithEvents Label6 As MetroFramework.Controls.MetroLabel @@ -2071,7 +1953,6 @@ Partial Class Einstellungen Friend WithEvents GroupBox13 As GroupBox Friend WithEvents FunSubDef As MetroFramework.Controls.MetroComboBox Friend WithEvents GroupBox14 As GroupBox - Friend WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox Friend WithEvents CB_Format As MetroFramework.Controls.MetroComboBox Friend WithEvents MetroTabPage1 As MetroFramework.Controls.MetroTabPage Friend WithEvents AMD_h264 As ToolStripMenuItem @@ -2107,8 +1988,6 @@ Partial Class Einstellungen Friend WithEvents GroupBox19 As GroupBox Friend WithEvents DubMode As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_Merge As MetroFramework.Controls.MetroComboBox - Friend WithEvents GroupBox20 As GroupBox - Friend WithEvents ChB_Chapters As MetroFramework.Controls.MetroCheckBox Friend WithEvents Chb_Ign_tls As MetroFramework.Controls.MetroCheckBox Friend WithEvents Intel_AV1 As ToolStripMenuItem Friend WithEvents CPU_AV1 As ToolStripMenuItem @@ -2125,4 +2004,8 @@ Partial Class Einstellungen Friend WithEvents CB_CR_Audio As MetroFramework.Controls.MetroComboBox Friend WithEvents GroupBox21 As GroupBox Friend WithEvents CB_HideSF As MetroFramework.Controls.MetroComboBox + Friend WithEvents GroupBox20 As GroupBox + Friend WithEvents ChB_Chapters As MetroFramework.Controls.MetroCheckBox + Friend WithEvents CR_SoftSubs As MetroFramework.Controls.MetroComboBox + Public WithEvents CR_SoftSubDefault As MetroFramework.Controls.MetroComboBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index f49b9b4..e809bf5 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,9 +126,6 @@ 118, 20 - - 118, 20 - 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index c908e1f..368d100 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -16,6 +16,9 @@ Public Class Einstellungen Dim Manager As MetroStyleManager = Main.Manager Dim LastVersionString As String = "v3.8-Beta" + Public CR_SoftSubsTemp As New List(Of String) + + Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load Label6.Text = "You have: v" + Application.ProductVersion.ToString '+ " WebView2_Test" @@ -25,7 +28,7 @@ Public Class Einstellungen 'CR_Anime_Folge = CR_Name_Staffel0_Folge1(1) 'If GitHubLastTag1(0) - + CR_SoftSubsTemp.AddRange(Main.SoftSubs) Manager.Owner = Me Me.StyleManager = Manager @@ -80,27 +83,22 @@ Public Class Einstellungen End If TabControl1.SelectedIndex = 0 - For i As Integer = 0 To Main.SoftSubs.Count - 1 - If Main.SoftSubs(i) = "de-DE" Then - CBdeDE.Checked = True - ElseIf Main.SoftSubs(i) = "en-US" Then - CBenUS.Checked = True - ElseIf Main.SoftSubs(i) = "pt-BR" Then - CBptBR.Checked = True - ElseIf Main.SoftSubs(i) = "es-419" Then - CBesLA.Checked = True - ElseIf Main.SoftSubs(i) = "fr-FR" Then - CBfrFR.Checked = True - ElseIf Main.SoftSubs(i) = "ar-SA" Then - CBarME.Checked = True - ElseIf Main.SoftSubs(i) = "ru-RU" Then - CBruRU.Checked = True - ElseIf Main.SoftSubs(i) = "it-IT" Then - CBitIT.Checked = True - ElseIf Main.SoftSubs(i) = "es-ES" Then - CBesES.Checked = True + +#Region "sof subs" + CR_SoftSubDefault.SelectedIndex = 0 + + For i As Integer = 1 To Main.LangValueEnum.Count - 2 ' index 0 = 'null' | last index = jp + + If Main.SoftSubs.Contains(Main.LangValueEnum(i).CR_Value) Then + CR_SoftSubDefault.Items.Add(Main.LangValueEnum(i).Name) + End If + Next + CR_SoftSubs.SelectedIndex = 0 + +#End Region + For i As Integer = 0 To Main.SubFunimation.Count - 1 If Main.SubFunimation(i) = "en" Then CB_fun_eng.Checked = True @@ -109,16 +107,8 @@ Public Class Einstellungen ElseIf Main.SubFunimation(i) = "pt" Then CB_fun_ptbr.Checked = True End If - 'If Main.SubFunimation(i) = "en" Then - ' RB_eng.Checked = True - 'ElseIf Main.SubFunimation(i) = "es" Then - ' RB_es.Checked = True - 'ElseIf Main.SubFunimation(i) = "pt" Then - ' RB_pt.Checked = True - 'End If - Next - 'TB_NameString.Text = Main.NameBuilder + Next Me.Location = New Point(CInt(Main.Location.X + Main.Width / 2 - Me.Width / 2), CInt(Main.Location.Y + Main.Height / 2 - Me.Height / 2)) Try @@ -715,35 +705,9 @@ Public Class Einstellungen End If -#Region "sof subs" Main.SoftSubs.Clear() - If CBdeDE.Checked = True Then - Main.SoftSubs.Add("de-DE") - End If - If CBenUS.Checked = True Then - Main.SoftSubs.Add("en-US") - End If - If CBptBR.Checked = True Then - Main.SoftSubs.Add("pt-BR") - End If - If CBesLA.Checked = True Then - Main.SoftSubs.Add("es-419") - End If - If CBfrFR.Checked = True Then - Main.SoftSubs.Add("fr-FR") - End If - If CBarME.Checked = True Then - Main.SoftSubs.Add("ar-SA") - End If - If CBruRU.Checked = True Then - Main.SoftSubs.Add("ru-RU") - End If - If CBitIT.Checked = True Then - Main.SoftSubs.Add("it-IT") - End If - If CBesES.Checked = True Then - Main.SoftSubs.Add("es-ES") - End If + Main.SoftSubs.AddRange(CR_SoftSubsTemp) + Dim SaveString As String = Nothing For ii As Integer = 0 To Main.SoftSubs.Count - 1 @@ -758,7 +722,8 @@ Public Class Einstellungen End If My.Settings.AddedSubs = SaveString -#End Region + + If CB_SoftSubSettings.SelectedIndex = 0 Then Main.IncludeLangName = False @@ -1089,124 +1054,6 @@ Public Class Einstellungen End If End Sub -#Region "CR_default soft sub" - - - Private Sub CBesES_CheckedChanged(sender As Object, e As EventArgs) Handles CBesES.CheckedChanged - If CBesES.Checked = True Then - CR_SoftSubDefault.Items.Add(CBesES.Text) - Else - CR_SoftSubDefault.Items.Remove(CBesES.Text) - If CR_SoftSubDefault.Text = CBesES.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBitIT_CheckedChanged(sender As Object, e As EventArgs) Handles CBitIT.CheckedChanged - If CBitIT.Checked = True Then - CR_SoftSubDefault.Items.Add(CBitIT.Text) - Else - CR_SoftSubDefault.Items.Remove(CBitIT.Text) - If CR_SoftSubDefault.Text = CBitIT.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBruRU_CheckedChanged(sender As Object, e As EventArgs) Handles CBruRU.CheckedChanged - If CBruRU.Checked = True Then - CR_SoftSubDefault.Items.Add(CBruRU.Text) - Else - CR_SoftSubDefault.Items.Remove(CBruRU.Text) - If CR_SoftSubDefault.Text = CBruRU.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBarME_CheckedChanged(sender As Object, e As EventArgs) Handles CBarME.CheckedChanged - If CBarME.Checked = True Then - CR_SoftSubDefault.Items.Add(CBarME.Text) - Else - CR_SoftSubDefault.Items.Remove(CBarME.Text) - If CR_SoftSubDefault.Text = CBarME.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBfrFR_CheckedChanged(sender As Object, e As EventArgs) Handles CBfrFR.CheckedChanged - If CBfrFR.Checked = True Then - CR_SoftSubDefault.Items.Add(CBfrFR.Text) - Else - CR_SoftSubDefault.Items.Remove(CBfrFR.Text) - If CR_SoftSubDefault.Text = CBfrFR.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBesLA_CheckedChanged(sender As Object, e As EventArgs) Handles CBesLA.CheckedChanged - If CBesLA.Checked = True Then - CR_SoftSubDefault.Items.Add(CBesLA.Text) - Else - CR_SoftSubDefault.Items.Remove(CBesLA.Text) - If CR_SoftSubDefault.Text = CBesLA.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBptBR_CheckedChanged(sender As Object, e As EventArgs) Handles CBptBR.CheckedChanged - If CBptBR.Checked = True Then - CR_SoftSubDefault.Items.Add(CBptBR.Text) - Else - CR_SoftSubDefault.Items.Remove(CBptBR.Text) - If CR_SoftSubDefault.Text = CBptBR.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBdeDE_CheckedChanged(sender As Object, e As EventArgs) Handles CBdeDE.CheckedChanged - If CBdeDE.Checked = True Then - CR_SoftSubDefault.Items.Add(CBdeDE.Text) - Else - CR_SoftSubDefault.Items.Remove(CBdeDE.Text) - If CR_SoftSubDefault.Text = CBdeDE.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - Private Sub CBenUS_CheckedChanged(sender As Object, e As EventArgs) Handles CBenUS.CheckedChanged - If CBenUS.Checked = True Then - CR_SoftSubDefault.Items.Add(CBenUS.Text) - Else - CR_SoftSubDefault.Items.Remove(CBenUS.Text) - If CR_SoftSubDefault.Text = CBenUS.Text Then - CR_SoftSubDefault.SelectedItem = "[Disabled]" - End If - End If - End Sub - - - 'Private Sub HybridMode_CB_Click(sender As Object, e As EventArgs) - ' If HybridMode_CB.Checked = True Then - - ' If MessageBox.Show("Should the cached data be kept?" + vbNewLine + "Press 'No' to free the space after downloading.", "Keep cached files?", MessageBoxButtons.YesNo) = DialogResult.Yes Then - ' Main.KeepCache = True - ' Else - ' Main.KeepCache = False - ' End If - - ' If AAuto.Checked = True Then - ' MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information) - ' HybridMode_CB.Checked = False - ' End If - ' End If - 'End Sub Private Sub MetroLink1_Click(sender As Object, e As EventArgs) Process.Start("https://github.com/hama3254/Crunchyroll-Downloader-v3.0/discussions/276") @@ -1337,6 +1184,20 @@ Public Class Einstellungen End If End Sub + Private Sub CR_SoftSubs_Change(sender As Object, e As EventArgs) Handles CR_SoftSubs.Click + Dim Popup As New CheckBoxComboBox + Popup.Text = "CR Sub selection" + Popup.Show() + End Sub + + + + 'Private Sub CB_CR_Audio_Click(sender As Object, e As EventArgs) Handles CB_CR_Audio.Click + ' Dim Popup As New CheckBoxComboBox + ' Popup.Text = "CR Dub selection" + ' Popup.Show() + 'End Sub + @@ -1346,6 +1207,4 @@ Public Class Einstellungen #End Region - -#End Region End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/queue.vb b/Crunchyroll Downloader/queue.vb index b95b2c2..c6d2395 100644 --- a/Crunchyroll Downloader/queue.vb +++ b/Crunchyroll Downloader/queue.vb @@ -1,8 +1,6 @@ Option Strict On -Imports System.ComponentModel + Imports System.Net -Imports System.Windows.Forms.VisualStyles.VisualStyleElement -Imports System.Windows.Forms.VisualStyles.VisualStyleElement.Button Imports MetroFramework Imports MetroFramework.Components