diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index c8d7525..7702f69 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 9962dba..c8bbe0f 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -44,6 +44,10 @@ Public Class Anime_Add Private Sub Anime_Add_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If My.Settings.HiddenQueue = True Then + Queue.Show() + End If + If Main.Mail = Nothing And My.Settings.Mail = "na" Then 'Dim Login As Form = LoginForm 'Login.StartPosition = 0 @@ -224,12 +228,19 @@ Public Class Anime_Add ' ' pictureBox4.Enabled = True 'Else If Main.RunningQueue = True Then - If CBool(InStr(textBox1.Text, "series/")) Then + If CBool(InStr(textBox1.Text, "series/")) And My.Settings.HiddenQueue = False Then Debug.WriteLine("Queue_Block_series") 'textBox1.Text = "URL" StatusLabel.Text = "Status: Series add blocked, queue is running!" Pause(5) StatusLabel.Text = "Status: Idle" + ElseIf CBool(InStr(textBox1.Text, "series/")) And My.Settings.HiddenQueue = True Then + Debug.WriteLine("Queue_adding_series") + 'textBox1.Text = "URL" + StatusLabel.Text = "Status: Series added to queue." + 'Pause(5) + 'StatusLabel.Text = "Status: Idle" + Main.LoadBrowser(textBox1.Text) Else Debug.WriteLine("Queue_Block") Main.ListBoxList.Add(textBox1.Text) diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 9dff37d..fddd973 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -159,6 +159,9 @@ na + + False + diff --git a/Crunchyroll Downloader/Browser.vb b/Crunchyroll Downloader/Browser.vb index 668b984..ba04c64 100644 --- a/Crunchyroll Downloader/Browser.vb +++ b/Crunchyroll Downloader/Browser.vb @@ -115,7 +115,7 @@ Public Class Browser If Main.UserBowser = False Then Me.Location = New Point(-10000, 10000) - Timer1.Enabled = True + 'Timer1.Enabled = True End If WebView2.Source = New Uri(Main.Startseite) End Sub diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index d91f697..dc4ec39 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -70,8 +70,10 @@ Public Class Main Public MergeSubsFormat As String = "mov_text" Public DlSoftSubsRDY As Boolean = True Public DialogTaskString As String - Dim NewAPIString1 As String - Dim NewAPIString2 As String + 'Dim NewAPIString1 As String + 'Dim NewAPIString2 As String + + Dim TTL As Integer = 0 'Public ErrorBrowserBackString As String Public RunningQueue As Boolean = False @@ -128,7 +130,9 @@ Public Class Main Public WebbrowserText As String = Nothing Public WebbrowserTitle As String = Nothing Public WebbrowserCookie As String = Nothing + Public UserQueue As Boolean = False Public UserBowser As Boolean = False + Public BowserWasOpen As Boolean = False Public HybridMode As Boolean = False @@ -735,7 +739,7 @@ Public Class Main Catch ex As Exception RunningDownloads = Panel1.Controls.Count End Try - If RunningDownloads < MaxDL Then + If RunningDownloads < MaxDL Or My.Settings.HiddenQueue = True Then Exit For Else 'MsgBox(e) @@ -2874,20 +2878,28 @@ Public Class Main End Sub Private Sub Btn_Queue_Click(sender As Object, e As EventArgs) Handles Btn_Queue.Click - If File.Exists("cookies.txt") = False Then - If Application.OpenForms().OfType(Of Browser).Any = True Then - Else - UserBowser = False - Browser.Show() - End If - End If - If Queue.WindowState = System.Windows.Forms.FormWindowState.Minimized Then - Queue.WindowState = System.Windows.Forms.FormWindowState.Normal + UserQueue = True + If Application.OpenForms().OfType(Of Queue).Any = True Then + Queue.Location = New Point(CInt(Me.Location.X + Me.Width / 2 - Queue.Width / 2), CInt(Me.Location.Y + Me.Height / 2 - Queue.Height / 2)) + If Queue.WindowState = System.Windows.Forms.FormWindowState.Minimized Then + Queue.WindowState = System.Windows.Forms.FormWindowState.Normal + Queue.ShowInTaskbar = True + End If Else + Queue.Location = New Point(CInt(Me.Location.X + Me.Width / 2 - Queue.Width / 2), CInt(Me.Location.Y + Me.Height / 2 - Queue.Height / 2)) Queue.Show() End If + Try + Dim hwnd As IntPtr = FindWindow(Nothing, Queue.Text) + SetForegroundWindow(hwnd) + Catch ex As Exception + Debug.WriteLine("Queue foreground failure") + End Try + + + End Sub diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 78ef7ce..240e473 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index ac30492..c4cf850 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -606,6 +606,18 @@ Namespace My Me("PW") = value End Set End Property + + _ + Public Property HiddenQueue() As Boolean + Get + Return CType(Me("HiddenQueue"),Boolean) + End Get + Set + Me("HiddenQueue") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index e83094e..9776e0c 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -140,5 +140,8 @@ na + + False + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 0a09a52..a21a577 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -144,6 +144,7 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() + Me.CB_HideQueue = New MetroFramework.Controls.MetroCheckBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -334,10 +335,10 @@ Partial Class Einstellungen Me.TabPage2.HorizontalScrollbarBarColor = True Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False Me.TabPage2.HorizontalScrollbarSize = 10 - Me.TabPage2.Location = New System.Drawing.Point(4, 44) + Me.TabPage2.Location = New System.Drawing.Point(4, 54) Me.TabPage2.Name = "TabPage2" Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(501, 519) + Me.TabPage2.Size = New System.Drawing.Size(501, 509) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = " Output " Me.TabPage2.VerticalScrollbarBarColor = True @@ -362,6 +363,7 @@ Partial Class Einstellungen 'GroupBox18 ' Me.GroupBox18.BackColor = System.Drawing.Color.Transparent + Me.GroupBox18.Controls.Add(Me.CB_HideQueue) Me.GroupBox18.Controls.Add(Me.ListViewAdd_True) Me.GroupBox18.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox18.ForeColor = System.Drawing.Color.Black @@ -376,7 +378,7 @@ Partial Class Einstellungen ' Me.ListViewAdd_True.AutoSize = True Me.ListViewAdd_True.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.ListViewAdd_True.Location = New System.Drawing.Point(119, 25) + Me.ListViewAdd_True.Location = New System.Drawing.Point(40, 21) Me.ListViewAdd_True.Name = "ListViewAdd_True" Me.ListViewAdd_True.Size = New System.Drawing.Size(255, 19) Me.ListViewAdd_True.TabIndex = 5 @@ -844,10 +846,10 @@ Partial Class Einstellungen Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarSize = 10 - Me.TabPage1.Location = New System.Drawing.Point(4, 44) + Me.TabPage1.Location = New System.Drawing.Point(4, 54) Me.TabPage1.Name = "TabPage1" Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(501, 519) + Me.TabPage1.Size = New System.Drawing.Size(501, 509) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = " Main " Me.TabPage1.VerticalScrollbar = True @@ -1081,7 +1083,7 @@ Partial Class Einstellungen Me.TabControl1.ItemSize = New System.Drawing.Size(86, 50) Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Name = "TabControl1" - Me.TabControl1.SelectedIndex = 4 + Me.TabControl1.SelectedIndex = 1 Me.TabControl1.Size = New System.Drawing.Size(509, 567) Me.TabControl1.TabIndex = 0 Me.TabControl1.UseSelectable = True @@ -1095,9 +1097,9 @@ Partial Class Einstellungen Me.MetroTabPage2.HorizontalScrollbarBarColor = True Me.MetroTabPage2.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage2.HorizontalScrollbarSize = 10 - Me.MetroTabPage2.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage2.Location = New System.Drawing.Point(4, 54) Me.MetroTabPage2.Name = "MetroTabPage2" - Me.MetroTabPage2.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage2.Size = New System.Drawing.Size(501, 509) Me.MetroTabPage2.TabIndex = 8 Me.MetroTabPage2.Text = " Naming " Me.MetroTabPage2.VerticalScrollbarBarColor = True @@ -1401,9 +1403,9 @@ Partial Class Einstellungen Me.MetroTabPage1.HorizontalScrollbarBarColor = True Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False Me.MetroTabPage1.HorizontalScrollbarSize = 10 - Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44) + Me.MetroTabPage1.Location = New System.Drawing.Point(4, 54) Me.MetroTabPage1.Name = "MetroTabPage1" - Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519) + Me.MetroTabPage1.Size = New System.Drawing.Size(501, 509) Me.MetroTabPage1.TabIndex = 7 Me.MetroTabPage1.Text = " Crunchyroll " Me.MetroTabPage1.VerticalScrollbarBarColor = True @@ -1644,6 +1646,17 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' + 'CB_HideQueue + ' + Me.CB_HideQueue.AutoSize = True + Me.CB_HideQueue.FontSize = MetroFramework.MetroCheckBoxSize.Medium + Me.CB_HideQueue.Location = New System.Drawing.Point(328, 21) + Me.CB_HideQueue.Name = "CB_HideQueue" + Me.CB_HideQueue.Size = New System.Drawing.Size(112, 19) + Me.CB_HideQueue.TabIndex = 6 + Me.CB_HideQueue.Text = "hidden Queue" + Me.CB_HideQueue.UseSelectable = True + ' 'Einstellungen ' Me.ApplyImageInvert = True @@ -1831,4 +1844,5 @@ Partial Class Einstellungen Friend WithEvents CB_Mod1 As MetroFramework.Controls.MetroCheckBox Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox Friend WithEvents AMD_AV1 As ToolStripMenuItem + Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox End Class diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 30204ba..a59e020 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -19,6 +19,7 @@ Public Class Einstellungen Public CR_SoftSubsTemp As New List(Of String) Dim TempCheckSubMod1 As Boolean = False Dim TempVTTStyle As Boolean = False + Dim TempMultiDL As Boolean = False Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -34,6 +35,8 @@ Public Class Einstellungen Manager.Owner = Me Me.StyleManager = Manager + CB_HideQueue.Checked = My.Settings.HiddenQueue + CB_OverrideDub.Checked = My.Settings.OverrideDub CB_Cap.Checked = My.Settings.Captions @@ -545,14 +548,10 @@ Public Class Einstellungen Main.ErrorTolerance = CInt(NumericUpDown2.Value) My.Settings.ErrorTolerance = Main.ErrorTolerance - If ListViewAdd_True.Checked = True Then - Main.UseQueue = True - My.Settings.QueueMode = Main.UseQueue - ElseIf ListViewAdd_True.Checked = False Then - Main.UseQueue = False - My.Settings.QueueMode = Main.UseQueue - End If + Main.UseQueue = ListViewAdd_True.Checked + My.Settings.QueueMode = Main.UseQueue + My.Settings.HiddenQueue = CB_HideQueue.Checked Main.SoftSubs.Clear() Main.SoftSubs.AddRange(CR_SoftSubsTemp) @@ -967,6 +966,18 @@ Public Class Einstellungen End If End Sub + Private Sub CB_HideQueue_CheckedChanged(sender As Object, e As EventArgs) Handles CB_HideQueue.CheckedChanged + If CB_HideQueue.Checked = True Then + TempMultiDL = ListViewAdd_True.Checked + ListViewAdd_True.Checked = True + ListViewAdd_True.Enabled = False + + Else + ListViewAdd_True.Checked = TempMultiDL + ListViewAdd_True.Enabled = True + End If + End Sub + diff --git a/Crunchyroll Downloader/queue.vb b/Crunchyroll Downloader/queue.vb index a66d3cf..d0cfc31 100644 --- a/Crunchyroll Downloader/queue.vb +++ b/Crunchyroll Downloader/queue.vb @@ -16,14 +16,22 @@ Public Class Queue ListBox1.ForeColor = Main.ForeColorValue bs.DataSource = Main.ListBoxList ListBox1.DataSource = bs - + Me.Icon = My.Resources.icon Btn_min.Image = Main.MinImg Btn_Close.Image = Main.CloseImg + Me.StartPosition = 0 + If Main.UserQueue = False Then + Me.Location = New Point(-10000, -10000) + 'Me.ShowInTaskbar = False + 'Me.WindowState = System.Windows.Forms.FormWindowState.Minimized + RunQueue.Checked = True + End If End Sub Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click + Main.UserQueue = False Me.Close() End Sub @@ -44,7 +52,6 @@ Public Class Queue If Main.ListBoxList.Count <> ListBox1.Items.Count Then bs.ResetBindings(False) End If - End Sub Private Sub Queue_Resize(sender As Object, e As EventArgs) Handles Me.Resize