diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index a6b641a..6e92ad0 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index bce8161..1ab504a 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index a6335ed..1ea1c88 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index 5cb2f30..1dcde13 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index d52b987..3d81751 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -30,7 +30,12 @@ Public Class Anime_Add Private Sub Anime_Add_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try + Try Dim ListBox1List As New List(Of String) 'Jeder Eintrag in der Combobox durchgehen @@ -227,7 +232,7 @@ Public Class Anime_Add If Main.RunningDownloads >= Main.MaxDL Then ListBox1.Items.Add(textBox1.Text) textBox1.ForeColor = Color.FromArgb(9248044) - Main.Pause(1) + Pause(1) textBox1.ForeColor = Color.Black textBox1.Text = "URL" Else @@ -264,7 +269,8 @@ Public Class Anime_Add GeckoFX.WebBrowser1.Navigate(textBox1.Text) Do Until Main.b = True - Main.StatusMainForm.Text = "Status: loading ..." + Main.Text = "Status: loading ..." + Main.Invalidate() StatusLabel.Text = "Status: loading ..." Pause(1) Loop @@ -299,7 +305,8 @@ Public Class Anime_Add AoDlogFileStream.Close() If AoD_Cookie = Nothing Then MsgBox(Main.LoginReminder) - Main.StatusMainForm.Text = "Crunchyroll Downloader" + Main.Text = "Crunchyroll Downloader" + Main.Invalidate() StatusLabel.Text = "Status: idle" Exit Sub End If @@ -321,7 +328,7 @@ Public Class Anime_Add client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie) 'MsgBox(OmUStreamSplitEpisodeIndex(1)) m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0)) - + '("Sub: " + m3u8Strings) End Using Catch ex As Exception MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + OmUStreamSplitEpisodeIndex2(0) + "/OmU/1080/hlsfirst/" + OmUStreamSplitToken(0)) @@ -353,7 +360,7 @@ Public Class Anime_Add client.Headers.Add(AoD_Cookie) '+ WebBrowser1.Document.Cookie) 'MsgBox(DubStreamSplitEpisodeIndex(1)) m3u8Strings = client.DownloadString("https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0)) - + 'MsgBox("Dub: " + m3u8Strings) End Using Catch ex As Exception MsgBox(ex.ToString + vbNewLine + "https://www.anime-on-demand.de/videomaterialurl/" + DubStreamSplitEpisodeIndex2(0) + "/Dub/1080/hlsfirst/" + DubStreamSplitToken(0)) @@ -370,7 +377,7 @@ Public Class Anime_Add End If AoD_Mode = True - If AoD_DubList.Count And AoD_OmuList.Count > 1 Then + If AoD_DubList.Count And AoD_OmUList.Count > 0 Then GroupBox3.Visible = False groupBox2.Visible = True @@ -381,7 +388,7 @@ Public Class Anime_Add ComboBox1.Items.Add("Dub") ComboBox1.Items.Add("OmU") FillAoDDropDown() - ElseIf AoD_DubList.Count Or AoD_OmuList.Count > 1 Then + ElseIf AoD_DubList.Count Or AoD_OmUList.Count > 0 Then GroupBox3.Visible = False groupBox2.Visible = True @@ -500,13 +507,14 @@ Public Class Anime_Add Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem - sender.BackColor = Color.White + Dim CB As ComboBox = sender + CB.BackColor = Color.White If e.Index >= 0 Then Using st As New StringFormat With {.Alignment = StringAlignment.Center} ' e.DrawBackground() ' e.DrawFocusRectangle() e.Graphics.FillRectangle(SystemBrushes.ControlLightLight, e.Bounds) - e.Graphics.DrawString(sender.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) + e.Graphics.DrawString(CB.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) End Using End If @@ -619,7 +627,8 @@ Public Class Anime_Add Main.Funimation_Grapp_RDY = False Main.b = False StatusLabel.Text = "Status: loading ..." - Main.StatusMainForm.Text = "Status: loading ..." + Main.Text = "Status: loading ..." + Main.Invalidate() End If Else @@ -629,7 +638,8 @@ Public Class Anime_Add Main.Grapp_RDY = False Main.b = False StatusLabel.Text = "Status: loading ..." - Main.StatusMainForm.Text = "Status: loading ..." + Main.Text = "Status: loading ..." + Main.Invalidate() End If End If @@ -688,24 +698,34 @@ Public Class Anime_Add Dim SubExit As Boolean = False Dim CB3 As Integer = 0 Dim CB4 As Integer = 0 - Dim TargetReso As String = Main.Resu + Dim TargetReso As String = Main.Reso + Dim AoD_1080pPlus As Boolean = False Me.Invoke(New Action(Function() 'Main.StatusMainForm.Text = "Crunchyroll Downloader" Pfad2 = Main.Pfad - TargetReso = Main.Resu + + If Main.AoD_Reso = 0 Then + TargetReso = Main.Reso + ElseIf Main.AoD_Reso = 576 Then + TargetReso = 576 + ElseIf Main.AoD_Reso = 1080 Then + AoD_1080pPlus = True + TargetReso = 1080 + End If + If ComboBox1.Enabled = False Then - If AoD_DubList.Count > 1 Then + If AoD_DubList.Count > 0 Then For i As Integer = 0 To AoD_DubList.Count - 1 ProcessList.Add(AoD_DubList(i)) Next Dub = True - ElseIf AoD_OmuList.Count > 1 Then - For i As Integer = 0 To AoD_OmuList.Count - 1 - ProcessList.Add(AoD_OmuList(i)) + ElseIf AoD_OmUList.Count > 0 Then + For i As Integer = 0 To AoD_OmUList.Count - 1 + ProcessList.Add(AoD_OmUList(i)) Next Else - MsgBox("error") + MsgBox("error 1") SubExit = True End If @@ -719,7 +739,7 @@ Public Class Anime_Add ProcessList.Add(AoD_OmuList(i)) Next Else - MsgBox("error") + MsgBox("error 2") SubExit = True @@ -780,7 +800,8 @@ Public Class Anime_Add DlMax = Main.MaxDL Dim d As Integer = ii - CB3 + 1 Add_Display.Text = d.ToString + " / " + c.ToString - Main.StatusMainForm.Text = "Status: " + d.ToString + " / " + c.ToString ' looking for video file" + Main.Text = "Status: " + d.ToString + " / " + c.ToString ' looking for video file" + Main.Invalidate() Return Nothing End Function)) @@ -797,7 +818,8 @@ Public Class Anime_Add Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "") If My.Computer.FileSystem.FileExists(Pfad5) Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung Me.Invoke(New Action(Function() - Main.StatusMainForm.Text = "Status: File already exists." + Main.Text = "Status: File already exists." + Main.Invalidate() Return Nothing End Function)) @@ -805,7 +827,8 @@ Public Class Anime_Add Try My.Computer.FileSystem.DeleteFile(Pfad5) Me.Invoke(New Action(Function() - Main.StatusMainForm.Text = "Status: Old file overwritten." + Main.Text = "Status: Old file overwritten." + Main.Invalidate() Return Nothing End Function)) @@ -813,7 +836,7 @@ Public Class Anime_Add End Try Else Me.Invoke(New Action(Function() - Main.StatusMainForm.Text = "Crunchyroll Downloader" + Main.Text = "Crunchyroll Downloader" Return Nothing End Function)) @@ -828,12 +851,18 @@ Public Class Anime_Add Dim AoDThumbnail As String = AoDThumbnail2(0) Dim AoDTm3u8() As String = ProcessList.Item(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) Dim m3u8_Master_url As String = AoDTm3u8(0).Replace("&", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&") + Dim m3u8_list As New List(Of String) Dim m3u8_url As String = Nothing Dim m3u8_url_Temp As String = Nothing Dim client As New WebClient client.Encoding = System.Text.Encoding.UTF8 Dim text As String = client.DownloadString(m3u8_Master_url) + 'Me.Invoke(New Action(Function() + ' MsgBox(text) + ' Return Nothing + ' End Function)) + If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments Dim new_m3u8() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) If TargetReso = 42 Then @@ -843,10 +872,51 @@ Public Class Anime_Add For i2 As Integer = 0 To new_m3u8.Count - 1 'MsgBox("x" + Main.Resu.ToString) If CBool(InStr(new_m3u8(i2), "x" + TargetReso.ToString)) = True Then - m3u8_url_Temp = new_m3u8(i2 + 1) - Exit For + m3u8_list.Add(new_m3u8(i2) + vbCrLf + new_m3u8(i2 + 1)) + 'm3u8_url_Temp = new_m3u8(i2 + 1) + 'Exit For End If Next + If m3u8_list.Count > 1 Then + Dim HigestBitrate As Integer = 0 + For i2 As Integer = 0 To m3u8_list.Count - 1 + 'MsgBox("x" + Main.Resu.ToString) + If CBool(InStr(m3u8_list.Item(i2), "AVERAGE-BANDWIDTH=")) = True Then + Dim BitRate() As String = m3u8_list.Item(i2).Split(New String() {"AVERAGE-BANDWIDTH="}, System.StringSplitOptions.RemoveEmptyEntries) + Dim BitRate2() As String = BitRate(1).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) + If AoD_1080pPlus = True Then + If CInt(BitRate2(0)) > HigestBitrate Then + HigestBitrate = CInt(BitRate2(0)) + End If + Else + 'Me.Invoke(New Action(Function() + ' MsgBox(HigestBitrate.ToString + vbNewLine + BitRate2(0)) + ' Return Nothing + ' End Function)) + If HigestBitrate > CInt(BitRate2(0)) Then + HigestBitrate = CInt(BitRate2(0)) + ElseIf HigestBitrate = 0 Then + HigestBitrate = CInt(BitRate2(0)) + End If + End If + + End If + Next + 'Me.Invoke(New Action(Function() + ' MsgBox(HigestBitrate.ToString) + ' Return Nothing + ' End Function)) + For i2 As Integer = 0 To m3u8_list.Count - 1 + If CBool(InStr(m3u8_list.Item(i2), HigestBitrate.ToString)) = True Then + Dim new_m3u8_2() As String = m3u8_list.Item(i2).Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) + m3u8_url_Temp = new_m3u8_2(1) + End If + Next + Else + Dim new_m3u8_2() As String = m3u8_list.Item(0).Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) + m3u8_url_Temp = new_m3u8_2(1) + End If + If InStr(m3u8_url_Temp, "https://") Then m3u8_url = m3u8_url_Temp Else @@ -864,14 +934,17 @@ Public Class Anime_Add Dim AoDm3u8Final As String = "-i " + Chr(34) + m3u8_url + Chr(34) + " " + Main.ffmpeg_command - - + Dim DisplayReso As String = TargetReso.ToString + "p" + If AoD_1080pPlus = True Then + DisplayReso = "1080p+" + End If Dim L1Name As String = "anime-on-demand.de" 'L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub Me.Invoke(New Action(Function() - Main.ListItemAdd(Pfad2, L1Name, AoDTitle, "[Auto]", "Unknown", "None", AoDThumbnail, AoDm3u8Final, DownloadPfad) + Main.ListItemAdd(Pfad2, L1Name, AoDTitle, DisplayReso, "Unknown", "None", AoDThumbnail, AoDm3u8Final, DownloadPfad) + Main.liList.Add(My.Resources.htmlvorThumbnail + AoDThumbnail + My.Resources.htmlnachTumbnail + "
" + AoDTitle + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") + Return Nothing End Function)) - Main.liList.Add(My.Resources.htmlvorThumbnail + AoDThumbnail + My.Resources.htmlnachTumbnail + "
" + AoDTitle + My.Resources.htmlvorAufloesung + "[Auto]" + My.Resources.htmlvorSoftSubs + vbNewLine + "None" + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "") diff --git a/Crunchyroll Downloader/CRD_List_Item.Designer.vb b/Crunchyroll Downloader/CRD_List_Item.Designer.vb index 9b7633c..4e6fc91 100644 --- a/Crunchyroll Downloader/CRD_List_Item.Designer.vb +++ b/Crunchyroll Downloader/CRD_List_Item.Designer.vb @@ -31,16 +31,18 @@ Partial Class CRD_List_Item Me.Label_Reso = New System.Windows.Forms.Label() Me.Label_Hardsub = New System.Windows.Forms.Label() Me.Label_percent = New System.Windows.Forms.Label() - Me.ProgressBar1 = New System.Windows.Forms.ProgressBar() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.Timer2 = New System.Windows.Forms.Timer(Me.components) Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ViewInExplorerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PlaybackVideoFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ProgressBar1 = New MetroFramework.Controls.MetroProgressBar() + Me.PictureBox5 = New System.Windows.Forms.PictureBox() CType(Me.PB_Thumbnail, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.bt_pause, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.bt_del, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStrip1.SuspendLayout() + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'PB_Thumbnail @@ -125,14 +127,6 @@ Partial Class CRD_List_Item Me.Label_percent.Text = "Status Label : speed, size and percent" Me.Label_percent.TextAlign = System.Drawing.ContentAlignment.MiddleRight ' - 'ProgressBar1 - ' - Me.ProgressBar1.Location = New System.Drawing.Point(195, 70) - Me.ProgressBar1.Name = "ProgressBar1" - Me.ProgressBar1.Size = New System.Drawing.Size(615, 20) - Me.ProgressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous - Me.ProgressBar1.TabIndex = 8 - ' 'Timer2 ' Me.Timer2.Enabled = True @@ -141,25 +135,43 @@ Partial Class CRD_List_Item ' Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ViewInExplorerToolStripMenuItem, Me.PlaybackVideoFileToolStripMenuItem}) Me.ContextMenuStrip1.Name = "ContextMenuStrip1" - Me.ContextMenuStrip1.Size = New System.Drawing.Size(181, 70) + Me.ContextMenuStrip1.Size = New System.Drawing.Size(173, 48) ' 'ViewInExplorerToolStripMenuItem ' Me.ViewInExplorerToolStripMenuItem.Name = "ViewInExplorerToolStripMenuItem" - Me.ViewInExplorerToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ViewInExplorerToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.ViewInExplorerToolStripMenuItem.Text = "View in explorer" ' 'PlaybackVideoFileToolStripMenuItem ' Me.PlaybackVideoFileToolStripMenuItem.Name = "PlaybackVideoFileToolStripMenuItem" - Me.PlaybackVideoFileToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.PlaybackVideoFileToolStripMenuItem.Size = New System.Drawing.Size(172, 22) Me.PlaybackVideoFileToolStripMenuItem.Text = "playback video file" ' + 'ProgressBar1 + ' + Me.ProgressBar1.Location = New System.Drawing.Point(195, 70) + Me.ProgressBar1.Name = "ProgressBar1" + Me.ProgressBar1.Size = New System.Drawing.Size(615, 20) + Me.ProgressBar1.TabIndex = 9 + ' + 'PictureBox5 + ' + Me.PictureBox5.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.balken + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.PictureBox5.Location = New System.Drawing.Point(0, 136) + Me.PictureBox5.Margin = New System.Windows.Forms.Padding(0) + Me.PictureBox5.Name = "PictureBox5" + Me.PictureBox5.Size = New System.Drawing.Size(838, 6) + Me.PictureBox5.TabIndex = 68 + Me.PictureBox5.TabStop = False + ' 'CRD_List_Item ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.backgroud + Me.Controls.Add(Me.PictureBox5) Me.Controls.Add(Me.ProgressBar1) Me.Controls.Add(Me.Label_percent) Me.Controls.Add(Me.Label_Hardsub) @@ -175,6 +187,7 @@ Partial Class CRD_List_Item CType(Me.bt_pause, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.bt_del, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStrip1.ResumeLayout(False) + CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -188,10 +201,11 @@ Partial Class CRD_List_Item Friend WithEvents Label_Reso As Label Friend WithEvents Label_Hardsub As Label Friend WithEvents Label_percent As Label - Friend WithEvents ProgressBar1 As ProgressBar Friend WithEvents ToolTip1 As ToolTip Friend WithEvents Timer2 As Timer Friend WithEvents ContextMenuStrip1 As ContextMenuStrip Friend WithEvents ViewInExplorerToolStripMenuItem As ToolStripMenuItem Friend WithEvents PlaybackVideoFileToolStripMenuItem As ToolStripMenuItem + Friend WithEvents ProgressBar1 As MetroFramework.Controls.MetroProgressBar + Friend WithEvents PictureBox5 As PictureBox End Class diff --git a/Crunchyroll Downloader/CRD_List_Item.vb b/Crunchyroll Downloader/CRD_List_Item.vb index 8b303e5..a43a8af 100644 --- a/Crunchyroll Downloader/CRD_List_Item.vb +++ b/Crunchyroll Downloader/CRD_List_Item.vb @@ -280,25 +280,14 @@ Public Class CRD_List_Item Label_percent.SetBounds(432, locationY + 101, 378, 19) Label_percent.AutoSize = False ProgressBar1.SetBounds(195, locationY + 70, 601, 20) - 'ProgressBar1.ForeColor = Color.Red + PictureBox5.Location = New Point(0, 136) + PictureBox5.Height = 6 End Sub Public Function GetTextBound() Return Label_website.Location.Y End Function - Public Sub SetLocations(ByVal locationY As Integer) - bt_del.SetBounds(775, locationY + 10, 35, 29) - bt_pause.SetBounds(740, locationY + 15, 25, 20) - PB_Thumbnail.SetBounds(11, locationY + 20, 168, 95) - PB_Thumbnail.BringToFront() - Label_website.Location = New Point(195, locationY + 15) - Label_Anime.Location = New Point(195, locationY + 42) - Label_Reso.Location = New Point(195, locationY + 101) - Label_Hardsub.Location = New Point(300, locationY + 101) - Label_percent.SetBounds(455, locationY + 101, 355, 19) - Label_percent.AutoSize = False - ProgressBar1.SetBounds(195, locationY + 70, 601, 20) - End Sub + #Region "Download + Update UI" @@ -402,40 +391,41 @@ Public Class CRD_List_Item End Function)) For i As Integer = 1 To MergeSub.Count - 1 - Dim SubsURL As String() = MergeSub(i).Split(New [Char]() {Chr(34)}) - Dim SubsClient As New WebClient - SubsClient.Encoding = Encoding.UTF8 - If Main.WebbrowserCookie = Nothing Then - Else - SubsClient.Headers.Add(HttpRequestHeader.Cookie, Main.WebbrowserCookie) - End If - Dim SubsFile As String = einstellungen.GeräteID() + ".txt" + Dim SubsURL As String() = MergeSub(i).Split(New [Char]() {Chr(34)}) + Dim SubsClient As New WebClient + SubsClient.Encoding = Encoding.UTF8 + If Main.WebbrowserCookie = Nothing Then + Else + SubsClient.Headers.Add(HttpRequestHeader.Cookie, Main.WebbrowserCookie) + End If + Dim SubsFile As String = einstellungen.GeräteID() + ".txt" - Dim retry As Boolean = True - Dim retryCount As Integer = 3 - While retry - Try - SubsClient.DownloadFile(SubsURL(0), Pfad2 + "\" + SubsFile) - retry = False - Catch ex As Exception - If retryCount > 0 Then - retryCount = retryCount - 1 - Me.Invoke(New Action(Function() - Label_percent.Text = "Error Downloading Subtitles - retrying" - Return Nothing - End Function)) - - Else - Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False) - Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) - sink.WriteLine(My.Resources.ass_template) - End Using + Dim retry As Boolean = True + Dim retryCount As Integer = 3 + While retry + Try + SubsClient.DownloadFile(SubsURL(0), Pfad2 + "\" + SubsFile) retry = False - End If - End Try - End While - DL_URL = DL_URL.Replace(SubsURL(0), Pfad2 + "\" + SubsFile) - Next + Catch ex As Exception + If retryCount > 0 Then + retryCount = retryCount - 1 + Me.Invoke(New Action(Function() + Label_percent.Text = "Error Downloading Subtitles - retrying" + Return Nothing + End Function)) + + Else + Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False) + Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) + sink.WriteLine(My.Resources.ass_template) + End Using + retry = False + End If + End Try + End While + DL_URL = DL_URL.Replace(SubsURL(0), Pfad2 + "\" + SubsFile) + Next + End If Dim m3u8_url As String() = DL_URL.Split(New [Char]() {Chr(34)}) Dim m3u8_url_1 As String = Nothing @@ -445,12 +435,6 @@ Public Class CRD_List_Item End If Dim client0 As New WebClient client0.Encoding = Encoding.UTF8 - 'MsgBox(m3u8_url(1)) - 'client0.Headers.Add("User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:82.0) Gecko/20100101 Firefox/82.0") - 'client0.Headers.Add("ACCEPT: application/json, text/javascript, */*; q=0.01") - 'client0.Headers.Add("Accept-Encoding: gzip, deflate, br") - 'client0.Headers.Add("X-Requested-With: XMLHttpRequest") - 'client0.Headers.Add(Main.WebbrowserCookie) Dim text As String = client0.DownloadString(m3u8_url(1)) If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) @@ -579,7 +563,36 @@ Public Class CRD_List_Item End If Dim KeyFile3 As String = einstellungen.GeräteID() + ".key" KeyFileCache = KeyFile3 - KeyClient.DownloadFile(KeyFile2(0), Application.StartupPath + "\" + KeyFile3) + + Dim retry As Boolean = True + Dim retryCount As Integer = 3 + + Try + KeyClient.DownloadFile(KeyFile2(0), Application.StartupPath + "\" + KeyFile3) + Retry = False + Catch ex As Exception + If retryCount > 0 Then + retryCount = retryCount - 1 + Me.Invoke(New Action(Function() + Label_percent.Text = "Access Error - retrying" + Return Nothing + End Function)) + + Else + Me.Invoke(New Action(Function() + Label_percent.Text = "Access Error - download canceled" + Return Nothing + End Function)) + Return Nothing + Exit Function + 'Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False) + 'Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) + ' sink.WriteLine(My.Resources.ass_template) + 'End Using + 'Retry = False + End If + End Try + LoadedKeys.Add(KeyFile2(0)) End If If KeyFile2.Count > 1 Then @@ -616,7 +629,36 @@ Public Class CRD_List_Item End If Dim KeyFile3 As String = einstellungen.GeräteID() + ".key" KeyFileCache = KeyFile3 - KeyClient.DownloadFile(KeyFile2(0), Application.StartupPath + "\" + KeyFile3) + + Dim retry As Boolean = True + Dim retryCount As Integer = 3 + + Try + KeyClient.DownloadFile(KeyFile2(0), Application.StartupPath + "\" + KeyFile3) + Retry = False + Catch ex As Exception + If retryCount > 0 Then + retryCount = retryCount - 1 + Me.Invoke(New Action(Function() + Label_percent.Text = "Access Error - retrying" + Return Nothing + End Function)) + + Else + Me.Invoke(New Action(Function() + Label_percent.Text = "Access Error - download canceled" + Return Nothing + End Function)) + Return Nothing + Exit Function + 'Dim utf8WithoutBom2 As New System.Text.UTF8Encoding(False) + 'Using sink As New StreamWriter(SubsFile, False, utf8WithoutBom2) + ' sink.WriteLine(My.Resources.ass_template) + 'End Using + 'Retry = False + End If + End Try + 'KeyClient.DownloadFile(KeyFile2(0), Application.StartupPath + "\" + KeyFile3) LoadedKeys.Add(KeyFile2(0)) End If If KeyFile2.Count > 1 Then @@ -719,7 +761,7 @@ Public Class CRD_List_Item Sub ProcessClosed(ByVal sender As Object, ByVal e As System.EventArgs) Try - + Pause(5) If Finished = False Then If Canceld = False Then Label_website.Text = "The download process seems to have crashed" @@ -990,5 +1032,13 @@ Public Class CRD_List_Item Process.Start(DownloadPfad.Replace(Chr(34), "")) End Sub + Private Sub CRD_List_Item_Resize(sender As Object, e As EventArgs) Handles Me.Resize + PictureBox5.Width = Me.Width - 40 + + bt_del.Location = New Point(Me.Width - 63, 10) + bt_pause.Location = New Point(Me.Width - 98, 15) + + ProgressBar1.Width = Me.Width - 223 + End Sub End Class diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj index cfc47aa..d01ccfe 100644 --- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj +++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj @@ -94,6 +94,10 @@ ..\packages\Geckofx60.32.60.0.50\lib\net45\Geckofx-Winforms.dll + + False + E:\ui\metroframework-modern-ui-master\MetroFramework\bin\x86\Debug\MetroFramework.dll + @@ -158,16 +162,10 @@ Resources.resx - - Startup.vb + + ErrorDialog.vb - - Form - - - Reso.vb - - + Form @@ -212,9 +210,6 @@ CRD_List_Item.vb - - Startup.vb - Main.vb @@ -224,8 +219,8 @@ Designer Resources.Designer.vb - - Reso.vb + + ErrorDialog.vb @@ -265,11 +260,12 @@ + + + + + - - - - diff --git a/Crunchyroll Downloader/Reso.Designer.vb b/Crunchyroll Downloader/ErrorDialog.Designer.vb similarity index 99% rename from Crunchyroll Downloader/Reso.Designer.vb rename to Crunchyroll Downloader/ErrorDialog.Designer.vb index f326c69..5155b80 100644 --- a/Crunchyroll Downloader/Reso.Designer.vb +++ b/Crunchyroll Downloader/ErrorDialog.Designer.vb @@ -1,5 +1,5 @@  -Partial Class Reso +Partial Class ErrorDialog Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/Crunchyroll Downloader/Reso.resx b/Crunchyroll Downloader/ErrorDialog.resx similarity index 100% rename from Crunchyroll Downloader/Reso.resx rename to Crunchyroll Downloader/ErrorDialog.resx diff --git a/Crunchyroll Downloader/Reso.vb b/Crunchyroll Downloader/ErrorDialog.vb similarity index 95% rename from Crunchyroll Downloader/Reso.vb rename to Crunchyroll Downloader/ErrorDialog.vb index 0ff69cf..9a0dc29 100644 --- a/Crunchyroll Downloader/Reso.vb +++ b/Crunchyroll Downloader/ErrorDialog.vb @@ -1,4 +1,4 @@ -Public Class Reso +Public Class ErrorDialog #Region " Move Form " ' [ Move Form ] @@ -41,7 +41,12 @@ Private Sub Reso_Load(sender As Object, e As EventArgs) Handles MyBase.Load 'ButtonResoNotFound.Text = Main.ButtonResoNotFoundText - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try + Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2) ComboBox1.Items.Clear() If Main.DialogTaskString = "Language" Then @@ -113,7 +118,7 @@ ' e.DrawBackground() ' e.DrawFocusRectangle() e.Graphics.FillRectangle(SystemBrushes.ControlLightLight, e.Bounds) - e.Graphics.DrawString(sender.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) + e.Graphics.DrawString(ComboBox1.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) End Using End If diff --git a/Crunchyroll Downloader/FirstStartup.vb b/Crunchyroll Downloader/FirstStartup.vb index 8a6564c..1e4b853 100644 --- a/Crunchyroll Downloader/FirstStartup.vb +++ b/Crunchyroll Downloader/FirstStartup.vb @@ -1,6 +1,10 @@ Public Class FirstStartup Private Sub FistStartup_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try End Sub diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index b2f64a9..146b8a0 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -22,7 +22,7 @@ Public Class GeckoFX If Main.LoginOnly = "US_UnBlock" Then Main.LoginOnly = "US_UnBlock_Wait" If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "waiting for reCAPTCHA . . .")) Then - Main.Pause(4) + Pause(4) Main.LoginOnly = "US_UnBlock" Else Try @@ -42,11 +42,11 @@ Public Class GeckoFX End If WebBrowser1.Navigate("https://www.crunchyroll.com/logout") - Main.Pause(5) + Pause(5) WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "session_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") - Main.Pause(1) + Pause(1) WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "sess_id=" + keks + "; expires=Thu, 04 Jan 2022 00:00:00 UTC; path=/;" + Chr(34) + ";") - Main.Pause(1) + Pause(1) WebBrowser1.Navigate("https://www.crunchyroll.com/") Main.LoginOnly = "US_UnBlock_Finsihed" End If @@ -185,7 +185,7 @@ Public Class GeckoFX t.Start() Else - Main.StatusMainForm.Text = "Status: no video found" + Main.Text = "Status: no video found" Anime_Add.StatusLabel.Text = "fail?" End If End If @@ -208,7 +208,7 @@ Public Class GeckoFX Main.b = True Main.UserBowser = True For i As Integer = 20 To 0 Step -1 - Main.Pause(1) + Pause(1) Anime_Add.StatusLabel.Text = "Status: scanning network traffic " + Math.Abs(i).ToString Next Anime_Add.StatusLabel.Text = "Status: " @@ -273,7 +273,7 @@ Public Class GeckoFX Else Anime_Add.StatusLabel.Text = "Status: no m3u8 found, analyzing HTML content" WebBrowser1.Navigate("view-source:" + Main.WebbrowserURL) - Main.Pause(3) + Pause(3) If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, ".m3u8")) Then #Region "m3u8 suche" Main.WebbrowserText = UrlDecode(WebBrowser1.Document.Body.OuterHtml) @@ -308,7 +308,7 @@ Public Class GeckoFX Anime_Add.StatusLabel.Text = "Status: m3u8 found, but looks like it is DRM protected" Else Anime_Add.StatusLabel.Text = "Status: m3u8 found, looks good" - Main.Pause(1) + Pause(1) Main.NonCR_URL = m3u8Link t = New Thread(AddressOf Main.Grapp_non_CR) t.Priority = ThreadPriority.Normal @@ -369,7 +369,12 @@ Public Class GeckoFX WebBrowser1.Navigate(Main.Startseite) End If End If - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try + Main.UserBowser = True 'Main.Pause(15) 'For ii As Integer = 19 To 46 @@ -540,7 +545,7 @@ Public Class GeckoFX Main.b = True Main.UserBowser = True For i As Integer = 20 To 0 Step -1 - Main.Pause(1) + Pause(1) Button2.Text = "network scan is in progess " + Math.Abs(i).ToString Next If InStr(Main.WebbrowserURL, "anime-on-demand.de/anime/") Then diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index 899864c..5296d34 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -1,7 +1,7 @@  Partial Class Main - Inherits System.Windows.Forms.Form - + Inherits MetroFramework.Forms.MetroForm + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. Protected Overrides Sub Dispose(ByVal disposing As Boolean) @@ -27,7 +27,6 @@ Partial Class Main Me.Btn_Close = New System.Windows.Forms.PictureBox() Me.Btn_Settings = New System.Windows.Forms.PictureBox() Me.Btn_Browser = New System.Windows.Forms.PictureBox() - Me.StatusMainForm = New System.Windows.Forms.Label() Me.ListView1 = New System.Windows.Forms.ListView() Me.Link = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.PictureBox5 = New System.Windows.Forms.PictureBox() @@ -37,12 +36,17 @@ Partial Class Main Me.Timer3 = New System.Windows.Forms.Timer(Me.components) Me.TheTextBox = New System.Windows.Forms.RichTextBox() Me.PictureBox6 = New System.Windows.Forms.PictureBox() + Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components) + Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) + Me.PictureBox1 = New System.Windows.Forms.PictureBox() CType(Me.Btn_add, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Settings, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Browser, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Btn_add @@ -50,9 +54,10 @@ Partial Class Main Me.Btn_add.BackColor = System.Drawing.Color.Transparent Me.Btn_add.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_add.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_add - Me.Btn_add.Location = New System.Drawing.Point(5, 7) + Me.Btn_add.Location = New System.Drawing.Point(20, 17) + Me.Btn_add.Margin = New System.Windows.Forms.Padding(0) Me.Btn_add.Name = "Btn_add" - Me.Btn_add.Size = New System.Drawing.Size(100, 48) + Me.Btn_add.Size = New System.Drawing.Size(80, 35) Me.Btn_add.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage Me.Btn_add.TabIndex = 24 Me.Btn_add.TabStop = False @@ -62,7 +67,8 @@ Partial Class Main Me.Btn_Close.BackColor = System.Drawing.Color.Transparent Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close - Me.Btn_Close.Location = New System.Drawing.Point(789, 1) + Me.Btn_Close.Location = New System.Drawing.Point(790, 1) + Me.Btn_Close.Margin = New System.Windows.Forms.Padding(0) Me.Btn_Close.Name = "Btn_Close" Me.Btn_Close.Size = New System.Drawing.Size(50, 40) Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -74,9 +80,10 @@ Partial Class Main Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent Me.Btn_Settings.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_Settings.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_settings - Me.Btn_Settings.Location = New System.Drawing.Point(676, 12) + Me.Btn_Settings.Location = New System.Drawing.Point(676, 17) + Me.Btn_Settings.Margin = New System.Windows.Forms.Padding(0) Me.Btn_Settings.Name = "Btn_Settings" - Me.Btn_Settings.Size = New System.Drawing.Size(100, 40) + Me.Btn_Settings.Size = New System.Drawing.Size(80, 35) Me.Btn_Settings.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage Me.Btn_Settings.TabIndex = 22 Me.Btn_Settings.TabStop = False @@ -86,25 +93,14 @@ Partial Class Main Me.Btn_Browser.BackColor = System.Drawing.Color.Transparent Me.Btn_Browser.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_Browser.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_browser - Me.Btn_Browser.Location = New System.Drawing.Point(110, 12) + Me.Btn_Browser.Location = New System.Drawing.Point(114, 18) + Me.Btn_Browser.Margin = New System.Windows.Forms.Padding(0) Me.Btn_Browser.Name = "Btn_Browser" - Me.Btn_Browser.Size = New System.Drawing.Size(100, 40) + Me.Btn_Browser.Size = New System.Drawing.Size(80, 35) Me.Btn_Browser.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage Me.Btn_Browser.TabIndex = 21 Me.Btn_Browser.TabStop = False ' - 'StatusMainForm - ' - Me.StatusMainForm.BackColor = System.Drawing.Color.Transparent - Me.StatusMainForm.Font = New System.Drawing.Font("Consolas", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.StatusMainForm.ForeColor = System.Drawing.SystemColors.WindowFrame - Me.StatusMainForm.Location = New System.Drawing.Point(212, 15) - Me.StatusMainForm.Name = "StatusMainForm" - Me.StatusMainForm.Size = New System.Drawing.Size(431, 35) - Me.StatusMainForm.TabIndex = 66 - Me.StatusMainForm.Text = "Crunchyroll Downloader" - Me.StatusMainForm.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' 'ListView1 ' Me.ListView1.BackColor = System.Drawing.SystemColors.Control @@ -114,10 +110,11 @@ Partial Class Main Me.ListView1.ForeColor = System.Drawing.Color.Black Me.ListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None Me.ListView1.HideSelection = False - Me.ListView1.Location = New System.Drawing.Point(1, 73) - Me.ListView1.MinimumSize = New System.Drawing.Size(800, 400) + Me.ListView1.Location = New System.Drawing.Point(1, 71) + Me.ListView1.Margin = New System.Windows.Forms.Padding(0) + Me.ListView1.MinimumSize = New System.Drawing.Size(798, 403) Me.ListView1.Name = "ListView1" - Me.ListView1.Size = New System.Drawing.Size(838, 547) + Me.ListView1.Size = New System.Drawing.Size(840, 546) Me.ListView1.TabIndex = 57 Me.ListView1.UseCompatibleStateImageBehavior = False Me.ListView1.View = System.Windows.Forms.View.Details @@ -130,15 +127,16 @@ Partial Class Main 'PictureBox5 ' Me.PictureBox5.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.balken + Me.PictureBox5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.PictureBox5.Location = New System.Drawing.Point(1, 65) + Me.PictureBox5.Margin = New System.Windows.Forms.Padding(0) Me.PictureBox5.Name = "PictureBox5" - Me.PictureBox5.Size = New System.Drawing.Size(838, 8) + Me.PictureBox5.Size = New System.Drawing.Size(840, 6) Me.PictureBox5.TabIndex = 67 Me.PictureBox5.TabStop = False ' 'Timer1 ' - Me.Timer1.Enabled = True ' 'Timer2 ' @@ -154,49 +152,75 @@ Partial Class Main ' Me.TheTextBox.BackColor = System.Drawing.SystemColors.ScrollBar Me.TheTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None - Me.TheTextBox.Location = New System.Drawing.Point(1, 630) + Me.TheTextBox.Location = New System.Drawing.Point(0, 652) + Me.TheTextBox.Margin = New System.Windows.Forms.Padding(0) Me.TheTextBox.Name = "TheTextBox" - Me.TheTextBox.Size = New System.Drawing.Size(838, 111) + Me.TheTextBox.Size = New System.Drawing.Size(840, 96) Me.TheTextBox.TabIndex = 69 Me.TheTextBox.Text = "" + Me.TheTextBox.Visible = False ' 'PictureBox6 ' Me.PictureBox6.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.balken + Me.PictureBox6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBox6.Location = New System.Drawing.Point(1, 620) + Me.PictureBox6.Location = New System.Drawing.Point(0, 618) + Me.PictureBox6.Margin = New System.Windows.Forms.Padding(0) Me.PictureBox6.Name = "PictureBox6" - Me.PictureBox6.Size = New System.Drawing.Size(838, 8) + Me.PictureBox6.Size = New System.Drawing.Size(840, 6) Me.PictureBox6.TabIndex = 68 Me.PictureBox6.TabStop = False ' + 'MetroStyleManager1 + ' + Me.MetroStyleManager1.Owner = Nothing + ' + 'PictureBox1 + ' + Me.PictureBox1.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.Main_top + Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch + Me.PictureBox1.Location = New System.Drawing.Point(1, 0) + Me.PictureBox1.Margin = New System.Windows.Forms.Padding(0) + Me.PictureBox1.Name = "PictureBox1" + Me.PictureBox1.Size = New System.Drawing.Size(840, 1) + Me.PictureBox1.TabIndex = 70 + Me.PictureBox1.TabStop = False + ' 'Main ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.main_background - Me.ClientSize = New System.Drawing.Size(840, 629) + Me.ApplyImageInvert = True + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None + Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle + Me.ClientSize = New System.Drawing.Size(842, 630) + Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.TheTextBox) Me.Controls.Add(Me.PictureBox6) Me.Controls.Add(Me.PictureBox5) Me.Controls.Add(Me.ListView1) - Me.Controls.Add(Me.StatusMainForm) Me.Controls.Add(Me.Btn_add) Me.Controls.Add(Me.Btn_Close) Me.Controls.Add(Me.Btn_Settings) Me.Controls.Add(Me.Btn_Browser) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ForeColor = System.Drawing.Color.Black + Me.Margin = New System.Windows.Forms.Padding(0) Me.MaximizeBox = False Me.MinimizeBox = False + Me.MinimumSize = New System.Drawing.Size(840, 630) Me.Name = "Main" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "crunchyroll downloader" + Me.Resizable = True + Me.Style = MetroFramework.MetroColorStyle.Orange + Me.Text = "Crunchyroll Downloader" + Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center CType(Me.Btn_add, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Btn_Settings, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Btn_Browser, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -205,7 +229,6 @@ Partial Class Main Private WithEvents Btn_Close As PictureBox Private WithEvents Btn_Settings As PictureBox Private WithEvents Btn_Browser As PictureBox - Friend WithEvents StatusMainForm As Label Friend WithEvents ListView1 As ListView Friend WithEvents Link As ColumnHeader Friend WithEvents PictureBox5 As PictureBox @@ -215,4 +238,7 @@ Partial Class Main Friend WithEvents Timer3 As Timer Friend WithEvents TheTextBox As RichTextBox Friend WithEvents PictureBox6 As PictureBox + Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender + Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager + Friend WithEvents PictureBox1 As PictureBox End Class diff --git a/Crunchyroll Downloader/Main.resx b/Crunchyroll Downloader/Main.resx index a402506..ffc3b64 100644 --- a/Crunchyroll Downloader/Main.resx +++ b/Crunchyroll Downloader/Main.resx @@ -129,6 +129,12 @@ 294, 17 + + 383, 17 + + + 548, 17 + 87 diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 8b55423..a6a6f4c 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -3,13 +3,16 @@ Imports System.Text Imports System.IO Imports Microsoft.Win32 Imports System.Threading -Imports System.ComponentModel Imports System.Net.WebUtility Imports System.Net.Sockets -Imports System.Drawing.Drawing2D -Imports Gecko + +Imports MetroFramework.Forms +Imports MetroFramework +Imports MetroFramework.Components Public Class Main + Inherits MetroForm + Public ErrorTolerance As Integer = 0 Public liList As New List(Of String) Public HTMLString As String = My.Resources.Startuphtml @@ -47,9 +50,11 @@ Public Class Main Public LoginOnly As String = "False" Public Pfad As String = My.Computer.FileSystem.CurrentDirectory Public ffmpeg_command As String = " -c copy -bsf:a aac_adtstoasc" '" -c:v hevc_nvenc -preset fast -b:v 6M -bsf:a aac_adtstoasc " - Public Resu As Integer - Dim Resu2 As String - Public ResuSave As String = "6666x6666" + Public Reso As Integer + Public AoD_Reso As Integer = 0 + + Dim Reso2 As String + Public ResoSave As String = "6666x6666" Public SubSprache As String Public SubFolder As Integer Public SoftSubs As New List(Of String) @@ -118,23 +123,136 @@ Public Class Main #Region "UI" - Private Sub PictureBox1_MouseHover(sender As Object, e As EventArgs) Handles Btn_Browser.MouseEnter, Btn_Settings.MouseEnter, Btn_Close.MouseEnter, Btn_add.MouseEnter - Dim PB As PictureBox = sender - PB.BackColor = Color.LightGray + Private Sub Main_TextChanged(sender As Object, e As EventArgs) Handles Me.TextChanged + Me.Invalidate() End Sub - Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Browser.MouseLeave, Btn_Settings.MouseLeave, Btn_Close.MouseLeave, Btn_add.MouseLeave - Dim PB As PictureBox = sender - PB.BackColor = Color.Transparent + Private Sub ListView1_MouseWheel(sender As Object, e As MouseEventArgs) Handles ListView1.MouseWheel + Try + For s As Integer = 0 To ListView1.Items.Count - 1 + Dim r As Rectangle = ListView1.Items.Item(s).Bounds + ItemList(s).SetBounds(r.X, r.Y, ListView1.Width - 2, r.Height) + + If ItemList(s).GetToDispose() = True Then + ItemList(s).DisposeItem(ItemList(s).GetToDispose()) + ItemList.RemoveAt(s) + ListView1.Items.RemoveAt(s) + End If + + Next + Catch ex As Exception + + End Try End Sub + Dim ListViewHeightOffset As Integer = 7 + + Private Sub Btn_add_MouseEnter(sender As Object, e As EventArgs) Handles Btn_add.MouseEnter + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_add_invert + End Sub + + Private Sub Btn_add_MouseLeave(sender As Object, e As EventArgs) Handles Btn_add.MouseLeave + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_add + End Sub + Private Sub Btn_Browser_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Browser.MouseEnter + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_browser_invert + End Sub + + Private Sub Btn_Browser_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Browser.MouseLeave + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_browser + End Sub + Private Sub Btn_Settings_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Settings.MouseEnter + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_setting_invert + End Sub + + Private Sub Btn_Settings_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Settings.MouseLeave + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_settings + End Sub + Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Close.MouseEnter + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_del + End Sub + + Private Sub Btn_Close_MouseLeave(sender As Object, e As EventArgs) Handles Btn_Close.MouseLeave + Dim PB As PictureBox = sender + PB.Image = My.Resources.main_close + End Sub + + Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click + If TheTextBox.Visible = True Then + TheTextBox.Visible = False + ListViewHeightOffset = 7 + PictureBox6.Location = New Point(0, Me.Height - ListViewHeightOffset) + + TheTextBox.Location = New Point(1, Me.Height - ListViewHeightOffset + 7) + TheTextBox.Width = Me.Width - 2 + Else + ListViewHeightOffset = 103 + TheTextBox.Visible = True + PictureBox6.Location = New Point(0, Me.Height - ListViewHeightOffset) + + TheTextBox.Location = New Point(1, Me.Height - ListViewHeightOffset + 7) + TheTextBox.Width = Me.Width - 2 + End If + + End Sub + + Private Sub PictureBox6_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox6.MouseEnter + PictureBox6.BackgroundImage = My.Resources.balken_console + End Sub + + Private Sub PictureBox6_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox6.MouseLeave + PictureBox6.BackgroundImage = My.Resources.balken + End Sub + + Private Sub Main_Resize(sender As Object, e As EventArgs) Handles Me.Resize + ListView1.Width = Me.Width - 2 + ListView1.Height = Me.Height - 71 - ListViewHeightOffset + + PictureBox5.Width = Me.Width - 40 + PictureBox1.Width = Me.Width - 2 + + PictureBox6.Location = New Point(1, Me.Height - ListViewHeightOffset) + PictureBox6.Width = Me.Width - 40 + + TheTextBox.Location = New Point(1, Me.Height - ListViewHeightOffset + 7) + TheTextBox.Width = Me.Width - 2 + + Btn_Close.Location = New Point(Me.Width - 49, 1) + Btn_Settings.Location = New Point(Me.Width - 140, 17) + + Try + For s As Integer = 0 To ListView1.Items.Count - 1 + Dim r As Rectangle = ListView1.Items.Item(s).Bounds + ItemList(s).SetBounds(r.X, r.Y, ListView1.Width - 2, r.Height) + + If ItemList(s).GetToDispose() = True Then + ItemList(s).DisposeItem(ItemList(s).GetToDispose()) + ItemList.RemoveAt(s) + ListView1.Items.RemoveAt(s) + End If + + Next + Catch ex As Exception + + End Try + + End Sub #End Region Public Declare Function waveOutSetVolume Lib "winmm.dll" (ByVal uDeviceID As Integer, ByVal dwVolume As Integer) As Integer Private Sub Form8_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim tbtl As TextBoxTraceListener = New TextBoxTraceListener(TheTextBox) + Debug.Listeners.Add(tbtl) 'Try ' Dim SettingsDone As Boolean = False ' Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") @@ -142,7 +260,9 @@ Public Class Main 'Catch ex As Exception ' FirstStartup.ShowDialog() 'End Try + MetroStyleManager1.Style = MetroColorStyle.Orange + Me.StyleManager = MetroStyleManager1 Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") @@ -172,7 +292,11 @@ Public Class Main End Try ServicePointManager.Expect100Continue = True ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") @@ -213,11 +337,16 @@ Public Class Main 'End If Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") - Resu = Integer.Parse(rkg.GetValue("Resu").ToString) + Reso = Integer.Parse(rkg.GetValue("Resu").ToString) 'MsgBox(Resu) Catch ex As Exception End Try - + Try + Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") + AoD_Reso = Integer.Parse(rkg.GetValue("AoD_Reso").ToString) + Catch ex As Exception + AoD_Reso = 0 + End Try Try Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader") SubSprache = rkg.GetValue("Sub").ToString @@ -294,8 +423,8 @@ Public Class Main #End Region - If Resu = Nothing Then - Resu = 1080 + If Reso = Nothing Then + Reso = 1080 End If If SubSprache = Nothing Then @@ -321,7 +450,7 @@ Public Class Main End With End Sub - Public Sub ItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal Reso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal Thumbnail As Image, ByVal URL_DL As String, ByVal Pfad_DL As String) + Public Sub ItemConstructor(ByVal NameP1 As String, ByVal NameP2 As String, ByVal DisplayReso As String, ByVal HardSub As String, ByVal SoftSubs As String, ByVal Thumbnail As Image, ByVal URL_DL As String, ByVal Pfad_DL As String) Dim Item As New CRD_List_Item Item.Visible = False @@ -343,10 +472,10 @@ Public Class Main r.Width = 838 r.Height = 142 Item.SetTolerance(ErrorTolerance) - Item.SetTargetReso(Resu) + Item.SetTargetReso(Reso) Item.SetLabelWebsite(NameP1) Item.SetLabelAnimeTitel(NameP2) - Item.SetLabelResolution(Reso) + Item.SetLabelResolution(DisplayReso) Item.SetLabelHardsub(HardSub) Item.SetThumbnailImage(Thumbnail) Item.SetLabelPercent("0%") @@ -412,19 +541,7 @@ Public Class Main Item.DownloadMangaPages(Pfad, BaseURL, SiteList, NameP2) End Sub #End Region - Public Sub Pause(ByVal pau As Single) - 'Programmausführung verzögern ******************************************************* - - Dim start, finish As Single - start = Microsoft.VisualBasic.DateAndTime.Timer - - finish = start + pau - Do While Microsoft.VisualBasic.DateAndTime.Timer < finish - Application.DoEvents() - Loop - - End Sub #Region "Season DL" @@ -1277,7 +1394,7 @@ Public Class Main Me.Invoke(New Action(Function() ResoNotFoundString = WebbrowserText DialogTaskString = "Language" - Reso.ShowDialog() + ErrorDialog.ShowDialog() Return Nothing End Function)) If UserCloseDialog = True Then @@ -1309,7 +1426,7 @@ Public Class Main Me.Invoke(New Action(Function() ResoNotFoundString = WebbrowserText DialogTaskString = "Language" - Reso.ShowDialog() + ErrorDialog.ShowDialog() Return Nothing End Function)) If UserCloseDialog = True Then @@ -1361,7 +1478,8 @@ Public Class Main If CBool(InStr(CR_URI_Master, "master.m3u8")) Then Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: m3u8 found, looking for resolution" - StatusMainForm.Text = "Status: m3u8 found, looking for resolution" + Me.Text = "Status: m3u8 found, looking for resolution" + Me.Invalidate() Return Nothing End Function)) Else @@ -1428,7 +1546,8 @@ Public Class Main Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: The file video already exists." - StatusMainForm.Text = "Status: The file video already exists." + Me.Text = "Status: The file video already exists." + Me.Invalidate() Return Nothing End Function)) If MessageBox.Show("The file " + Pfad5 + " already exists." + vbNewLine + "You want to override it?", "File exists!", MessageBoxButtons.OKCancel) = DialogResult.OK Then @@ -1443,7 +1562,7 @@ Public Class Main End If #End Region - If Resu = 42 Then + If Reso = 42 Then If MergeSubstoMP4 = True Then URL_DL = "-i " + Chr(34) + CR_URI_Master + Chr(34) + SoftSubMergeURLs + SoftSubMergeMaps + " " + ffmpeg_command + " -c:s mov_text" + SoftSubMergeMetatata + " -metadata:s:a:0 language=" + CCtoMP4CC(CR_Anime_Dub) Else @@ -1459,17 +1578,17 @@ Public Class Main Dim str As String = client.DownloadString(CR_URI_Master) 'MsgBox(str) - If CBool(InStr(str, "x" + Resu.ToString + ",")) Then - Resu2 = "x" + Resu.ToString + If CBool(InStr(str, "x" + Reso.ToString + ",")) Then + Reso2 = "x" + Reso.ToString Else 'MsgBox(str) - If CBool(InStr(str, ResuSave + ",")) Then - Resu2 = Resu2 + If CBool(InStr(str, ResoSave + ",")) Then + Reso2 = Reso2 Else Me.Invoke(New Action(Function() DialogTaskString = "Resolution" ResoNotFoundString = str - Reso.ShowDialog() + ErrorDialog.ShowDialog() Return Nothing End Function)) @@ -1478,13 +1597,13 @@ Public Class Main If UserCloseDialog = True Then Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Else - Resu2 = ResoBackString + Reso2 = ResoBackString End If End If End If #Region "old non gzip fix" - 'MsgBox(Resu2) - ' Dim VLC_URI_1 As String() = str.Split(New String() {Resu2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) + 'MsgBox(Reso2) + ' Dim VLC_URI_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) ' Dim VLC_URI_2 As String() = VLC_URI_1(1).Split(New [Char]() {Chr(34)}) ' Dim VLC_URI_3 As String() = VLC_URI_2(2).Split(New [Char]() {System.Convert.ToChar("#")}) ' If MergeSubstoMP4 = True Then @@ -1502,7 +1621,7 @@ Public Class Main #Region "gzip fix - no cloudfront cdn" - Dim ffmpeg_url_1 As String() = str.Split(New String() {Resu2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) + Dim ffmpeg_url_1 As String() = str.Split(New String() {Reso2 + ","}, System.StringSplitOptions.RemoveEmptyEntries) Dim ffmpeg_url_3 As String() = Nothing 'MsgBox(ffmpeg_url_1.Count.ToString) If ffmpeg_url_1.Count > 2 Then @@ -1540,9 +1659,9 @@ Public Class Main Dim Subsprache3 As String = HardSubValuesToDisplay(SubSprache2) Dim ResoHTMLDisplay As String = Nothing If ResoBackString = Nothing Then - ResoHTMLDisplay = Resu.ToString + "p" + ResoHTMLDisplay = Reso.ToString + "p" ElseIf DialogTaskString = "Language" Then - ResoHTMLDisplay = Resu.ToString + "p" + ResoHTMLDisplay = Reso.ToString + "p" Else Dim ResoHTML As String() = ResoBackString.Split(New String() {"x"}, System.StringSplitOptions.RemoveEmptyEntries) If ResoHTML.Count > 1 Then @@ -1553,7 +1672,7 @@ Public Class Main End If End If Dim L2Name As String = CR_FilenName_Backup - If Resu = 42 Then + If Reso = 42 Then ResoHTMLDisplay = "[Auto]" End If Pfad_DL = Pfad2 @@ -1571,14 +1690,16 @@ Public Class Main Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: idle" - StatusMainForm.Text = "Crunchyroll Downloader" + Me.Text = "Crunchyroll Downloader" + Me.Invalidate() Return Nothing End Function)) Catch ex As Exception Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: idle" - StatusMainForm.Text = "Crunchyroll Downloader" + Me.Text = "Crunchyroll Downloader" + Me.Invalidate() Return Nothing End Function)) Grapp_RDY = True @@ -1598,13 +1719,13 @@ Public Class Main Dim CCC As String() = WebbrowserText.Split(New String() {My.Resources.CC_String}, System.StringSplitOptions.RemoveEmptyEntries) Dim CCC1 As String() = CCC(1).Split(New String() {".gif" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim SaveString As String = "Operating System: " + My.Computer.Info.OSFullName + vbNewLine + vbNewLine + "Crunchyroll URL: " + WebbrowserURL + vbNewLine + vbNewLine + "subtitle language: " + SubSprache + vbNewLine + vbNewLine + "video resolution: " + Resu.ToString + vbNewLine + vbNewLine + "error message: " + ex.ToString + vbNewLine + ex.StackTrace.ToString + vbNewLine + vbNewLine + "softsubs enabled?: " + SoftSubs.ToString + vbNewLine + vbNewLine + "Crunchyroll Downloader Version: " + Application.ProductVersion + vbNewLine + vbNewLine + "detected location from Crunchyroll: " + CCC1(0) + Dim SaveString As String = "Operating System: " + My.Computer.Info.OSFullName + vbNewLine + vbNewLine + "Crunchyroll URL: " + WebbrowserURL + vbNewLine + vbNewLine + "subtitle language: " + SubSprache + vbNewLine + vbNewLine + "video resolution: " + Reso.ToString + vbNewLine + vbNewLine + "error message: " + ex.ToString + vbNewLine + ex.StackTrace.ToString + vbNewLine + vbNewLine + "softsubs enabled?: " + SoftSubs.ToString + vbNewLine + vbNewLine + "Crunchyroll Downloader Version: " + Application.ProductVersion + vbNewLine + vbNewLine + "detected location from Crunchyroll: " + CCC1(0) File.WriteAllText("Error " + DateTime.Now.ToString("dd.MM.yyyy HH.mm") + ".txt", SaveString) Dim Request As HttpWebRequest = CType(WebRequest.Create("https://docs.google.com/forms/d/e/1FAIpQLSdR1QI19Lh-c-XO_iXNkDwsTUZhCMEu84boQkgW5AOBUxyiyA/formResponse"), HttpWebRequest) Request.Method = "POST" Request.ContentType = "application/x-www-form-urlencoded" - Dim Post As String = "entry.240217066=" + My.Computer.Info.OSFullName + "&entry.358200455=" + WebbrowserURL + "&entry.618751432=" + SubSprache + "&entry.924054550=" + Resu.ToString + "&entry.679000538=" + ex.ToString + "&entry.1789515979=" + SoftSubsString + "&entry.683247287=" + Application.ProductVersion + "&entry.377264428=" + CCC1(0) + "&fvv=1&draftResponse=[null,null," + Chr(34) + "-3005021683493723280" + Chr(34) + "] &pageHistory=0&fbzx=-3005021683493723280" + Dim Post As String = "entry.240217066=" + My.Computer.Info.OSFullName + "&entry.358200455=" + WebbrowserURL + "&entry.618751432=" + SubSprache + "&entry.924054550=" + Reso.ToString + "&entry.679000538=" + ex.ToString + "&entry.1789515979=" + SoftSubsString + "&entry.683247287=" + Application.ProductVersion + "&entry.377264428=" + CCC1(0) + "&fvv=1&draftResponse=[null,null," + Chr(34) + "-3005021683493723280" + Chr(34) + "] &pageHistory=0&fbzx=-3005021683493723280" Dim byteArray() As Byte = Encoding.UTF8.GetBytes(Post) Request.ContentLength = byteArray.Length Dim DataStream As Stream = Request.GetRequestStream() @@ -1673,6 +1794,7 @@ Public Class Main End Sub Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles Btn_add.Click + Me.Text = "Test" Anime_Add.Show() End Sub @@ -1686,50 +1808,6 @@ Public Class Main GeckoFX.Show() End Sub -#Region " Move Form " - - ' [ Move Form ] - ' - ' // By Elektro - - Public MoveForm As Boolean - Public MoveForm_MousePosition As Point - - Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseDown, StatusMainForm.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown) - - If e.Button = MouseButtons.Left Then - MoveForm = True - Me.Cursor = Cursors.NoMove2D - MoveForm_MousePosition = e.Location - End If - - End Sub - - Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseMove, StatusMainForm.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove) - - If MoveForm Then - Me.Location = Me.Location + (e.Location - MoveForm_MousePosition) - End If - - End Sub - - Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseUp, StatusMainForm.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp) - - If e.Button = MouseButtons.Left Then - MoveForm = False - Me.Cursor = Cursors.Default - End If - - End Sub -#End Region - - Private Sub PictureBox5_Click(sender As Object, e As EventArgs) - Startup.ShowDialog() - End Sub - Public Function RemoveExtraSpaces(input_text As String) As String Dim rsRegEx As System.Text.RegularExpressions.Regex @@ -1743,7 +1821,7 @@ Public Class Main Try For s As Integer = 0 To ListView1.Items.Count - 1 Dim r As Rectangle = ListView1.Items.Item(s).Bounds - ItemList(s).SetBounds(r.X, r.Y, r.Width, r.Height) + ItemList(s).SetBounds(r.X, r.Y, ListView1.Width - 2, r.Height) If ItemList(s).GetToDispose() = True Then ItemList(s).DisposeItem(ItemList(s).GetToDispose()) @@ -1823,7 +1901,7 @@ Public Class Main 'Dim AllResoArry() As String = AllReso.Split(New String() {"p"}, System.StringSplitOptions.RemoveEmptyEntries) 'Dim Zeilen() As String = ffmpegOutput.Split(New String() {vbNewLine}, System.StringSplitOptions.RemoveEmptyEntries) 'For i As Integer = 0 To Zeilen.Count - 1 - ' If InStr(Zeilen(i), "x" + Resu.ToString + " [") Then + ' If InStr(Zeilen(i), "x" + Reso.ToString + " [") Then ' Dim ZeileReso() As String = Zeilen(i).Split(New String() {": Video:"}, System.StringSplitOptions.RemoveEmptyEntries) ' Dim ZeileReso2() As String = ZeileReso(0).Split(New String() {"Stream #"}, System.StringSplitOptions.RemoveEmptyEntries) ' StreamNR = ZeileReso2(1) @@ -1839,7 +1917,8 @@ Public Class Main If NonCR_URL = Nothing Then Exit Sub Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: m3u8 found, trying to start the download" - StatusMainForm.Text = "Status: m3u8 found, trying to start the download" + Me.Text = "Status: m3u8 found, trying to start the download" + Me.Invalidate() Return Nothing End Function)) Grapp_non_cr_RDY = False @@ -1937,7 +2016,8 @@ Public Class Main Me.Invoke(New Action(Function() Anime_Add.StatusLabel.Text = "Status: idle" - StatusMainForm.Text = "Crunchyroll Downloader" + Me.Text = "Crunchyroll Downloader" + Me.Invalidate() Return Nothing End Function)) @@ -1970,6 +2050,7 @@ Public Class Main Try Dim ItemDownloadingCount As Integer = 0 For i As Integer = 0 To ListView1.Items.Count - 1 + If ItemList(i).GetIsStatusFinished() = False Then ItemDownloadingCount = ItemDownloadingCount + 1 End If @@ -1985,7 +2066,8 @@ Public Class Main Public Sub Funitmation_Grapp() Try Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: looking for video file" + Me.Text = "Status: looking for video file" + Me.Invalidate() Return Nothing End Function)) @@ -2076,7 +2158,8 @@ Public Class Main Dim Pfad5 As String = DownloadPfad.Replace(Chr(34), "") If My.Computer.FileSystem.FileExists(Pfad5) Then 'Pfad = Kompeltter Pfad mit Dateinamen + ENdung Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: File already exists." + Me.Text = "Status: File already exists." + Me.Invalidate() Return Nothing End Function)) @@ -2084,7 +2167,8 @@ Public Class Main Try My.Computer.FileSystem.DeleteFile(Pfad5) Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Old file overwritten." + Me.Text = "Status: Old file overwritten." + Me.Invalidate() Return Nothing End Function)) @@ -2092,7 +2176,8 @@ Public Class Main End Try Else Me.Invoke(New Action(Function() - StatusMainForm.Text = "Crunchyroll Downloader" + Me.Text = "Crunchyroll Downloader" + Me.Invalidate() Return Nothing End Function)) @@ -2137,7 +2222,8 @@ Public Class Main GeckoFX.WebBrowser1.Navigate(WebbrowserURL) Try Anime_Add.StatusLabel.Text = "retrying Funimation" - StatusMainForm.Text = "retrying Funimation" + Me.Text = "retrying Funimation" + Me.Invalidate() Catch ex As Exception End Try Return Nothing @@ -2150,7 +2236,8 @@ Public Class Main End If Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Video found!" + Me.Text = "Status: Video found!" + Me.Invalidate() Return Nothing End Function)) @@ -2163,7 +2250,7 @@ Public Class Main For i As Integer = 0 To textLenght.Length - 1 Try If InStr(textLenght(i), "https") Then - If InStr(textLenght(i - 1), "x" + Resu.ToString) Then + If InStr(textLenght(i - 1), "x" + Reso.ToString) Then Dim CheckClient As New WebClient CheckClient.Encoding = Encoding.UTF8 @@ -2210,10 +2297,11 @@ Public Class Main If Funimation_m3u8_final = Nothing Then Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Resolution not found!" + Me.Text = "Status: Resolution not found!" + Me.Invalidate() DialogTaskString = "Funimation_Resolution" ResoNotFoundString = str1 - Reso.ShowDialog() + ErrorDialog.ShowDialog() Return Nothing End Function)) @@ -2261,7 +2349,8 @@ Public Class Main Next Else Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Resolution found!" + Me.Text = "Status: Resolution found!" + Me.Invalidate() Return Nothing End Function)) @@ -2275,7 +2364,7 @@ Public Class Main Dim thumbnail2 As String() = thumbnail(1).Split(New String() {Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) Dim thumbnail3 As String = thumbnail2(0) '.Replace("\/", "/") #End Region - Dim ResoHTMLDisplay As String = Resu.ToString + "p" + Dim ResoHTMLDisplay As String = Reso.ToString + "p" #Region "Subs" Dim SubsClient As New WebClient @@ -2455,7 +2544,8 @@ Public Class Main Catch ex As Exception Me.Invoke(New Action(Function() - StatusMainForm.Text = "Crunchyroll Downloader!" + Me.Text = "Crunchyroll Downloader!" + Me.Invalidate() Return Nothing End Function)) @@ -2465,9 +2555,9 @@ Public Class Main End Sub Private Sub Timer3_Tick(sender As Object, e As EventArgs) Handles Timer3.Tick - + Me.Invalidate() Try - Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", StatusMainForm.Text.Replace("open the add window to continue", "")) + Dim GeckoHTML As String = My.Resources.htmlTop + vbNewLine + My.Resources.htmlTitlel.Replace("Placeholder", Me.Text.Replace("open the add window to continue", "")) Dim LiAdd As String = Nothing For ii As Integer = 0 To ItemList.Count - 1 For i As Integer = 0 To liList.Count - 1 @@ -2584,7 +2674,8 @@ Public Class Main Debug.WriteLine("receiving data from the add-on") Debug.WriteLine(UrlDecode(htmlReq)) Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: receiving data from the add-on" + Me.Text = "Status: receiving data from the add-on" + Me.Invalidate() Return Nothing End Function)) #Region "CR Einzeln" @@ -2605,7 +2696,8 @@ Public Class Main WebbrowserTitle = TitleSplit2(0) If CBool(InStr(WebbrowserText, "hardsub_lang")) Then Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Download added from add-on" + Me.Text = "Status: Download added from add-on" + Me.Invalidate() Return Nothing End Function)) If Grapp_RDY = True Then @@ -2635,7 +2727,8 @@ Public Class Main sendHTMLResponse(strRequest, clientSocket) Else Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: no video found" + Me.Text = "Status: no video found" + Me.Invalidate() Return Nothing End Function)) Dim ErrorPage As String = My.Resources.Post_error_Top + "no video found" + My.Resources.Post_error_Bottom @@ -2681,7 +2774,8 @@ Public Class Main Next Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: " + ListBoxList.Count.ToString + " Downloads in queue" + vbNewLine + "open the add window to continue" + Me.Text = "Status: " + ListBoxList.Count.ToString + " Downloads in queue" + vbNewLine + "open the add window to continue" + Me.Invalidate() Return Nothing End Function)) End If @@ -2699,7 +2793,8 @@ Public Class Main Debug.WriteLine("single episode mode - Funimation") 'Debug.WriteLine(htmlReq) Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: Download added from add-on" + Me.Text = "Status: Download added from add-on" + Me.Invalidate() Return Nothing End Function)) Try @@ -2736,7 +2831,8 @@ Public Class Main ListBoxList.Add(WebbrowserURL) End If Me.Invoke(New Action(Function() - StatusMainForm.Text = "Status: " + ListBoxList.Count.ToString + " Downloads in queue" + Me.Text = "Status: " + ListBoxList.Count.ToString + " Downloads in queue" + Me.Invalidate() Return Nothing End Function)) End If @@ -2884,31 +2980,16 @@ Public Class Main End If End Function - Private Sub Main_MouseDoubleClick(sender As Object, e As MouseEventArgs) Handles Me.MouseDoubleClick - End Sub + + + + #End Region - Protected Overrides Sub OnHandleCreated(ByVal e As EventArgs) - Dim tbtl As TextBoxTraceListener = New TextBoxTraceListener(TheTextBox) - Debug.Listeners.Add(tbtl) - 'Debug.WriteLine("Testing Testing 123") - End Sub - Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click - If Me.Height = 741 Then - Me.Height = 629 - Else - Me.Height = 741 - End If - End Sub - Private Sub PictureBox6_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox6.MouseEnter - PictureBox6.BackgroundImage = My.Resources.balken_console - End Sub - Private Sub PictureBox6_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox6.MouseLeave - PictureBox6.BackgroundImage = My.Resources.balken - End Sub + End Class diff --git a/Crunchyroll Downloader/Main_old.resx b/Crunchyroll Downloader/Main_bak.resx similarity index 100% rename from Crunchyroll Downloader/Main_old.resx rename to Crunchyroll Downloader/Main_bak.resx diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 49f7968..7b15c54 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/Resources.Designer.vb b/Crunchyroll Downloader/My Project/Resources.Designer.vb index d4d23f8..7b23b61 100644 --- a/Crunchyroll Downloader/My Project/Resources.Designer.vb +++ b/Crunchyroll Downloader/My Project/Resources.Designer.vb @@ -60,6 +60,16 @@ Namespace My.Resources End Set End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property about_icon() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("about_icon", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -608,6 +618,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property main_add_invert() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("main_add_invert", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -628,6 +648,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property main_browser_invert() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("main_browser_invert", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -748,6 +778,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property main_setting_invert() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("main_setting_invert", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -758,6 +798,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property Main_top() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("Main_top", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die </p> ''' </div> diff --git a/Crunchyroll Downloader/My Project/Resources.resx b/Crunchyroll Downloader/My Project/Resources.resx index 19bd539..4ae4496 100644 --- a/Crunchyroll Downloader/My Project/Resources.resx +++ b/Crunchyroll Downloader/My Project/Resources.resx @@ -148,11 +148,14 @@ ..\Resources\add_mass_cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\about_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\main-del-hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + "title":" ..\Resources\credits-background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,6 +163,10 @@ ", "kind": "subtitle", "type": "Full", "language": "en" + + <a class="main_titel">Placeholder</a> +<img alt="image error" src="balken.png" class="class-balken"> + <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> <html><head> @@ -233,6 +240,12 @@ "error":false,"code":"ok" + + ..\Resources\main_button_download-deactivate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + "image":" + ", "kind": "subtitle", "type": "CC", "language": "en" @@ -265,6 +278,29 @@ setInterval(function loadXMLDoc() { US cookies can't be used as long you are logged in. I delete the curremt session with the unlock, if you want to be logged in with the US cookie you need to enter you data on the left. + + + [Script Info] +; Template for error handling in the Crunchyrol Downloader by hama3254 https://github.com/hama3254/Crunchyroll-Downloader-v3.0 +; ass file from https://github.com/Aegisub/Aegisub/blob/master/automation/v4-docs/template-scripting-ideas.ass +; Script generated by Aegisub v2.00 PRE-RELEASE (SVN r939, jfs) +; http://www.aegisub.net +Title: Default Aegisub file +ScriptType: v4.00+ +WrapStyle: 0 +PlayResX: 640 +PlayResY: 480 +Video Aspect Ratio: 0 +Video Zoom: 6 +Video Position: 0 + +[V4+ Styles] +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,Arial,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,10,10,10,0 + +[Events] +Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text +Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how templated karaoke could work in auto4/lua ","resolution":"adaptive" @@ -341,8 +377,8 @@ I delete the curremt session with the unlock, if you want to be logged in with t ..\Resources\add-background.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\add_mass_cancel_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\balken_console.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DialogNotFound_Submit_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -403,6 +439,9 @@ I delete the curremt session with the unlock, if you want to be logged in with t ..\Resources\crdSettings_Button_SafeExit_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + ..\Resources\crdSettings_Button_SafeExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -417,12 +456,18 @@ I delete the curremt session with the unlock, if you want to be logged in with t <a href="#" class="cc-wert" title="Softsubs: + + ..\Resources\add_mass_cancel_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\softsubs_download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + {"sources":[{"file":" + <meta property="og:url" content=" @@ -460,46 +505,16 @@ I delete the curremt session with the unlock, if you want to be logged in with t ..\Resources\main_credits_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\balken_console.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Main_top.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - <a class="main_titel">Placeholder</a> -<img alt="image error" src="balken.png" class="class-balken"> + + ..\Resources\main-add_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:81.0) Gecko/20100101 Firefox/81.0" + + ..\Resources\main-browser_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - [Script Info] -; Template for error handling in the Crunchyrol Downloader by hama3254 https://github.com/hama3254/Crunchyroll-Downloader-v3.0 -; ass file from https://github.com/Aegisub/Aegisub/blob/master/automation/v4-docs/template-scripting-ideas.ass -; Script generated by Aegisub v2.00 PRE-RELEASE (SVN r939, jfs) -; http://www.aegisub.net -Title: Default Aegisub file -ScriptType: v4.00+ -WrapStyle: 0 -PlayResX: 640 -PlayResY: 480 -Video Aspect Ratio: 0 -Video Zoom: 6 -Video Position: 0 - -[V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding -Style: Default,Arial,20,&H00FFFFFF,&H0000FFFF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,2,2,2,10,10,10,0 - -[Events] -Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text -Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how templated karaoke could work in auto4/lua - - - {"sources":[{"file":" - - - "image":" - - - "title":" + + ..\Resources\main-setting_invert.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Crunchyroll Downloader/Resources/Main_top.png b/Crunchyroll Downloader/Resources/Main_top.png new file mode 100644 index 0000000..af7bcda Binary files /dev/null and b/Crunchyroll Downloader/Resources/Main_top.png differ diff --git a/Crunchyroll Downloader/Resources/about_icon.png b/Crunchyroll Downloader/Resources/about_icon.png new file mode 100644 index 0000000..1880e4b Binary files /dev/null and b/Crunchyroll Downloader/Resources/about_icon.png differ diff --git a/Crunchyroll Downloader/Resources/balken.png b/Crunchyroll Downloader/Resources/balken.png index e6da833..7554097 100644 Binary files a/Crunchyroll Downloader/Resources/balken.png and b/Crunchyroll Downloader/Resources/balken.png differ diff --git a/Crunchyroll Downloader/Resources/balken_console.png b/Crunchyroll Downloader/Resources/balken_console.png index 00a3f2f..6c70463 100644 Binary files a/Crunchyroll Downloader/Resources/balken_console.png and b/Crunchyroll Downloader/Resources/balken_console.png differ diff --git a/Crunchyroll Downloader/Resources/main-add_invert.png b/Crunchyroll Downloader/Resources/main-add_invert.png new file mode 100644 index 0000000..bf3699f Binary files /dev/null and b/Crunchyroll Downloader/Resources/main-add_invert.png differ diff --git a/Crunchyroll Downloader/Resources/main-background.png b/Crunchyroll Downloader/Resources/main-background.png index 6b7b5fa..4632c35 100644 Binary files a/Crunchyroll Downloader/Resources/main-background.png and b/Crunchyroll Downloader/Resources/main-background.png differ diff --git a/Crunchyroll Downloader/Resources/main-browser_invert.png b/Crunchyroll Downloader/Resources/main-browser_invert.png new file mode 100644 index 0000000..6ed27f9 Binary files /dev/null and b/Crunchyroll Downloader/Resources/main-browser_invert.png differ diff --git a/Crunchyroll Downloader/Resources/main-setting_invert.png b/Crunchyroll Downloader/Resources/main-setting_invert.png new file mode 100644 index 0000000..1426d03 Binary files /dev/null and b/Crunchyroll Downloader/Resources/main-setting_invert.png differ diff --git a/Crunchyroll Downloader/Startup.Designer.vb b/Crunchyroll Downloader/Startup.Designer.vb deleted file mode 100644 index 0cd4825..0000000 --- a/Crunchyroll Downloader/Startup.Designer.vb +++ /dev/null @@ -1,163 +0,0 @@ - -Partial Class Startup - Inherits System.Windows.Forms.Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - - Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() - Me.Timer1 = New System.Windows.Forms.Timer(Me.components) - Me.Timer2 = New System.Windows.Forms.Timer(Me.components) - Me.label1 = New System.Windows.Forms.Label() - Me.Label3 = New System.Windows.Forms.Label() - Me.PictureBox1 = New System.Windows.Forms.PictureBox() - Me.Label5 = New System.Windows.Forms.Label() - Me.Label7 = New System.Windows.Forms.Label() - Me.Label6 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'Timer1 - ' - Me.Timer1.Interval = 75 - ' - 'Timer2 - ' - Me.Timer2.Interval = 75 - ' - 'label1 - ' - Me.label1.BackColor = System.Drawing.Color.Transparent - Me.label1.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.label1.ForeColor = System.Drawing.Color.Black - Me.label1.Location = New System.Drawing.Point(38, 228) - Me.label1.Name = "label1" - Me.label1.Size = New System.Drawing.Size(140, 22) - Me.label1.TabIndex = 26 - Me.label1.Text = "libraries: " - Me.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Label3 - ' - Me.Label3.BackColor = System.Drawing.Color.Transparent - Me.Label3.Cursor = System.Windows.Forms.Cursors.Hand - Me.Label3.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(48, Byte), Integer), CType(CType(130, Byte), Integer), CType(CType(175, Byte), Integer)) - Me.Label3.Location = New System.Drawing.Point(379, 228) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(140, 22) - Me.Label3.TabIndex = 28 - Me.Label3.Text = "ffmpeg" - Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'PictureBox1 - ' - Me.PictureBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(5, Byte), Integer)) - Me.PictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close - Me.PictureBox1.Location = New System.Drawing.Point(549, 1) - Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(50, 39) - Me.PictureBox1.TabIndex = 29 - Me.PictureBox1.TabStop = False - ' - 'Label5 - ' - Me.Label5.BackColor = System.Drawing.Color.Transparent - Me.Label5.Font = New System.Drawing.Font("Arial", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.ForeColor = System.Drawing.Color.Black - Me.Label5.Location = New System.Drawing.Point(187, 154) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(368, 45) - Me.Label5.TabIndex = 31 - Me.Label5.Text = "Created by hama3254" - Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Label7 - ' - Me.Label7.BackColor = System.Drawing.Color.Transparent - Me.Label7.Cursor = System.Windows.Forms.Cursors.Hand - Me.Label7.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.ForeColor = System.Drawing.Color.FromArgb(CType(CType(48, Byte), Integer), CType(CType(130, Byte), Integer), CType(CType(175, Byte), Integer)) - Me.Label7.Location = New System.Drawing.Point(184, 228) - Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(140, 22) - Me.Label7.TabIndex = 33 - Me.Label7.Text = "GeckoFX" - Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Label6 - ' - Me.Label6.BackColor = System.Drawing.Color.Transparent - Me.Label6.Font = New System.Drawing.Font("Arial", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.ForeColor = System.Drawing.Color.Black - Me.Label6.Location = New System.Drawing.Point(183, 109) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(372, 45) - Me.Label6.TabIndex = 31 - Me.Label6.Text = "Created by hama3254" - Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Label4 - ' - Me.Label4.BackColor = System.Drawing.Color.Transparent - Me.Label4.Font = New System.Drawing.Font("Arial", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label4.ForeColor = System.Drawing.Color.Black - Me.Label4.Location = New System.Drawing.Point(182, 64) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(373, 45) - Me.Label4.TabIndex = 34 - Me.Label4.Text = "Crunchyroll Downloader" - Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - ' - 'Startup - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.FromArgb(CType(CType(205, Byte), Integer), CType(CType(205, Byte), Integer), CType(CType(205, Byte), Integer)) - Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.credits_background - Me.ClientSize = New System.Drawing.Size(600, 259) - Me.Controls.Add(Me.Label4) - Me.Controls.Add(Me.Label7) - Me.Controls.Add(Me.Label6) - Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.PictureBox1) - Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.label1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Name = "Startup" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Startup" - Me.TransparencyKey = System.Drawing.Color.FromArgb(CType(CType(205, Byte), Integer), CType(CType(205, Byte), Integer), CType(CType(205, Byte), Integer)) - CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents Timer1 As Timer - Friend WithEvents Timer2 As Timer - Public WithEvents label1 As Label - Public WithEvents Label3 As Label - Friend WithEvents PictureBox1 As PictureBox - Public WithEvents Label5 As Label - Public WithEvents Label7 As Label - Public WithEvents Label6 As Label - Public WithEvents Label4 As Label -End Class diff --git a/Crunchyroll Downloader/Startup.resx b/Crunchyroll Downloader/Startup.resx deleted file mode 100644 index 22db872..0000000 --- a/Crunchyroll Downloader/Startup.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 106, 17 - - \ No newline at end of file diff --git a/Crunchyroll Downloader/Startup.vb b/Crunchyroll Downloader/Startup.vb deleted file mode 100644 index f6511ae..0000000 --- a/Crunchyroll Downloader/Startup.vb +++ /dev/null @@ -1,113 +0,0 @@ -Public Class Startup - - Private Sub Startup_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - - - Me.Icon = My.Resources.icon - Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2) - - 'If Main.CreditsOnly = True Then - ' PictureBox1.Visible = True - 'Else - ' PictureBox1.Visible = False - ' Timer1.Start() - ' Opacity = 0 - ' Main.Opacity = 0 - 'End If - Label6.Text = "Version " + Application.ProductVersion.ToString - - End Sub - - Private Sub fadeIn() - If Opacity >= 1 Then - Timer1.[Stop]() - Timer2.Start() - Else - Opacity += 0.09 - End If - End Sub - - Private Sub fadeout() - If Opacity <= 0 Then - Timer2.[Stop]() - Main.Opacity = 100 - Me.Close() - Else - Opacity -= 0.09 - End If - End Sub - - Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick - fadeIn() - End Sub - - Private Sub Timer2_Tick(sender As Object, e As EventArgs) Handles Timer2.Tick - fadeout() - End Sub - - Private Sub Label2_Click(sender As Object, e As EventArgs) - Process.Start("https://www.codeproject.com/Articles/60382/AsyncWorker-A-Typesafe-BackgroundWorker-and-about") - End Sub - - Private Sub Label3_Click(sender As Object, e As EventArgs) Handles Label3.Click - Process.Start("https://www.ffmpeg.org/about.html") - End Sub - - Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click - Me.Close() - End Sub - - Private Sub PictureBox1_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox1.MouseEnter - PictureBox1.BackColor = SystemColors.Control - End Sub - - Private Sub PictureBox1_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox1.MouseLeave - PictureBox1.BackColor = Color.Transparent - End Sub -#Region " Move Form " - - ' [ Move Form ] - ' - ' // By Elektro - - Public MoveForm As Boolean - Public MoveForm_MousePosition As Point - - Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown) - - If e.Button = MouseButtons.Left Then - MoveForm = True - Me.Cursor = Cursors.NoMove2D - MoveForm_MousePosition = e.Location - End If - - End Sub - - Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove) - - If MoveForm Then - Me.Location = Me.Location + (e.Location - MoveForm_MousePosition) - End If - - End Sub - - Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp) - - If e.Button = MouseButtons.Left Then - MoveForm = False - Me.Cursor = Cursors.Default - End If - - End Sub - - Private Sub Label7_Click(sender As Object, e As EventArgs) Handles Label7.Click - Process.Start("https://bitbucket.org/geckofx/geckofx-60.0/src/default/") - End Sub - - -#End Region -End Class diff --git a/Crunchyroll Downloader/bin/x86/Debug/1ffmpeg.exe b/Crunchyroll Downloader/bin/x86/Debug/1ffmpeg.exe deleted file mode 100644 index eff0be6..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Debug/1ffmpeg.exe and /dev/null differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 97460ea..a99d439 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb index 77345da..b544e2d 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml index 27bfa18..f013bdf 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml +++ b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.xml @@ -22,6 +22,11 @@ Crunchyroll Downloader Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -348,6 +353,11 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -358,6 +368,11 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -418,11 +433,21 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Zeichenfolge, die </p> diff --git a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll new file mode 100644 index 0000000..4687592 Binary files /dev/null and b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.dll differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb new file mode 100644 index 0000000..36a0611 Binary files /dev/null and b/Crunchyroll Downloader/bin/x86/Debug/MetroFramework.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html index 49e5ee7..35f4a2e 100644 --- a/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html +++ b/Crunchyroll Downloader/bin/x86/Debug/WebInterface/error_Page.html @@ -43,7 +43,7 @@

Failed!

System.IndexOutOfRangeException: Der Index war außerhalb des Arraybereichs. - bei Crunchyroll_Downloader.Main.ProcessRequest(Socket clientSocket) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 2580.

+ bei Crunchyroll_Downloader.Main.ProcessRequest(Socket clientSocket) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\Main.vb:Zeile 2629.

\ No newline at end of file diff --git a/Crunchyroll Downloader/bin/x86/Debug/ffmpeg2.exe b/Crunchyroll Downloader/bin/x86/Debug/ffmpeg2.exe deleted file mode 100644 index 9564a67..0000000 Binary files a/Crunchyroll Downloader/bin/x86/Debug/ffmpeg2.exe and /dev/null differ diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 6bff84a..1046cf2 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -1,6 +1,6 @@  Partial Class einstellungen - Inherits System.Windows.Forms.Form + Inherits MetroFramework.Forms.MetroForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -30,8 +30,8 @@ Partial Class einstellungen Me.pictureBox4 = New System.Windows.Forms.PictureBox() Me.ToolTip2 = New System.Windows.Forms.ToolTip(Me.components) Me.TabPage4 = New System.Windows.Forms.TabPage() - Me.TabControl2 = New System.Windows.Forms.TabControl() - Me.TabPage5 = New System.Windows.Forms.TabPage() + Me.TabControl2 = New MetroFramework.Controls.MetroTabControl() + Me.TabPage5 = New MetroFramework.Controls.MetroTabPage() Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.SoftSubs = New System.Windows.Forms.GroupBox() Me.CBesES = New System.Windows.Forms.CheckBox() @@ -45,7 +45,7 @@ Partial Class einstellungen Me.CBenUS = New System.Windows.Forms.CheckBox() Me.GB_SubLanguage = New System.Windows.Forms.GroupBox() Me.ComboBox1 = New System.Windows.Forms.ComboBox() - Me.TabPage3 = New System.Windows.Forms.TabPage() + Me.TabPage3 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.PictureBox5 = New System.Windows.Forms.PictureBox() Me.StatusLabel = New System.Windows.Forms.Label() @@ -56,7 +56,7 @@ Partial Class einstellungen Me.comboBox4 = New System.Windows.Forms.ComboBox() Me.ComboBox2 = New System.Windows.Forms.ComboBox() Me.comboBox3 = New System.Windows.Forms.ComboBox() - Me.TabPage2 = New System.Windows.Forms.TabPage() + Me.TabPage2 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox4 = New System.Windows.Forms.GroupBox() Me.HybridMode_CB = New System.Windows.Forms.CheckBox() Me.MergeMP4 = New System.Windows.Forms.CheckBox() @@ -89,13 +89,13 @@ Partial Class einstellungen Me.A360p = New System.Windows.Forms.RadioButton() Me.A720p = New System.Windows.Forms.RadioButton() Me.A1080p = New System.Windows.Forms.RadioButton() - Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.TabPage1 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox6 = New System.Windows.Forms.GroupBox() + Me.CheckBox2 = New System.Windows.Forms.CheckBox() Me.Label2 = New System.Windows.Forms.Label() Me.NumericUpDown2 = New System.Windows.Forms.NumericUpDown() - Me.GroupBox8 = New System.Windows.Forms.GroupBox() - Me.Server = New System.Windows.Forms.CheckBox() Me.GroupBox5 = New System.Windows.Forms.GroupBox() + Me.Server = New System.Windows.Forms.CheckBox() Me.CB_Log = New System.Windows.Forms.CheckBox() Me.ListViewAdd_True = New System.Windows.Forms.CheckBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() @@ -103,12 +103,28 @@ Partial Class einstellungen Me.TextBox1 = New System.Windows.Forms.TextBox() Me.DL_Count_simultaneous = New System.Windows.Forms.GroupBox() Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown() - Me.PictureBox6 = New System.Windows.Forms.PictureBox() - Me.TabControl1 = New System.Windows.Forms.TabControl() - Me.TabPage6 = New System.Windows.Forms.TabPage() + Me.TabControl1 = New MetroFramework.Controls.MetroTabControl() + Me.TabPage6 = New MetroFramework.Controls.MetroTabPage() Me.GroupBox7 = New System.Windows.Forms.GroupBox() Me.FunimationHardsub = New System.Windows.Forms.CheckBox() Me.CheckBox10 = New System.Windows.Forms.CheckBox() + Me.TabPage8 = New System.Windows.Forms.TabPage() + Me.GroupBox8 = New System.Windows.Forms.GroupBox() + Me.AoD_0p = New System.Windows.Forms.RadioButton() + Me.AoD_576p = New System.Windows.Forms.RadioButton() + Me.AoD_1080_Plus = New System.Windows.Forms.RadioButton() + Me.TabPage7 = New System.Windows.Forms.TabPage() + Me.PictureBox7 = New System.Windows.Forms.PictureBox() + Me.Panel2 = New System.Windows.Forms.Panel() + Me.Label8 = New System.Windows.Forms.Label() + Me.Label9 = New System.Windows.Forms.Label() + Me.Label7 = New System.Windows.Forms.Label() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label6 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) + Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components) CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabPage4.SuspendLayout() @@ -132,15 +148,19 @@ Partial Class einstellungen Me.TabPage1.SuspendLayout() Me.GroupBox6.SuspendLayout() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox8.SuspendLayout() Me.GroupBox5.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.DL_Count_simultaneous.SuspendLayout() CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabControl1.SuspendLayout() Me.TabPage6.SuspendLayout() Me.GroupBox7.SuspendLayout() + Me.TabPage8.SuspendLayout() + Me.GroupBox8.SuspendLayout() + Me.TabPage7.SuspendLayout() + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel2.SuspendLayout() + CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'ToolTip1 @@ -183,7 +203,7 @@ Partial Class einstellungen Me.pictureBox1.BackColor = System.Drawing.Color.Transparent Me.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand Me.pictureBox1.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close - Me.pictureBox1.Location = New System.Drawing.Point(449, 1) + Me.pictureBox1.Location = New System.Drawing.Point(494, 1) Me.pictureBox1.Name = "pictureBox1" Me.pictureBox1.Size = New System.Drawing.Size(50, 40) Me.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -194,7 +214,7 @@ Partial Class einstellungen ' Me.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand Me.pictureBox4.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Button_SafeExit - Me.pictureBox4.Location = New System.Drawing.Point(67, 505) + Me.pictureBox4.Location = New System.Drawing.Point(91, 551) Me.pictureBox4.Name = "pictureBox4" Me.pictureBox4.Size = New System.Drawing.Size(355, 30) Me.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -205,23 +225,26 @@ Partial Class einstellungen ' Me.TabPage4.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage4.Controls.Add(Me.TabControl2) - Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Location = New System.Drawing.Point(4, 44) Me.TabPage4.Name = "TabPage4" Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(468, 415) + Me.TabPage4.Size = New System.Drawing.Size(493, 452) Me.TabPage4.TabIndex = 3 - Me.TabPage4.Text = "Crunchyroll Settings" + Me.TabPage4.Text = "Crunchyroll" ' 'TabControl2 ' Me.TabControl2.Controls.Add(Me.TabPage5) Me.TabControl2.Controls.Add(Me.TabPage3) Me.TabControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabControl2.FontSize = MetroFramework.MetroTabControlSize.Tall + Me.TabControl2.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl2.Location = New System.Drawing.Point(3, 3) Me.TabControl2.Name = "TabControl2" Me.TabControl2.SelectedIndex = 0 - Me.TabControl2.Size = New System.Drawing.Size(462, 409) + Me.TabControl2.Size = New System.Drawing.Size(487, 446) Me.TabControl2.TabIndex = 0 + Me.TabControl2.UseSelectable = True ' 'TabPage5 ' @@ -229,18 +252,26 @@ Partial Class einstellungen Me.TabPage5.Controls.Add(Me.PictureBox2) Me.TabPage5.Controls.Add(Me.SoftSubs) Me.TabPage5.Controls.Add(Me.GB_SubLanguage) - Me.TabPage5.Location = New System.Drawing.Point(4, 22) + Me.TabPage5.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TabPage5.HorizontalScrollbarBarColor = True + Me.TabPage5.HorizontalScrollbarHighlightOnWheel = False + Me.TabPage5.HorizontalScrollbarSize = 10 + Me.TabPage5.Location = New System.Drawing.Point(4, 44) Me.TabPage5.Name = "TabPage5" Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage5.Size = New System.Drawing.Size(454, 383) + Me.TabPage5.Size = New System.Drawing.Size(479, 398) Me.TabPage5.TabIndex = 0 - Me.TabPage5.Text = "Settings" + Me.TabPage5.Text = "Main" + Me.TabPage5.VerticalScrollbarBarColor = True + Me.TabPage5.VerticalScrollbarHighlightOnWheel = False + Me.TabPage5.VerticalScrollbarSize = 10 + Me.TabPage5.Visible = False ' 'PictureBox2 ' Me.PictureBox2.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBox2.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.crdsettings_setUScookie_button - Me.PictureBox2.Location = New System.Drawing.Point(157, 283) + Me.PictureBox2.Location = New System.Drawing.Point(147, 259) Me.PictureBox2.Name = "PictureBox2" Me.PictureBox2.Size = New System.Drawing.Size(150, 30) Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize @@ -262,7 +293,7 @@ Partial Class einstellungen 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(6, 75) Me.SoftSubs.Name = "SoftSubs" - Me.SoftSubs.Size = New System.Drawing.Size(440, 186) + Me.SoftSubs.Size = New System.Drawing.Size(467, 161) Me.SoftSubs.TabIndex = 51 Me.SoftSubs.TabStop = False Me.SoftSubs.Text = "SoftSubs" @@ -271,7 +302,8 @@ Partial Class einstellungen ' Me.CBesES.AutoSize = True Me.CBesES.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBesES.Location = New System.Drawing.Point(166, 74) + Me.CBesES.ForeColor = System.Drawing.Color.Black + Me.CBesES.Location = New System.Drawing.Point(156, 73) Me.CBesES.Name = "CBesES" Me.CBesES.Size = New System.Drawing.Size(135, 20) Me.CBesES.TabIndex = 5 @@ -282,7 +314,8 @@ Partial Class einstellungen ' Me.CBitIT.AutoSize = True Me.CBitIT.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBitIT.Location = New System.Drawing.Point(25, 111) + Me.CBitIT.ForeColor = System.Drawing.Color.Black + Me.CBitIT.Location = New System.Drawing.Point(15, 110) Me.CBitIT.Name = "CBitIT" Me.CBitIT.Size = New System.Drawing.Size(116, 20) Me.CBitIT.TabIndex = 5 @@ -293,7 +326,8 @@ Partial Class einstellungen ' Me.CBruRU.AutoSize = True Me.CBruRU.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBruRU.Location = New System.Drawing.Point(306, 111) + Me.CBruRU.ForeColor = System.Drawing.Color.Black + Me.CBruRU.Location = New System.Drawing.Point(296, 110) Me.CBruRU.Name = "CBruRU" Me.CBruRU.Size = New System.Drawing.Size(141, 20) Me.CBruRU.TabIndex = 5 @@ -304,7 +338,8 @@ Partial Class einstellungen ' Me.CBarME.AutoSize = True Me.CBarME.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBarME.Location = New System.Drawing.Point(166, 111) + Me.CBarME.ForeColor = System.Drawing.Color.Black + Me.CBarME.Location = New System.Drawing.Point(156, 110) Me.CBarME.Name = "CBarME" Me.CBarME.Size = New System.Drawing.Size(108, 20) Me.CBarME.TabIndex = 5 @@ -315,7 +350,8 @@ Partial Class einstellungen ' Me.CBfrFR.AutoSize = True Me.CBfrFR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBfrFR.Location = New System.Drawing.Point(306, 36) + Me.CBfrFR.ForeColor = System.Drawing.Color.Black + Me.CBfrFR.Location = New System.Drawing.Point(296, 35) Me.CBfrFR.Name = "CBfrFR" Me.CBfrFR.Size = New System.Drawing.Size(132, 20) Me.CBfrFR.TabIndex = 4 @@ -326,7 +362,8 @@ Partial Class einstellungen ' Me.CBesLA.AutoSize = True Me.CBesLA.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBesLA.Location = New System.Drawing.Point(166, 36) + Me.CBesLA.ForeColor = System.Drawing.Color.Black + Me.CBesLA.Location = New System.Drawing.Point(156, 35) Me.CBesLA.Name = "CBesLA" Me.CBesLA.Size = New System.Drawing.Size(104, 20) Me.CBesLA.TabIndex = 3 @@ -337,7 +374,8 @@ Partial Class einstellungen ' Me.CBptBR.AutoSize = True Me.CBptBR.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBptBR.Location = New System.Drawing.Point(306, 74) + Me.CBptBR.ForeColor = System.Drawing.Color.Black + Me.CBptBR.Location = New System.Drawing.Point(296, 73) Me.CBptBR.Name = "CBptBR" Me.CBptBR.Size = New System.Drawing.Size(133, 20) Me.CBptBR.TabIndex = 2 @@ -348,7 +386,8 @@ Partial Class einstellungen ' Me.CBdeDE.AutoSize = True Me.CBdeDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBdeDE.Location = New System.Drawing.Point(25, 74) + Me.CBdeDE.ForeColor = System.Drawing.Color.Black + Me.CBdeDE.Location = New System.Drawing.Point(15, 73) Me.CBdeDE.Name = "CBdeDE" Me.CBdeDE.Size = New System.Drawing.Size(76, 20) Me.CBdeDE.TabIndex = 1 @@ -359,7 +398,8 @@ Partial Class einstellungen ' Me.CBenUS.AutoSize = True Me.CBenUS.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CBenUS.Location = New System.Drawing.Point(25, 36) + Me.CBenUS.ForeColor = System.Drawing.Color.Black + Me.CBenUS.Location = New System.Drawing.Point(15, 35) Me.CBenUS.Name = "CBenUS" Me.CBenUS.Size = New System.Drawing.Size(71, 20) Me.CBenUS.TabIndex = 0 @@ -374,7 +414,7 @@ Partial Class einstellungen Me.GB_SubLanguage.ForeColor = System.Drawing.Color.Black Me.GB_SubLanguage.Location = New System.Drawing.Point(6, 6) Me.GB_SubLanguage.Name = "GB_SubLanguage" - Me.GB_SubLanguage.Size = New System.Drawing.Size(440, 63) + Me.GB_SubLanguage.Size = New System.Drawing.Size(467, 63) Me.GB_SubLanguage.TabIndex = 50 Me.GB_SubLanguage.TabStop = False Me.GB_SubLanguage.Text = "Sub Sprache" @@ -400,12 +440,19 @@ Partial Class einstellungen Me.TabPage3.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage3.Controls.Add(Me.GroupBox3) Me.TabPage3.Controls.Add(Me.MultiDLSoftSubs) - Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.HorizontalScrollbarBarColor = True + Me.TabPage3.HorizontalScrollbarHighlightOnWheel = False + Me.TabPage3.HorizontalScrollbarSize = 10 + Me.TabPage3.Location = New System.Drawing.Point(4, 44) Me.TabPage3.Name = "TabPage3" Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage3.Size = New System.Drawing.Size(454, 383) + Me.TabPage3.Size = New System.Drawing.Size(479, 398) Me.TabPage3.TabIndex = 3 Me.TabPage3.Text = "Subtile Download" + Me.TabPage3.VerticalScrollbarBarColor = True + Me.TabPage3.VerticalScrollbarHighlightOnWheel = False + Me.TabPage3.VerticalScrollbarSize = 10 + Me.TabPage3.Visible = False ' 'GroupBox3 ' @@ -547,12 +594,19 @@ Partial Class einstellungen Me.TabPage2.Controls.Add(Me.CheckBox1) Me.TabPage2.Controls.Add(Me.GroupBox2) Me.TabPage2.Controls.Add(Me.GB_Resolution) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.HorizontalScrollbarBarColor = True + Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False + Me.TabPage2.HorizontalScrollbarSize = 10 + Me.TabPage2.Location = New System.Drawing.Point(4, 44) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(468, 415) + Me.TabPage2.Size = New System.Drawing.Size(493, 452) Me.TabPage2.TabIndex = 1 - Me.TabPage2.Text = "Output Settings" + Me.TabPage2.Text = "Output" + Me.TabPage2.VerticalScrollbarBarColor = True + Me.TabPage2.VerticalScrollbarHighlightOnWheel = False + Me.TabPage2.VerticalScrollbarSize = 10 + Me.TabPage2.Visible = False ' 'GroupBox4 ' @@ -563,7 +617,7 @@ Partial Class einstellungen Me.GroupBox4.ForeColor = System.Drawing.Color.Black Me.GroupBox4.Location = New System.Drawing.Point(7, 9) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(448, 58) + Me.GroupBox4.Size = New System.Drawing.Size(480, 58) Me.GroupBox4.TabIndex = 42 Me.GroupBox4.TabStop = False ' @@ -599,7 +653,7 @@ Partial Class einstellungen Me.GB_Sub_Path.ForeColor = System.Drawing.Color.Black Me.GB_Sub_Path.Location = New System.Drawing.Point(7, 132) Me.GB_Sub_Path.Name = "GB_Sub_Path" - Me.GB_Sub_Path.Size = New System.Drawing.Size(448, 58) + Me.GB_Sub_Path.Size = New System.Drawing.Size(480, 58) Me.GB_Sub_Path.TabIndex = 41 Me.GB_Sub_Path.TabStop = False Me.GB_Sub_Path.Text = "Unterordner " @@ -607,13 +661,15 @@ Partial Class einstellungen 'CheckBox1 ' Me.CheckBox1.AutoSize = True + Me.CheckBox1.BackColor = System.Drawing.Color.Transparent Me.CheckBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.CheckBox1.Location = New System.Drawing.Point(67, 326) + Me.CheckBox1.ForeColor = System.Drawing.Color.Black + Me.CheckBox1.Location = New System.Drawing.Point(66, 210) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(351, 20) Me.CheckBox1.TabIndex = 6 Me.CheckBox1.Text = "i know that re-encoding the video takes time and power" - Me.CheckBox1.UseVisualStyleBackColor = True + Me.CheckBox1.UseVisualStyleBackColor = False ' 'GroupBox2 ' @@ -622,9 +678,9 @@ Partial Class einstellungen Me.GroupBox2.Enabled = False Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox2.ForeColor = System.Drawing.Color.Black - Me.GroupBox2.Location = New System.Drawing.Point(6, 346) + Me.GroupBox2.Location = New System.Drawing.Point(7, 230) Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(449, 63) + Me.GroupBox2.Size = New System.Drawing.Size(480, 63) Me.GroupBox2.TabIndex = 40 Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "ffmpeg command" @@ -639,7 +695,7 @@ Partial Class einstellungen ' 'MenuStrip1 ' - Me.MenuStrip1.BackColor = System.Drawing.SystemColors.Control + Me.MenuStrip1.BackColor = System.Drawing.Color.Transparent Me.MenuStrip1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FFMPEG_CommandP1, Me.FFMPEG_CommandP2, Me.FFMPEG_CommandP3, Me.FFMPEG_CommandP4}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) @@ -776,7 +832,7 @@ Partial Class einstellungen Me.GB_Resolution.ForeColor = System.Drawing.Color.Black Me.GB_Resolution.Location = New System.Drawing.Point(6, 73) Me.GB_Resolution.Name = "GB_Resolution" - Me.GB_Resolution.Size = New System.Drawing.Size(449, 53) + Me.GB_Resolution.Size = New System.Drawing.Size(481, 53) Me.GB_Resolution.TabIndex = 38 Me.GB_Resolution.TabStop = False Me.GB_Resolution.Text = "Auflösung" @@ -848,87 +904,96 @@ Partial Class einstellungen ' 'TabPage1 ' + Me.TabPage1.AutoScroll = True Me.TabPage1.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage1.Controls.Add(Me.GroupBox6) - Me.TabPage1.Controls.Add(Me.GroupBox8) Me.TabPage1.Controls.Add(Me.GroupBox5) Me.TabPage1.Controls.Add(Me.GroupBox1) Me.TabPage1.Controls.Add(Me.DL_Count_simultaneous) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TabPage1.HorizontalScrollbar = True + Me.TabPage1.HorizontalScrollbarBarColor = True + Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False + Me.TabPage1.HorizontalScrollbarSize = 10 + Me.TabPage1.Location = New System.Drawing.Point(4, 44) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(468, 415) + Me.TabPage1.Size = New System.Drawing.Size(493, 452) Me.TabPage1.TabIndex = 0 - Me.TabPage1.Text = "Settings" + Me.TabPage1.Text = " Main" + Me.TabPage1.VerticalScrollbar = True + Me.TabPage1.VerticalScrollbarBarColor = True + Me.TabPage1.VerticalScrollbarHighlightOnWheel = False + Me.TabPage1.VerticalScrollbarSize = 10 ' 'GroupBox6 ' Me.GroupBox6.BackColor = System.Drawing.Color.Transparent + Me.GroupBox6.Controls.Add(Me.CheckBox2) Me.GroupBox6.Controls.Add(Me.Label2) Me.GroupBox6.Controls.Add(Me.NumericUpDown2) Me.GroupBox6.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox6.ForeColor = System.Drawing.Color.Black - Me.GroupBox6.Location = New System.Drawing.Point(202, 276) + Me.GroupBox6.Location = New System.Drawing.Point(0, 296) Me.GroupBox6.Name = "GroupBox6" - Me.GroupBox6.Size = New System.Drawing.Size(260, 128) + Me.GroupBox6.Size = New System.Drawing.Size(487, 132) Me.GroupBox6.TabIndex = 45 Me.GroupBox6.TabStop = False Me.GroupBox6.Text = "Error Handling" ' + 'CheckBox2 + ' + Me.CheckBox2.AutoSize = True + Me.CheckBox2.Location = New System.Drawing.Point(182, 96) + Me.CheckBox2.Name = "CheckBox2" + Me.CheckBox2.Size = New System.Drawing.Size(135, 20) + Me.CheckBox2.TabIndex = 44 + Me.CheckBox2.Text = "ignore future errors" + Me.CheckBox2.UseVisualStyleBackColor = True + Me.CheckBox2.Visible = False + ' 'Label2 ' Me.Label2.AutoSize = True Me.Label2.Location = New System.Drawing.Point(18, 23) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(186, 48) + Me.Label2.Size = New System.Drawing.Size(456, 16) Me.Label2.TabIndex = 2 - Me.Label2.Text = "The amout of error(s) until the" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Download process get paused " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(0 = deactivated)" + Me.Label2.Text = "The amout of error(s) until the Download process get paused (0 = deactivated)" ' 'NumericUpDown2 ' - Me.NumericUpDown2.Location = New System.Drawing.Point(18, 80) + Me.NumericUpDown2.Location = New System.Drawing.Point(141, 56) Me.NumericUpDown2.Name = "NumericUpDown2" Me.NumericUpDown2.Size = New System.Drawing.Size(225, 22) Me.NumericUpDown2.TabIndex = 1 Me.NumericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center ' - 'GroupBox8 - ' - Me.GroupBox8.BackColor = System.Drawing.Color.Transparent - Me.GroupBox8.Controls.Add(Me.Server) - Me.GroupBox8.Font = New System.Drawing.Font("Arial", 9.75!) - Me.GroupBox8.ForeColor = System.Drawing.Color.Black - Me.GroupBox8.Location = New System.Drawing.Point(6, 276) - Me.GroupBox8.Name = "GroupBox8" - Me.GroupBox8.Size = New System.Drawing.Size(190, 128) - Me.GroupBox8.TabIndex = 44 - Me.GroupBox8.TabStop = False - Me.GroupBox8.Text = "Add-on Support" - ' - 'Server - ' - Me.Server.AutoSize = True - Me.Server.Location = New System.Drawing.Point(24, 66) - Me.Server.Name = "Server" - Me.Server.Size = New System.Drawing.Size(129, 20) - Me.Server.TabIndex = 42 - Me.Server.Text = "enable http server" - Me.Server.UseVisualStyleBackColor = True - ' 'GroupBox5 ' Me.GroupBox5.BackColor = System.Drawing.Color.Transparent + Me.GroupBox5.Controls.Add(Me.Server) Me.GroupBox5.Controls.Add(Me.CB_Log) Me.GroupBox5.Controls.Add(Me.ListViewAdd_True) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.ForeColor = System.Drawing.Color.Black - Me.GroupBox5.Location = New System.Drawing.Point(6, 205) + Me.GroupBox5.Location = New System.Drawing.Point(0, 173) Me.GroupBox5.Name = "GroupBox5" - Me.GroupBox5.Size = New System.Drawing.Size(456, 70) + Me.GroupBox5.Size = New System.Drawing.Size(487, 117) Me.GroupBox5.TabIndex = 7 Me.GroupBox5.TabStop = False Me.GroupBox5.Text = "Other" ' + 'Server + ' + Me.Server.AutoSize = True + Me.Server.Location = New System.Drawing.Point(44, 76) + Me.Server.Name = "Server" + Me.Server.Size = New System.Drawing.Size(229, 20) + Me.Server.TabIndex = 43 + Me.Server.Text = "enable http server (add-on Support)" + Me.Server.UseVisualStyleBackColor = True + ' 'CB_Log ' Me.CB_Log.AutoSize = True @@ -956,18 +1021,18 @@ Partial Class einstellungen Me.GroupBox1.Controls.Add(Me.TextBox1) Me.GroupBox1.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox1.ForeColor = System.Drawing.Color.Black - Me.GroupBox1.Location = New System.Drawing.Point(6, 85) + Me.GroupBox1.Location = New System.Drawing.Point(0, 85) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(456, 114) + Me.GroupBox1.Size = New System.Drawing.Size(487, 86) Me.GroupBox1.TabIndex = 7 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Browser Settings" ' 'Label1 ' - Me.Label1.Location = New System.Drawing.Point(6, 29) + Me.Label1.Location = New System.Drawing.Point(6, 25) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(444, 22) + Me.Label1.Size = New System.Drawing.Size(469, 22) Me.Label1.TabIndex = 2 Me.Label1.Text = "Default Website" Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -976,7 +1041,7 @@ Partial Class einstellungen ' Me.TextBox1.Location = New System.Drawing.Point(6, 54) Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(444, 22) + Me.TextBox1.Size = New System.Drawing.Size(469, 22) Me.TextBox1.TabIndex = 1 Me.TextBox1.Text = "https://www.crunchyroll.com/" Me.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center @@ -987,9 +1052,9 @@ Partial Class einstellungen Me.DL_Count_simultaneous.Controls.Add(Me.NumericUpDown1) Me.DL_Count_simultaneous.Font = New System.Drawing.Font("Arial", 9.75!) Me.DL_Count_simultaneous.ForeColor = System.Drawing.Color.Black - Me.DL_Count_simultaneous.Location = New System.Drawing.Point(6, 11) + Me.DL_Count_simultaneous.Location = New System.Drawing.Point(0, 11) Me.DL_Count_simultaneous.Name = "DL_Count_simultaneous" - Me.DL_Count_simultaneous.Size = New System.Drawing.Size(456, 68) + Me.DL_Count_simultaneous.Size = New System.Drawing.Size(487, 68) Me.DL_Count_simultaneous.TabIndex = 5 Me.DL_Count_simultaneous.TabStop = False Me.DL_Count_simultaneous.Text = "simultaneous downloads" @@ -1004,39 +1069,40 @@ Partial Class einstellungen Me.NumericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center Me.NumericUpDown1.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' - 'PictureBox6 - ' - Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand - Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default - Me.PictureBox6.Location = New System.Drawing.Point(326, 2) - Me.PictureBox6.Name = "PictureBox6" - Me.PictureBox6.Size = New System.Drawing.Size(76, 39) - Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.PictureBox6.TabIndex = 43 - Me.PictureBox6.TabStop = False - ' 'TabControl1 ' Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) Me.TabControl1.Controls.Add(Me.TabPage4) Me.TabControl1.Controls.Add(Me.TabPage6) - Me.TabControl1.Location = New System.Drawing.Point(12, 47) + Me.TabControl1.Controls.Add(Me.TabPage8) + Me.TabControl1.Controls.Add(Me.TabPage7) + Me.TabControl1.FontSize = MetroFramework.MetroTabControlSize.Tall + Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular + Me.TabControl1.Location = New System.Drawing.Point(22, 45) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 0 - Me.TabControl1.Size = New System.Drawing.Size(476, 441) + Me.TabControl1.SelectedIndex = 2 + Me.TabControl1.Size = New System.Drawing.Size(501, 500) Me.TabControl1.TabIndex = 38 + Me.TabControl1.UseSelectable = True ' 'TabPage6 ' Me.TabPage6.BackColor = System.Drawing.Color.FromArgb(CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer), CType(CType(243, Byte), Integer)) Me.TabPage6.Controls.Add(Me.GroupBox7) - Me.TabPage6.Location = New System.Drawing.Point(4, 22) + Me.TabPage6.HorizontalScrollbarBarColor = True + Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False + Me.TabPage6.HorizontalScrollbarSize = 10 + Me.TabPage6.Location = New System.Drawing.Point(4, 44) Me.TabPage6.Name = "TabPage6" Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage6.Size = New System.Drawing.Size(468, 415) + Me.TabPage6.Size = New System.Drawing.Size(493, 452) Me.TabPage6.TabIndex = 4 - Me.TabPage6.Text = "Funimation Settings" + Me.TabPage6.Text = "Funimation" + Me.TabPage6.VerticalScrollbarBarColor = True + Me.TabPage6.VerticalScrollbarHighlightOnWheel = False + Me.TabPage6.VerticalScrollbarSize = 10 + Me.TabPage6.Visible = False ' 'GroupBox7 ' @@ -1046,7 +1112,7 @@ Partial Class einstellungen Me.GroupBox7.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox7.Location = New System.Drawing.Point(6, 6) Me.GroupBox7.Name = "GroupBox7" - Me.GroupBox7.Size = New System.Drawing.Size(456, 90) + Me.GroupBox7.Size = New System.Drawing.Size(481, 90) Me.GroupBox7.TabIndex = 52 Me.GroupBox7.TabStop = False Me.GroupBox7.Text = "Subtitle" @@ -1055,6 +1121,7 @@ Partial Class einstellungen ' Me.FunimationHardsub.AutoSize = True Me.FunimationHardsub.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.FunimationHardsub.ForeColor = System.Drawing.Color.Black Me.FunimationHardsub.Location = New System.Drawing.Point(217, 36) Me.FunimationHardsub.Name = "FunimationHardsub" Me.FunimationHardsub.Size = New System.Drawing.Size(145, 20) @@ -1069,6 +1136,7 @@ Partial Class einstellungen Me.CheckBox10.CheckState = System.Windows.Forms.CheckState.Checked Me.CheckBox10.Enabled = False Me.CheckBox10.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.CheckBox10.ForeColor = System.Drawing.Color.Black Me.CheckBox10.Location = New System.Drawing.Point(100, 36) Me.CheckBox10.Name = "CheckBox10" Me.CheckBox10.Size = New System.Drawing.Size(71, 20) @@ -1076,21 +1144,214 @@ Partial Class einstellungen Me.CheckBox10.Text = "English" Me.CheckBox10.UseVisualStyleBackColor = True ' + 'TabPage8 + ' + Me.TabPage8.BackColor = System.Drawing.Color.Transparent + Me.TabPage8.Controls.Add(Me.GroupBox8) + Me.TabPage8.Location = New System.Drawing.Point(4, 44) + Me.TabPage8.Name = "TabPage8" + Me.TabPage8.Size = New System.Drawing.Size(493, 452) + Me.TabPage8.TabIndex = 6 + Me.TabPage8.Text = " AoD" + ' + 'GroupBox8 + ' + Me.GroupBox8.BackColor = System.Drawing.Color.Transparent + Me.GroupBox8.Controls.Add(Me.AoD_0p) + Me.GroupBox8.Controls.Add(Me.AoD_576p) + Me.GroupBox8.Controls.Add(Me.AoD_1080_Plus) + Me.GroupBox8.Font = New System.Drawing.Font("Arial", 9.75!) + Me.GroupBox8.ForeColor = System.Drawing.Color.Black + Me.GroupBox8.Location = New System.Drawing.Point(3, 15) + Me.GroupBox8.Name = "GroupBox8" + Me.GroupBox8.Size = New System.Drawing.Size(487, 74) + Me.GroupBox8.TabIndex = 39 + Me.GroupBox8.TabStop = False + Me.GroupBox8.Text = "Anime on Demand unique resolution " + ' + 'AoD_0p + ' + Me.AoD_0p.AutoSize = True + Me.AoD_0p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.AoD_0p.ForeColor = System.Drawing.Color.Black + Me.AoD_0p.Location = New System.Drawing.Point(348, 32) + Me.AoD_0p.Name = "AoD_0p" + Me.AoD_0p.Size = New System.Drawing.Size(69, 22) + Me.AoD_0p.TabIndex = 2 + Me.AoD_0p.TabStop = True + Me.AoD_0p.Text = "Ignore" + Me.AoD_0p.UseVisualStyleBackColor = True + ' + 'AoD_576p + ' + Me.AoD_576p.AutoSize = True + Me.AoD_576p.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.AoD_576p.ForeColor = System.Drawing.Color.Black + Me.AoD_576p.Location = New System.Drawing.Point(210, 32) + Me.AoD_576p.Name = "AoD_576p" + Me.AoD_576p.Size = New System.Drawing.Size(62, 22) + Me.AoD_576p.TabIndex = 1 + Me.AoD_576p.TabStop = True + Me.AoD_576p.Text = "576p" + Me.AoD_576p.UseVisualStyleBackColor = True + ' + 'AoD_1080_Plus + ' + Me.AoD_1080_Plus.AutoSize = True + Me.AoD_1080_Plus.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.AoD_1080_Plus.ForeColor = System.Drawing.Color.Black + Me.AoD_1080_Plus.Location = New System.Drawing.Point(62, 32) + Me.AoD_1080_Plus.Name = "AoD_1080_Plus" + Me.AoD_1080_Plus.Size = New System.Drawing.Size(80, 22) + Me.AoD_1080_Plus.TabIndex = 0 + Me.AoD_1080_Plus.TabStop = True + Me.AoD_1080_Plus.Text = "1080p+" + Me.AoD_1080_Plus.UseVisualStyleBackColor = True + ' + 'TabPage7 + ' + Me.TabPage7.BackColor = System.Drawing.Color.Transparent + Me.TabPage7.Controls.Add(Me.PictureBox7) + Me.TabPage7.Controls.Add(Me.Panel2) + 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.Name = "TabPage7" + Me.TabPage7.Size = New System.Drawing.Size(493, 452) + Me.TabPage7.TabIndex = 5 + Me.TabPage7.Text = "About " + ' + 'PictureBox7 + ' + Me.PictureBox7.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.about_icon + Me.PictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center + Me.PictureBox7.Location = New System.Drawing.Point(0, 25) + Me.PictureBox7.Name = "PictureBox7" + Me.PictureBox7.Size = New System.Drawing.Size(493, 137) + Me.PictureBox7.TabIndex = 43 + Me.PictureBox7.TabStop = False + ' + 'Panel2 + ' + Me.Panel2.BackColor = System.Drawing.SystemColors.Control + Me.Panel2.Controls.Add(Me.Label8) + Me.Panel2.Controls.Add(Me.Label9) + Me.Panel2.Controls.Add(Me.Label7) + Me.Panel2.Controls.Add(Me.Label3) + Me.Panel2.Location = New System.Drawing.Point(0, 349) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(493, 54) + Me.Panel2.TabIndex = 42 + ' + 'Label8 + ' + Me.Label8.BackColor = System.Drawing.Color.Transparent + Me.Label8.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label8.ForeColor = System.Drawing.Color.Black + Me.Label8.Location = New System.Drawing.Point(9, 17) + Me.Label8.Name = "Label8" + Me.Label8.Size = New System.Drawing.Size(100, 22) + Me.Label8.TabIndex = 35 + Me.Label8.Text = "libraries: " + Me.Label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label9 + ' + Me.Label9.BackColor = System.Drawing.Color.Transparent + Me.Label9.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label9.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.ForeColor = System.Drawing.Color.FromArgb(CType(CType(48, Byte), Integer), CType(CType(130, Byte), Integer), CType(CType(175, Byte), Integer)) + Me.Label9.Location = New System.Drawing.Point(107, 17) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(144, 22) + Me.Label9.TabIndex = 41 + Me.Label9.Text = "MetroFramework" + Me.Label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label7 + ' + Me.Label7.BackColor = System.Drawing.Color.Transparent + Me.Label7.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label7.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label7.ForeColor = System.Drawing.Color.FromArgb(CType(CType(48, Byte), Integer), CType(CType(130, Byte), Integer), CType(CType(175, Byte), Integer)) + Me.Label7.Location = New System.Drawing.Point(257, 17) + Me.Label7.Name = "Label7" + Me.Label7.Size = New System.Drawing.Size(100, 22) + Me.Label7.TabIndex = 39 + Me.Label7.Text = "GeckoFX" + Me.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label3 + ' + Me.Label3.BackColor = System.Drawing.Color.Transparent + Me.Label3.Cursor = System.Windows.Forms.Cursors.Hand + Me.Label3.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(48, Byte), Integer), CType(CType(130, Byte), Integer), CType(CType(175, Byte), Integer)) + Me.Label3.Location = New System.Drawing.Point(363, 17) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(80, 22) + Me.Label3.TabIndex = 36 + Me.Label3.Text = "ffmpeg" + Me.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label4 + ' + Me.Label4.BackColor = System.Drawing.Color.Transparent + Me.Label4.Font = New System.Drawing.Font("Arial", 15.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.ForeColor = System.Drawing.Color.Black + Me.Label4.Location = New System.Drawing.Point(0, 190) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(493, 45) + Me.Label4.TabIndex = 40 + Me.Label4.Text = "Crunchyroll Downloader" + Me.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label6 + ' + Me.Label6.BackColor = System.Drawing.Color.Transparent + Me.Label6.Font = New System.Drawing.Font("Arial", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.ForeColor = System.Drawing.Color.Black + Me.Label6.Location = New System.Drawing.Point(0, 240) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(493, 45) + Me.Label6.TabIndex = 37 + Me.Label6.Text = "Created by hama3254" + Me.Label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'Label5 + ' + Me.Label5.BackColor = System.Drawing.Color.Transparent + Me.Label5.Font = New System.Drawing.Font("Arial", 14.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label5.ForeColor = System.Drawing.Color.Black + Me.Label5.Location = New System.Drawing.Point(0, 290) + Me.Label5.Name = "Label5" + Me.Label5.Size = New System.Drawing.Size(493, 45) + Me.Label5.TabIndex = 38 + Me.Label5.Text = "Created by hama3254" + Me.Label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + ' + 'MetroStyleManager1 + ' + Me.MetroStyleManager1.Owner = Nothing + ' 'einstellungen ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackgroundImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background - Me.ClientSize = New System.Drawing.Size(500, 550) + Me.BackImage = Global.Crunchyroll_Downloader.My.Resources.Resources.crdSettings_Background + Me.BackMaxSize = 600 + Me.ClientSize = New System.Drawing.Size(546, 600) Me.Controls.Add(Me.TabControl1) - Me.Controls.Add(Me.PictureBox6) Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox1) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.ForeColor = System.Drawing.Color.Black Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "einstellungen" - Me.Text = "crunchyroll downloader" + Me.Text = " " + Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).EndInit() Me.TabPage4.ResumeLayout(False) @@ -1124,19 +1385,23 @@ Partial Class einstellungen Me.GroupBox6.ResumeLayout(False) Me.GroupBox6.PerformLayout() CType(Me.NumericUpDown2, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox8.ResumeLayout(False) - Me.GroupBox8.PerformLayout() Me.GroupBox5.ResumeLayout(False) Me.GroupBox5.PerformLayout() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() Me.DL_Count_simultaneous.ResumeLayout(False) CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() Me.TabControl1.ResumeLayout(False) Me.TabPage6.ResumeLayout(False) Me.GroupBox7.ResumeLayout(False) Me.GroupBox7.PerformLayout() + Me.TabPage8.ResumeLayout(False) + Me.GroupBox8.ResumeLayout(False) + Me.GroupBox8.PerformLayout() + Me.TabPage7.ResumeLayout(False) + CType(Me.PictureBox7, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel2.ResumeLayout(False) + CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -1146,9 +1411,6 @@ Partial Class einstellungen Private WithEvents pictureBox4 As PictureBox Friend WithEvents ToolTip2 As ToolTip Friend WithEvents TabPage4 As TabPage - Friend WithEvents TabControl2 As TabControl - Friend WithEvents TabPage5 As TabPage - Friend WithEvents TabPage3 As TabPage Public WithEvents GroupBox3 As GroupBox Public WithEvents PictureBox5 As PictureBox Public WithEvents StatusLabel As Label @@ -1159,7 +1421,6 @@ Partial Class einstellungen Public WithEvents comboBox4 As ComboBox Public WithEvents ComboBox2 As ComboBox Public WithEvents comboBox3 As ComboBox - Friend WithEvents TabPage2 As TabPage Friend WithEvents CheckBox1 As CheckBox Friend WithEvents GroupBox2 As GroupBox Friend WithEvents Panel1 As Panel @@ -1188,9 +1449,7 @@ Partial Class einstellungen Friend WithEvents A360p As RadioButton Friend WithEvents A720p As RadioButton Friend WithEvents A1080p As RadioButton - Friend WithEvents TabPage1 As TabPage Friend WithEvents GroupBox5 As GroupBox - Friend WithEvents Server As CheckBox Friend WithEvents CB_Log As CheckBox Friend WithEvents ListViewAdd_True As CheckBox Friend WithEvents GroupBox1 As GroupBox @@ -1198,16 +1457,13 @@ Partial Class einstellungen Friend WithEvents TextBox1 As TextBox Friend WithEvents DL_Count_simultaneous As GroupBox Friend WithEvents NumericUpDown1 As NumericUpDown - Friend WithEvents TabControl1 As TabControl Private WithEvents PictureBox2 As PictureBox Friend WithEvents SoftSubs As GroupBox Friend WithEvents GB_SubLanguage As GroupBox Friend WithEvents ComboBox1 As ComboBox - Friend WithEvents TabPage6 As TabPage Friend WithEvents GB_Sub_Path As GroupBox Friend WithEvents RBStaffel As RadioButton Friend WithEvents RBAnime As RadioButton - Private WithEvents PictureBox6 As PictureBox Friend WithEvents MergeMP4 As CheckBox Friend WithEvents GroupBox4 As GroupBox Friend WithEvents HybridMode_CB As CheckBox @@ -1223,8 +1479,33 @@ Partial Class einstellungen Public WithEvents CBptBR As CheckBox Public WithEvents CBdeDE As CheckBox Public WithEvents CBenUS As CheckBox - Friend WithEvents GroupBox8 As GroupBox Friend WithEvents GroupBox6 As GroupBox Friend WithEvents Label2 As Label Friend WithEvents NumericUpDown2 As NumericUpDown + Private WithEvents TabControl2 As MetroFramework.Controls.MetroTabControl + Private WithEvents TabPage5 As MetroFramework.Controls.MetroTabPage + Private WithEvents TabPage3 As MetroFramework.Controls.MetroTabPage + Private WithEvents TabPage2 As MetroFramework.Controls.MetroTabPage + Private WithEvents TabPage1 As MetroFramework.Controls.MetroTabPage + Private WithEvents TabControl1 As MetroFramework.Controls.MetroTabControl + Private WithEvents TabPage6 As MetroFramework.Controls.MetroTabPage + Private WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager + Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender + Friend WithEvents TabPage7 As TabPage + Friend WithEvents Panel2 As Panel + Public WithEvents Label8 As Label + Public WithEvents Label9 As Label + Public WithEvents Label7 As Label + Public WithEvents Label3 As Label + Public WithEvents Label4 As Label + Public WithEvents Label6 As Label + Public WithEvents Label5 As Label + Friend WithEvents PictureBox7 As PictureBox + Friend WithEvents TabPage8 As TabPage + Friend WithEvents CheckBox2 As CheckBox + Friend WithEvents Server As CheckBox + Friend WithEvents GroupBox8 As GroupBox + Friend WithEvents AoD_0p As RadioButton + Friend WithEvents AoD_576p As RadioButton + Friend WithEvents AoD_1080_Plus As RadioButton End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index 147febf..bd5881c 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -118,12 +118,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 17, 17 + 183, 17 - 205, 21 + 397, 17 - 105, 19 + 282, 17 + + + 282, 17 + + + 17, 17 + + + 496, 17 + + + 60 \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 3d11789..81879fe 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -4,10 +4,17 @@ Imports System.Net Imports System.IO Imports System.Text Imports System.Threading +Imports MetroFramework.Forms +Imports MetroFramework +Imports MetroFramework.Components Public Class einstellungen - + Inherits MetroForm Private Sub einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Label6.Text = "Version " + Application.ProductVersion.ToString + MetroStyleManager1.Style = MetroColorStyle.Orange + TabControl1.SelectedIndex = 0 + Me.StyleManager = MetroStyleManager1 For i As Integer = 0 To Main.SoftSubs.Count - 1 If Main.SoftSubs(i) = "deDE" Then CBdeDE.Checked = True @@ -30,7 +37,12 @@ Public Class einstellungen End If Next Me.Location = New Point(Main.Location.X + Main.Width / 2 - Me.Width / 2, Main.Location.Y + Main.Height / 2 - Me.Height / 2) - Me.Icon = My.Resources.icon + Try + Me.Icon = My.Resources.icon + Catch ex As Exception + + End Try + If Main.MergeSubstoMP4 = True Then MergeMP4.Checked = True End If @@ -56,17 +68,24 @@ Public Class einstellungen End Try - If Main.Resu = 1080 Then + If Main.Reso = 1080 Then A1080p.Checked = True - ElseIf Main.Resu = 720 Then + ElseIf Main.Reso = 720 Then A720p.Checked = True - ElseIf Main.Resu = 480 Then + ElseIf Main.Reso = 480 Then A480p.Checked = True - ElseIf Main.Resu = 360 Then + ElseIf Main.Reso = 360 Then A360p.Checked = True - ElseIf Main.Resu = 42 Then + ElseIf Main.Reso = 42 Then AAuto.Checked = True End If + If Main.AoD_Reso = 1080 Then + AoD_1080_Plus.Checked = True + ElseIf Main.AoD_Reso = 576 Then + AoD_576p.Checked = True + ElseIf Main.AoD_Reso = 0 Then + AoD_0p.Checked = True + End If If Check_CB() = False Then ComboBox1.Items.Add(Main.CB_SuB_Nothing) @@ -137,21 +156,32 @@ Public Class einstellungen End If If A1080p.Checked Then - Main.Resu = 1080 + Main.Reso = 1080 rk.SetValue("Resu", 1080, RegistryValueKind.String) ElseIf A720p.Checked Then - Main.Resu = 720 + Main.Reso = 720 rk.SetValue("Resu", 720, RegistryValueKind.String) ElseIf A360p.Checked Then - Main.Resu = 360 + Main.Reso = 360 rk.SetValue("Resu", 360, RegistryValueKind.String) ElseIf A480p.Checked Then - Main.Resu = 480 + Main.Reso = 480 rk.SetValue("Resu", 480, RegistryValueKind.String) ElseIf AAuto.Checked Then - Main.Resu = 42 + Main.Reso = 42 rk.SetValue("Resu", 42, RegistryValueKind.String) End If + If AoD_1080_Plus.Checked Then + Main.AoD_Reso = 1080 + rk.SetValue("AoD_Reso", 1080, RegistryValueKind.String) + ElseIf AoD_576p.Checked Then + Main.AoD_Reso = 576 + rk.SetValue("AoD_Reso", 576, RegistryValueKind.String) + ElseIf AoD_0p.Checked Then + Main.AoD_Reso = 0 + rk.SetValue("AoD_Reso", 0, RegistryValueKind.String) + + End If If ComboBox1.SelectedItem.ToString = "English" Then Main.SubSprache = "enUS" rk.SetValue("Sub", "enUS", RegistryValueKind.String) @@ -370,73 +400,26 @@ Public Class einstellungen Private Sub pictureBox4_MouseLeave(sender As Object, e As EventArgs) Handles pictureBox4.MouseLeave pictureBox4.Image = My.Resources.crdSettings_Button_SafeExit End Sub -#Region " Move Form " - - ' [ Move Form ] - ' - ' // By Elektro - - Public MoveForm As Boolean - Public MoveForm_MousePosition As Point - - Public Sub MoveForm_MouseDown(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseDown ' Add more handles here (Example: PictureBox1.MouseDown) - - If e.Button = MouseButtons.Left Then - MoveForm = True - Me.Cursor = Cursors.NoMove2D - MoveForm_MousePosition = e.Location - End If - - End Sub - - Public Sub MoveForm_MouseMove(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseMove ' Add more handles here (Example: PictureBox1.MouseMove) - - If MoveForm Then - Me.Location = Me.Location + (e.Location - MoveForm_MousePosition) - End If - - End Sub - - Public Sub MoveForm_MouseUp(sender As Object, e As MouseEventArgs) Handles _ - MyBase.MouseUp ' Add more handles here (Example: PictureBox1.MouseUp) - - If e.Button = MouseButtons.Left Then - MoveForm = False - Me.Cursor = Cursors.Default - End If - - End Sub Private Sub ComboBox1_DrawItem(sender As Object, e As DrawItemEventArgs) Handles ComboBox1.DrawItem, ComboBox2.DrawItem, comboBox3.DrawItem, comboBox4.DrawItem - sender.BackColor = Color.White + Dim CB As ComboBox = sender + CB.BackColor = Color.White If e.Index >= 0 Then Using st As New StringFormat With {.Alignment = StringAlignment.Center} ' e.DrawBackground() ' e.DrawFocusRectangle() e.Graphics.FillRectangle(SystemBrushes.ControlLightLight, e.Bounds) - e.Graphics.DrawString(sender.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) + e.Graphics.DrawString(CB.Items(e.Index).ToString, e.Font, Brushes.Black, e.Bounds, st) End Using End If End Sub - Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click - Startup.ShowDialog() - End Sub -#End Region - Private Sub PictureBox6_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox6.MouseEnter - PictureBox6.Image = My.Resources.main_credits_hover - End Sub - Private Sub PictureBox6_MouseLeave(sender As Object, e As EventArgs) Handles PictureBox6.MouseLeave - PictureBox6.Image = My.Resources.main_credits_default - End Sub Private Sub AAuto_Click(sender As Object, e As EventArgs) Handles AAuto.Click If MergeMP4.Checked = True Then @@ -509,7 +492,7 @@ Public Class einstellungen End If Else StatusLabel.Text = "Status: No language selected" - Main.Pause(3) + Pause(3) StatusLabel.Text = "Status: idle" End If @@ -637,6 +620,19 @@ Public Class einstellungen End If End Sub + Private Sub Label7_Click(sender As Object, e As EventArgs) Handles Label7.Click + Process.Start("https://bitbucket.org/geckofx/geckofx-60.0/src/default/") + End Sub + + Private Sub Label3_Click(sender As Object, e As EventArgs) Handles Label3.Click + Process.Start("https://www.ffmpeg.org/about.html") + End Sub + + Private Sub Label9_Click(sender As Object, e As EventArgs) Handles Label9.Click + Process.Start("https://github.com/hama3254/metroframework-modern-ui") + End Sub + + diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 97460ea..a99d439 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb index 77345da..b544e2d 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache index 656a9f1..29e7293 100644 --- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache +++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -457fb228272c8471f463cf798ead405f95f2aa0a +1b13b37aaafce60227942bcaa9b986b52cac1fe0 diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt index afaa814..a32298a 100644 --- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt +++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt @@ -117,3 +117,29 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crun D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.xml D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.5\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.pdb D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.FirstStartup.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.exe.config +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.exe +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.pdb +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Crunchyroll Downloader.xml +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Core.dll +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Winforms.dll +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\MetroFramework.dll +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbprojAssemblyReference.cache +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Anime_Add.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.einstellungen.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Debug_Mode.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.FirstStartup.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.GeckoFX.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.CRD_List_Item.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Resources.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.GenerateResource.cache +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CoreCompileInputs.cache +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CopyComplete +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.exe +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.xml +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.pdb +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\MetroFramework.pdb +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.ErrorDialog.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Main.resources +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Core.pdb +D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - UI\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Winforms.pdb diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache index dc87eea..a377c63 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache index 0e33614..b698b3f 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbprojAssemblyReference.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml index 27bfa18..f013bdf 100644 --- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml +++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.xml @@ -22,6 +22,11 @@ Crunchyroll Downloader Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -348,6 +353,11 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -358,6 +368,11 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. @@ -418,11 +433,21 @@ setInterval(function loadXMLDoc() { Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + + Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + + Sucht eine lokalisierte Zeichenfolge, die </p> diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Reso.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.ErrorDialog.resources similarity index 100% rename from Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Reso.resources rename to Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.ErrorDialog.resources diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Main.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Main.resources index 2099b50..6c05a97 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Main.resources and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Main.resources differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources index 191a939..61f59b2 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Resources.resources differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Startup.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Startup.resources deleted file mode 100644 index 077d4d9..0000000 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Startup.resources and /dev/null differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.einstellungen.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.einstellungen.resources index 6c05a97..286bc14 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.einstellungen.resources and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.einstellungen.resources differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 307c253..c53494b 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache and b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 64b2a4a..822502e 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll index 35efea3..bea185a 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll and b/Crunchyroll Downloader/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll differ