From 5102d2d3b66b3f3b9523ccd45a724054a2b6f032 Mon Sep 17 00:00:00 2001 From: hama3254 Date: Fri, 9 Jun 2023 16:15:24 +0200 Subject: [PATCH] small fixes fix ui #754 fix name processing #760 --- .vs/Crunchyroll Downloader/v17/.suo | Bin 208384 -> 198656 bytes .../CheckBoxComboBox.Designer.vb | 2 +- Crunchyroll Downloader/CheckBoxComboBox.vb | 8 ++++---- Crunchyroll Downloader/Main.vb | 10 +++++----- Crunchyroll Downloader/einstellungen.vb | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 2c4ddfce52c4b62e8a61154dde6f8ed641021cc8..87237648a69326186427ecaefdc906ff0efd3a0a 100644 GIT binary patch delta 11129 zcmeHN3tZGy_MdZRcnS�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 SipY80gS5rC+RVN=75)dK@*27T delta 12378 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 diff --git a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb index c17d877..192fec8 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb @@ -34,7 +34,7 @@ Partial Class CheckBoxComboBox ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle - Me.ClientSize = New System.Drawing.Size(320, 302) + Me.ClientSize = New System.Drawing.Size(320, 327) Me.ControlBox = False Me.DisplayHeader = False Me.MaximizeBox = False diff --git a/Crunchyroll Downloader/CheckBoxComboBox.vb b/Crunchyroll Downloader/CheckBoxComboBox.vb index fc31980..a6b5140 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.vb @@ -145,19 +145,19 @@ Public Class CheckBoxComboBox 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 + If Me.Height < 330 Then Me.Height = Me.Height + 30 Else - Me.Height = 300 + Me.Height = 330 Animation.Enabled = False End If ElseIf Me.Text = "CR Sub selection" Then - If Me.Height < 270 Then + If Me.Height < 300 Then Me.Height = Me.Height + 30 Else - Me.Height = 270 + Me.Height = 300 Animation.Enabled = False End If diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index d104ad6..4b151a6 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1351,6 +1351,11 @@ Public Class Main If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Or CBool(InStr(TextBox2_Text, "++")) = True Then + If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then + CR_season_number = Nothing + ElseIf IgnoreSeason = 2 Then + CR_season_number = Nothing + End If If Season_Prefix = "[default season prefix]" Then If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie @@ -1370,11 +1375,6 @@ Public Class Main CR_FolderSeason = CR_season_number - If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then - CR_season_number = Nothing - ElseIf IgnoreSeason = 2 Then - CR_season_number = Nothing - End If If Episode_Prefix = "[default episode prefix]" Then diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 9e1ab44..ae3ac0c 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -200,7 +200,7 @@ Public Class Einstellungen CB_CR_Harsubs.Items.Clear() - For i As Integer = 0 To Main.LangValueEnum.Count - 1 + For i As Integer = 0 To Main.LangValueEnum.Count - 2 CB_CR_Harsubs.Items.Add(Main.LangValueEnum(i).Name) If Main.LangValueEnum(i).CR_Value = Main.SubSprache.CR_Value Then 'MsgBox(CB_CR_Harsubs.Items.Count.ToString)