From 18a06b84dc02c59cc17f28629f4d7b0f2e86287a Mon Sep 17 00:00:00 2001 From: hama3254 <52826614+hama3254@users.noreply.github.com> Date: Thu, 16 Feb 2023 20:56:58 +0100 Subject: [PATCH] new settings UI (CR softsubs) new settings UI (CR softsubs) added save thumbnail debug option #690 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 198144 -> 204800 bytes Crunchyroll Downloader/App.config | 3 + Crunchyroll Downloader/CRD-Classes.vb | 1 + .../CRD_List_Item.Designer.vb | 6 + Crunchyroll Downloader/CRD_List_Item.resx | 3 + Crunchyroll Downloader/CRD_List_Item.vb | 25 ++ .../CheckBoxComboBox.Designer.vb | 50 +++ Crunchyroll Downloader/CheckBoxComboBox.resx | 123 +++++++ Crunchyroll Downloader/CheckBoxComboBox.vb | 168 +++++++++ .../Crunchyroll Downloader.vbproj | 15 +- Crunchyroll Downloader/Main.designer.vb | 9 +- Crunchyroll Downloader/Main.resx | 338 +++++++----------- Crunchyroll Downloader/Main.vb | 19 + .../My Project/AssemblyInfo.vb | 4 +- .../My Project/Settings.Designer.vb | 12 + .../My Project/Settings.settings | 3 + Crunchyroll Downloader/Resources/BG.png | Bin 0 -> 247 bytes .../einstellungen.Designer.vb | 281 +++++---------- Crunchyroll Downloader/einstellungen.resx | 3 - Crunchyroll Downloader/einstellungen.vb | 215 ++--------- Crunchyroll Downloader/queue.vb | 4 +- 21 files changed, 689 insertions(+), 593 deletions(-) create mode 100644 Crunchyroll Downloader/CheckBoxComboBox.Designer.vb create mode 100644 Crunchyroll Downloader/CheckBoxComboBox.resx create mode 100644 Crunchyroll Downloader/CheckBoxComboBox.vb create mode 100644 Crunchyroll Downloader/Resources/BG.png diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 5c9a4d64277a8884b477adfb9879f7eda1a5ff1c..fc1d50087ab6dd6abff89dd89494319fd17ca94c 100644 GIT binary patch delta 14686 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 Lgio>;KE(JRhhdRa delta 10606 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 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 0000000000000000000000000000000000000000..d8805c76a60d51875637fec33385cd0aa2e1e9f9 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0y~yV2lH@jX0Qq 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