-minimize button added
-error hanling for hybride (untested)
-fix resolution auto with hybride mode while missing 1080p
-added reso saved after not found dialog
This commit is contained in:
hama3254 2020-12-13 16:11:43 +01:00
parent ca20c08ce8
commit a428e70084
34 changed files with 390 additions and 123 deletions

Binary file not shown.

View File

@ -24,6 +24,7 @@ Partial Class Anime_Add
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Anime_Add))
Me.groupBox1 = New System.Windows.Forms.GroupBox() Me.groupBox1 = New System.Windows.Forms.GroupBox()
Me.StatusLabel = New MetroFramework.Controls.MetroLabel() Me.StatusLabel = New MetroFramework.Controls.MetroLabel()
Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox() Me.ComboBox2 = New MetroFramework.Controls.MetroComboBox()
@ -31,7 +32,6 @@ Partial Class Anime_Add
Me.textBox1 = New MetroFramework.Controls.MetroTextBox() Me.textBox1 = New MetroFramework.Controls.MetroTextBox()
Me.textBox2 = New MetroFramework.Controls.MetroTextBox() Me.textBox2 = New MetroFramework.Controls.MetroTextBox()
Me.pictureBox4 = New System.Windows.Forms.PictureBox() Me.pictureBox4 = New System.Windows.Forms.PictureBox()
Me.pictureBox3 = New System.Windows.Forms.PictureBox()
Me.groupBox2 = New System.Windows.Forms.GroupBox() Me.groupBox2 = New System.Windows.Forms.GroupBox()
Me.comboBox4 = New MetroFramework.Controls.MetroComboBox() Me.comboBox4 = New MetroFramework.Controls.MetroComboBox()
Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox() Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox()
@ -42,12 +42,15 @@ Partial Class Anime_Add
Me.ListBox1 = New System.Windows.Forms.ListBox() Me.ListBox1 = New System.Windows.Forms.ListBox()
Me.Timer1 = New System.Windows.Forms.Timer(Me.components) Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
Me.Timer2 = New System.Windows.Forms.Timer(Me.components) Me.Timer2 = New System.Windows.Forms.Timer(Me.components)
Me.Btn_min = New System.Windows.Forms.PictureBox()
Me.Btn_Close = New System.Windows.Forms.PictureBox()
Me.groupBox1.SuspendLayout() Me.groupBox1.SuspendLayout()
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.pictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
Me.groupBox2.SuspendLayout() Me.groupBox2.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.GroupBox3.SuspendLayout() Me.GroupBox3.SuspendLayout()
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
'groupBox1 'groupBox1
@ -215,18 +218,6 @@ Partial Class Anime_Add
Me.pictureBox4.TabIndex = 42 Me.pictureBox4.TabIndex = 42
Me.pictureBox4.TabStop = False Me.pictureBox4.TabStop = False
' '
'pictureBox3
'
Me.pictureBox3.BackColor = System.Drawing.Color.Transparent
Me.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand
Me.pictureBox3.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close
Me.pictureBox3.Location = New System.Drawing.Point(580, 0)
Me.pictureBox3.Name = "pictureBox3"
Me.pictureBox3.Size = New System.Drawing.Size(50, 40)
Me.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
Me.pictureBox3.TabIndex = 43
Me.pictureBox3.TabStop = False
'
'groupBox2 'groupBox2
' '
Me.groupBox2.BackColor = System.Drawing.Color.Transparent Me.groupBox2.BackColor = System.Drawing.Color.Transparent
@ -334,13 +325,42 @@ Partial Class Anime_Add
Me.Timer2.Enabled = True Me.Timer2.Enabled = True
Me.Timer2.Interval = 2500 Me.Timer2.Interval = 2500
' '
'Btn_min
'
Me.Btn_min.BackColor = System.Drawing.Color.Transparent
Me.Btn_min.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.Btn_min.Cursor = System.Windows.Forms.Cursors.Hand
Me.Btn_min.Image = CType(resources.GetObject("Btn_min.Image"), System.Drawing.Image)
Me.Btn_min.Location = New System.Drawing.Point(567, 1)
Me.Btn_min.Margin = New System.Windows.Forms.Padding(0)
Me.Btn_min.Name = "Btn_min"
Me.Btn_min.Size = New System.Drawing.Size(25, 25)
Me.Btn_min.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
Me.Btn_min.TabIndex = 73
Me.Btn_min.TabStop = False
'
'Btn_Close
'
Me.Btn_Close.BackColor = System.Drawing.Color.Transparent
Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
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(592, 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(40, 40)
Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
Me.Btn_Close.TabIndex = 72
Me.Btn_Close.TabStop = False
'
'Anime_Add 'Anime_Add
' '
Me.ApplyImageInvert = True Me.ApplyImageInvert = True
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle
Me.ClientSize = New System.Drawing.Size(630, 300) Me.ClientSize = New System.Drawing.Size(630, 300)
Me.Controls.Add(Me.pictureBox3) Me.Controls.Add(Me.Btn_min)
Me.Controls.Add(Me.Btn_Close)
Me.Controls.Add(Me.pictureBox4) Me.Controls.Add(Me.pictureBox4)
Me.Controls.Add(Me.groupBox2) Me.Controls.Add(Me.groupBox2)
Me.Controls.Add(Me.groupBox1) Me.Controls.Add(Me.groupBox1)
@ -351,15 +371,14 @@ Partial Class Anime_Add
Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center Me.TextAlign = MetroFramework.Forms.MetroFormTextAlign.Center
Me.groupBox1.ResumeLayout(False) Me.groupBox1.ResumeLayout(False)
CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pictureBox4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.pictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
Me.groupBox2.ResumeLayout(False) Me.groupBox2.ResumeLayout(False)
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
Me.GroupBox3.ResumeLayout(False) Me.GroupBox3.ResumeLayout(False)
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout()
End Sub End Sub
Private WithEvents pictureBox3 As PictureBox
Public WithEvents pictureBox4 As PictureBox Public WithEvents pictureBox4 As PictureBox
Public WithEvents groupBox2 As GroupBox Public WithEvents groupBox2 As GroupBox
Public WithEvents PictureBox1 As PictureBox Public WithEvents PictureBox1 As PictureBox
@ -378,4 +397,6 @@ Partial Class Anime_Add
Public WithEvents comboBox4 As MetroFramework.Controls.MetroComboBox Public WithEvents comboBox4 As MetroFramework.Controls.MetroComboBox
Public WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox Public WithEvents ComboBox1 As MetroFramework.Controls.MetroComboBox
Public WithEvents comboBox3 As MetroFramework.Controls.MetroComboBox Public WithEvents comboBox3 As MetroFramework.Controls.MetroComboBox
Private WithEvents Btn_min As PictureBox
Private WithEvents Btn_Close As PictureBox
End Class End Class

View File

@ -123,4 +123,12 @@
<metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>117, 19</value> <value>117, 19</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Btn_min.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg==
</value>
</data>
</root> </root>

View File

@ -46,8 +46,8 @@ Public Class Anime_Add
Manager.Owner = Me Manager.Owner = Me
Me.StyleManager = Manager Me.StyleManager = Manager
pictureBox3.Image = Main.CloseImg Btn_Close.Image = Main.CloseImg
Btn_min.Image = Main.MinImg
Try Try
Me.Icon = My.Resources.icon Me.Icon = My.Resources.icon
Catch ex As Exception Catch ex As Exception
@ -183,26 +183,9 @@ Public Class Anime_Add
Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles pictureBox3.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 pictureBox3.MouseLeave
Dim PB As PictureBox = sender
PB.Image = Main.CloseImg
End Sub
Private Sub PictureBox3_Click(sender As Object, e As EventArgs) Handles pictureBox3.Click
Main.ListBoxList.Clear()
If ListBox1.Items.Count > 0 Then
For i As Integer = 0 To ListBox1.Items.Count - 1
Main.ListBoxList.Add(ListBox1.Items.Item(i))
Next
End If
Me.Close()
End Sub
Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
'pictureBox4.Enabled = False 'pictureBox4.Enabled = False
@ -1238,4 +1221,43 @@ Public Class Anime_Add
' End Try ' End Try
' Funimation_Grapp_RDY = True ' Funimation_Grapp_RDY = True
End Sub End Sub
Private Sub Anime_Add_Resize(sender As Object, e As EventArgs) Handles Me.Resize
Btn_Close.Location = New Point(Me.Width - 40, 1)
Btn_min.Location = New Point(Me.Width - 68, 10)
End Sub
Private Sub Btn_min_Click(sender As Object, e As EventArgs) Handles Btn_min.Click
Me.WindowState = System.Windows.Forms.FormWindowState.Minimized
End Sub
Private Sub Btn_Close_Click(sender As Object, e As EventArgs) Handles Btn_Close.Click
Main.ListBoxList.Clear()
If ListBox1.Items.Count > 0 Then
For i As Integer = 0 To ListBox1.Items.Count - 1
Main.ListBoxList.Add(ListBox1.Items.Item(i))
Next
End If
Me.Close()
End Sub
Private Sub Btn_min_MouseEnter(sender As Object, e As EventArgs) Handles Btn_min.MouseEnter
Dim PB As PictureBox = sender
PB.Image = My.Resources.main_mini_red
End Sub
Private Sub Btn_min_MouseLeave(sender As Object, e As EventArgs) Handles Btn_min.MouseLeave
Dim PB As PictureBox = sender
PB.Image = Main.MinImg
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 = Main.CloseImg
End Sub
End Class End Class

View File

@ -50,6 +50,7 @@ Public Class CRD_List_Item
Dim LastDataRate2 As Double = 0 Dim LastDataRate2 As Double = 0
Dim LastDataRate3 As Double = 0 Dim LastDataRate3 As Double = 0
Dim FailedSegments As New List(Of FailedSegemtsWithURL)
#Region "Remove from list" #Region "Remove from list"
Public Sub DisposeItem(ByVal Dispose As Boolean) Public Sub DisposeItem(ByVal Dispose As Boolean)
@ -223,13 +224,40 @@ Public Class CRD_List_Item
StatusRunning = False StatusRunning = False
bt_pause.BackgroundImage = My.Resources.main_pause_play bt_pause.BackgroundImage = My.Resources.main_pause_play
ElseIf Failed = True Then
Dim Result As DialogResult = MessageBox.Show("The hybride mode has failed to download a fragment." + vbNewLine + "Press 'Retry' to retry the fragment or 'Ignore' to continue.", "Download Error", MessageBoxButtons.AbortRetryIgnore) '= DialogResult.Ignore Then
If Result = DialogResult.Ignore Then
Failed = False
StatusRunning = True
bt_pause.BackgroundImage = My.Resources.main_pause
FailedSegments.Clear()
ElseIf Result = DialogResult.Retry Then
If FailedSegments.Count > 0 Then
For i As Integer = 0 To FailedSegments.Count - 1
Dim Evaluator = New Thread(Sub() Me.TS_DownloadAsync(FailedSegments.Item(i).url, FailedSegments.Item(i).path))
FailedSegments.RemoveAt(i)
Evaluator.Start()
ThreadList.Add(Evaluator)
Next
Failed = False
StatusRunning = True
bt_pause.BackgroundImage = My.Resources.main_pause
End If
ElseIf Result = DialogResult.Abort Then
If MessageBox.Show("Are you sure you want to cancel the Download?", "Cancel Download!", MessageBoxButtons.YesNo) = DialogResult.No Then
Exit Sub
End If
Canceld = True
End If
Else Else
StatusRunning = True StatusRunning = True
bt_pause.BackgroundImage = My.Resources.main_pause bt_pause.BackgroundImage = My.Resources.main_pause
End If End If
Else Else
If proc.HasExited = True Then If proc.HasExited = True Then
If ProgressBar1.Value < 100 Then If ProgressBar1.Value < 100 Then
If Retry = True Then If Retry = True Then
If Main.RunningDownloads < Main.MaxDL Then If Main.RunningDownloads < Main.MaxDL Then
@ -266,37 +294,41 @@ Public Class CRD_List_Item
SuspendProcess(proc) SuspendProcess(proc)
Else Else
If Failed = True Then If Failed = True Then
'If HybridMode = True Then
'Else
Dim Result As DialogResult = MessageBox.Show("The download has " + FailedCount.ToString + " failded segments" + vbNewLine + "Press 'Ignore' to continue", "Download Error", MessageBoxButtons.AbortRetryIgnore) '= DialogResult.Ignore Then Dim Result As DialogResult = MessageBox.Show("The download has " + FailedCount.ToString + " failded segments" + vbNewLine + "Press 'Ignore' to continue", "Download Error", MessageBoxButtons.AbortRetryIgnore) '= DialogResult.Ignore Then
If Result = DialogResult.Ignore Then If Result = DialogResult.Ignore Then
Failed = False Failed = False
StatusRunning = True
bt_pause.BackgroundImage = My.Resources.main_pause
ResumeProcess(proc)
ElseIf Result = DialogResult.Retry Then
Try
proc.Kill()
proc.WaitForExit(500)
Label_percent.Text = "retrying -%"
Label_website.Text = Label_website_Text
Catch ex As Exception
End Try
If proc.HasExited Then
StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode)
StatusRunning = True StatusRunning = True
Label_website.Text = Label_website_Text
bt_pause.BackgroundImage = My.Resources.main_pause bt_pause.BackgroundImage = My.Resources.main_pause
ResumeProcess(proc)
ElseIf Result = DialogResult.Retry Then
Try
proc.Kill()
proc.WaitForExit(500)
Label_percent.Text = "retrying -%"
Label_website.Text = Label_website_Text
Catch ex As Exception
End Try
If proc.HasExited Then
StartDownload(HistoryDL_URL, HistoryDL_Pfad, HistoryFilename, HybridMode)
StatusRunning = True
Label_website.Text = Label_website_Text
bt_pause.BackgroundImage = My.Resources.main_pause
End If
ElseIf Result = DialogResult.Abort Then
Try
proc.Kill()
proc.WaitForExit(500)
Label_percent.Text = "canceled -%"
Label_website.Text = Label_website_Text
Catch ex As Exception
End Try
End If End If
ElseIf Result = DialogResult.Abort Then ' End If
Try
proc.Kill()
proc.WaitForExit(500)
Label_percent.Text = "canceled -%"
Label_website.Text = Label_website_Text
Catch ex As Exception
End Try
End If
Else Else
If StatusRunning = True Then If StatusRunning = True Then
StatusRunning = False StatusRunning = False
@ -379,13 +411,29 @@ Public Class CRD_List_Item
WC_TS.DownloadFile(New Uri(DL_URL), DL_Pfad) WC_TS.DownloadFile(New Uri(DL_URL), DL_Pfad)
Catch ex As Exception Catch ex As Exception
Debug.WriteLine("Download error #1: " + DL_Pfad)
Try Try
Dim wc_ts As New WebClient Dim wc_ts As New WebClient
wc_ts.DownloadFile(New Uri(DL_URL), DL_Pfad) wc_ts.DownloadFile(New Uri(DL_URL), DL_Pfad)
Catch ex2 As Exception Catch ex2 As Exception
FailedCount = FailedCount + 1
If Item_ErrorTolerance = 0 Then
ElseIf FailedCount >= Item_ErrorTolerance Then
FailedSegments.Add(New FailedSegemtsWithURL(DL_Pfad, DL_URL))
Failed = True
StatusRunning = False
bt_pause.BackgroundImage = My.Resources.main_pause_play
Me.Invoke(New Action(Function()
Label_percent.Text = "Missing segment detected, retry or resume with the play button"
Return Nothing
End Function))
End If
Debug.WriteLine("Download error #2: " + DL_Pfad + vbNewLine + ex.ToString + vbNewLine + DL_URL) Debug.WriteLine("Download error #2: " + DL_Pfad + vbNewLine + ex.ToString + vbNewLine + DL_URL)
End Try End Try
Debug.WriteLine("Download error #1: " + DL_Pfad)
End Try End Try
End Sub End Sub
@ -436,10 +484,10 @@ Public Class CRD_List_Item
LastDataRate1 = DataRate LastDataRate1 = DataRate
Dim DataRateString As String = Math.Round(DataRateFinal, 2, MidpointRounding.AwayFromZero).ToString() Dim DataRateString As String = Math.Round(DataRateFinal, 2, MidpointRounding.AwayFromZero).ToString()
Debug.WriteLine("----------------") 'Debug.WriteLine("----------------")
Debug.WriteLine(SinceLast) 'Debug.WriteLine(SinceLast)
Debug.WriteLine(TimeinMilliSeconds) 'Debug.WriteLine(TimeinMilliSeconds)
Debug.WriteLine(DataRate) 'Debug.WriteLine(DataRate)
If prozent > 100 Then If prozent > 100 Then
prozent = 100 prozent = 100
ElseIf prozent < 0 Then ElseIf prozent < 0 Then
@ -530,8 +578,20 @@ Public Class CRD_List_Item
End If End If
Dim client0 As New WebClient Dim client0 As New WebClient
client0.Encoding = Encoding.UTF8 client0.Encoding = Encoding.UTF8
Dim text As String = client0.DownloadString(m3u8_url(1)) Dim text As String = Nothing
Try
text = client0.DownloadString(m3u8_url(1))
Catch ex As Exception
Me.Invoke(New Action(Function()
Label_website.Text = "The download process seems to have crashed"
Label_percent.Text = ex.ToString
Return Nothing
End Function))
Return Nothing
Exit Function
End Try
If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments If InStr(text, "RESOLUTION=") Then 'master m3u8 no fragments
'My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\log.txt", text, False)
Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries) Dim new_m3u8_2() As String = text.Split(New String() {vbLf}, System.StringSplitOptions.RemoveEmptyEntries)
If TargetReso = 42 Then If TargetReso = 42 Then
TargetReso = 1080 TargetReso = 1080
@ -553,7 +613,7 @@ Public Class CRD_List_Item
path = path + c(i3) path = path + c(i3)
Next Next
m3u8_url_3 = path + m3u8_url_1 m3u8_url_3 = path + m3u8_url_1
'MsgBox(m3u8_url_1) 'MsgBox(m3u8_url_3)
text = client0.DownloadString(m3u8_url_3) text = client0.DownloadString(m3u8_url_3)
End If End If
@ -1200,3 +1260,18 @@ Public Class CRD_List_Item
End Class End Class
Public Class FailedSegemtsWithURL
Public path As String
Public url As String
Public Sub New(ByVal path As String, ByVal url As Integer)
Me.path = path
Me.url = url
End Sub
Public Overrides Function ToString() As String
Return String.Format("{0}, {1}", Me.path, Me.url)
End Function
End Class

View File

@ -251,6 +251,9 @@
<Content Include="Firefox\softokn3.dll" /> <Content Include="Firefox\softokn3.dll" />
<Content Include="Firefox\xul.dll" /> <Content Include="Firefox\xul.dll" />
<Content Include="icon.ico" /> <Content Include="icon.ico" />
<None Include="Resources\main-mini_red.png" />
<None Include="Resources\main-mini_dark.png" />
<None Include="Resources\main-mini.png" />
<None Include="Resources\main-setting_invert_dark.png" /> <None Include="Resources\main-setting_invert_dark.png" />
<None Include="Resources\main-close_dark.png" /> <None Include="Resources\main-close_dark.png" />
<None Include="Resources\main-browser_invert_dark.png" /> <None Include="Resources\main-browser_invert_dark.png" />
@ -274,13 +277,10 @@
<None Include="Resources\main-del-hover.png" /> <None Include="Resources\main-del-hover.png" />
<None Include="Resources\main-del.png" /> <None Include="Resources\main-del.png" />
<None Include="Resources\balken.png" /> <None Include="Resources\balken.png" />
<None Include="Resources\backgroud.png" />
<None Include="Resources\credits-background.png" />
<None Include="Resources\add_mass_running_cancel_hover.png" /> <None Include="Resources\add_mass_running_cancel_hover.png" />
<None Include="Resources\add_mass_running_cancel.png" /> <None Include="Resources\add_mass_running_cancel.png" />
<None Include="Resources\add_mass_cancel_hover.png" /> <None Include="Resources\add_mass_cancel_hover.png" />
<None Include="Resources\add_mass_cancel.png" /> <None Include="Resources\add_mass_cancel.png" />
<None Include="Resources\add-background.png" />
<None Include="Resources\main-settings.png" /> <None Include="Resources\main-settings.png" />
<None Include="Resources\main-browser.png" /> <None Include="Resources\main-browser.png" />
<None Include="Resources\main-add.png" /> <None Include="Resources\main-add.png" />
@ -294,19 +294,13 @@
<None Include="Resources\download_subs.png" /> <None Include="Resources\download_subs.png" />
<None Include="Resources\DialogNotFound_Submit_hover.png" /> <None Include="Resources\DialogNotFound_Submit_hover.png" />
<None Include="Resources\DialogNotFound_Submit.png" /> <None Include="Resources\DialogNotFound_Submit.png" />
<None Include="Resources\DialogNotFound_Background.png" />
<None Include="Resources\main_button_download-deactivate.png" /> <None Include="Resources\main_button_download-deactivate.png" />
<None Include="Resources\crdsettings_setUScookie_button_hover.png" /> <None Include="Resources\crdsettings_setUScookie_button_hover.png" />
<None Include="Resources\crdsettings_setUScookie_button.png" /> <None Include="Resources\crdsettings_setUScookie_button.png" />
<None Include="Resources\credits_close_hover.png" />
<None Include="Resources\credits_close_default.png" />
<None Include="Resources\main_credits_hover.png" />
<None Include="Resources\main_credits_default.png" />
<None Include="Resources\main_button_download_hovert.png" /> <None Include="Resources\main_button_download_hovert.png" />
<None Include="Resources\main_button_download_default.png" /> <None Include="Resources\main_button_download_default.png" />
<None Include="Resources\crdSettings_Button_SafeExit_hover.png" /> <None Include="Resources\crdSettings_Button_SafeExit_hover.png" />
<None Include="Resources\crdSettings_Button_SafeExit.png" /> <None Include="Resources\crdSettings_Button_SafeExit.png" />
<None Include="Resources\crdSettings_Background.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<WCFMetadata Include="Connected Services\" /> <WCFMetadata Include="Connected Services\" />

View File

@ -52,11 +52,15 @@ Public Class GeckoFX
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox(ex.ToString) If Main.LoginOnly = "US_UnBlock_Finsihed" And Main.UserBowser = False Then
Me.Close()
End If
'MsgBox(ex.ToString)
End Try End Try
End If End If
ElseIf Main.LoginOnly = "US_UnBlock_Finsihed" And Main.UserBowser = False Then
Me.Close()
Else Else

View File

@ -23,6 +23,7 @@ Partial Class Main
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Main))
Me.Btn_add = New System.Windows.Forms.PictureBox() Me.Btn_add = New System.Windows.Forms.PictureBox()
Me.Btn_Close = New System.Windows.Forms.PictureBox() Me.Btn_Close = New System.Windows.Forms.PictureBox()
Me.Btn_Settings = New System.Windows.Forms.PictureBox() Me.Btn_Settings = New System.Windows.Forms.PictureBox()
@ -38,6 +39,7 @@ Partial Class Main
Me.PictureBox6 = New System.Windows.Forms.PictureBox() Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components) Me.MetroStyleExtender1 = New MetroFramework.Components.MetroStyleExtender(Me.components)
Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components) Me.MetroStyleManager1 = New MetroFramework.Components.MetroStyleManager(Me.components)
Me.Btn_min = New System.Windows.Forms.PictureBox()
CType(Me.Btn_add, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_add, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Close, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Btn_Settings, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Btn_Settings, System.ComponentModel.ISupportInitialize).BeginInit()
@ -45,6 +47,7 @@ Partial Class Main
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Btn_add 'Btn_add
@ -63,13 +66,14 @@ Partial Class Main
'Btn_Close 'Btn_Close
' '
Me.Btn_Close.BackColor = System.Drawing.Color.Transparent Me.Btn_Close.BackColor = System.Drawing.Color.Transparent
Me.Btn_Close.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_Close.Cursor = System.Windows.Forms.Cursors.Hand
Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close Me.Btn_Close.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_close
Me.Btn_Close.Location = New System.Drawing.Point(790, 1) Me.Btn_Close.Location = New System.Drawing.Point(800, 1)
Me.Btn_Close.Margin = New System.Windows.Forms.Padding(0) Me.Btn_Close.Margin = New System.Windows.Forms.Padding(0)
Me.Btn_Close.Name = "Btn_Close" Me.Btn_Close.Name = "Btn_Close"
Me.Btn_Close.Size = New System.Drawing.Size(50, 40) Me.Btn_Close.Size = New System.Drawing.Size(40, 40)
Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize Me.Btn_Close.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
Me.Btn_Close.TabIndex = 23 Me.Btn_Close.TabIndex = 23
Me.Btn_Close.TabStop = False Me.Btn_Close.TabStop = False
' '
@ -78,7 +82,7 @@ Partial Class Main
Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent Me.Btn_Settings.BackColor = System.Drawing.Color.Transparent
Me.Btn_Settings.Cursor = System.Windows.Forms.Cursors.Hand Me.Btn_Settings.Cursor = System.Windows.Forms.Cursors.Hand
Me.Btn_Settings.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_settings Me.Btn_Settings.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_settings
Me.Btn_Settings.Location = New System.Drawing.Point(676, 17) Me.Btn_Settings.Location = New System.Drawing.Point(646, 17)
Me.Btn_Settings.Margin = New System.Windows.Forms.Padding(0) Me.Btn_Settings.Margin = New System.Windows.Forms.Padding(0)
Me.Btn_Settings.Name = "Btn_Settings" Me.Btn_Settings.Name = "Btn_Settings"
Me.Btn_Settings.Size = New System.Drawing.Size(80, 35) Me.Btn_Settings.Size = New System.Drawing.Size(80, 35)
@ -178,12 +182,27 @@ Partial Class Main
Me.MetroStyleManager1.Owner = Me Me.MetroStyleManager1.Owner = Me
Me.MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Orange Me.MetroStyleManager1.Style = MetroFramework.MetroColorStyle.Orange
' '
'Btn_min
'
Me.Btn_min.BackColor = System.Drawing.Color.Transparent
Me.Btn_min.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None
Me.Btn_min.Cursor = System.Windows.Forms.Cursors.Hand
Me.Btn_min.Image = CType(resources.GetObject("Btn_min.Image"), System.Drawing.Image)
Me.Btn_min.Location = New System.Drawing.Point(764, 8)
Me.Btn_min.Margin = New System.Windows.Forms.Padding(0)
Me.Btn_min.Name = "Btn_min"
Me.Btn_min.Size = New System.Drawing.Size(25, 25)
Me.Btn_min.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
Me.Btn_min.TabIndex = 71
Me.Btn_min.TabStop = False
'
'Main 'Main
' '
Me.ApplyImageInvert = True Me.ApplyImageInvert = True
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None
Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle
Me.ClientSize = New System.Drawing.Size(842, 630) Me.ClientSize = New System.Drawing.Size(842, 630)
Me.Controls.Add(Me.Btn_min)
Me.Controls.Add(Me.TheTextBox) Me.Controls.Add(Me.TheTextBox)
Me.Controls.Add(Me.PictureBox6) Me.Controls.Add(Me.PictureBox6)
Me.Controls.Add(Me.PictureBox5) Me.Controls.Add(Me.PictureBox5)
@ -210,8 +229,8 @@ Partial Class Main
CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox5, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBox6, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.Btn_min, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout()
End Sub End Sub
Private WithEvents Btn_add As PictureBox Private WithEvents Btn_add As PictureBox
@ -229,4 +248,5 @@ Partial Class Main
Friend WithEvents PictureBox6 As PictureBox Friend WithEvents PictureBox6 As PictureBox
Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender Friend WithEvents MetroStyleExtender1 As MetroFramework.Components.MetroStyleExtender
Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager Friend WithEvents MetroStyleManager1 As MetroFramework.Components.MetroStyleManager
Private WithEvents Btn_min As PictureBox
End Class End Class

View File

@ -138,4 +138,12 @@
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>87</value> <value>87</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="Btn_min.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg==
</value>
</data>
</root> </root>

View File

@ -140,15 +140,20 @@ Public Class Main
End Sub End Sub
Public CloseImg As Bitmap = My.Resources.main_del Public CloseImg As Bitmap = My.Resources.main_del
Public MinImg As Bitmap = My.Resources.main_mini
Public Sub DarkMode() Public Sub DarkMode()
ListView1.BackColor = Color.FromArgb(50, 50, 50) ListView1.BackColor = Color.FromArgb(50, 50, 50)
CloseImg = My.Resources.main_close_dark CloseImg = My.Resources.main_close_dark
MinImg = My.Resources.main_mini_dark
Btn_min.Image = MinImg
Btn_Close.Image = CloseImg Btn_Close.Image = CloseImg
End Sub End Sub
Public Sub LightMode() Public Sub LightMode()
ListView1.BackColor = SystemColors.Control ListView1.BackColor = SystemColors.Control
CloseImg = My.Resources.main_close CloseImg = My.Resources.main_close
MinImg = My.Resources.main_mini
Btn_min.Image = MinImg
Btn_Close.Image = CloseImg Btn_Close.Image = CloseImg
End Sub End Sub
@ -196,6 +201,15 @@ Public Class Main
Dim PB As PictureBox = sender Dim PB As PictureBox = sender
PB.Image = My.Resources.main_settings PB.Image = My.Resources.main_settings
End Sub End Sub
Private Sub Btn_min_MouseEnter(sender As Object, e As EventArgs) Handles Btn_min.MouseEnter
Dim PB As PictureBox = sender
PB.Image = My.Resources.main_mini_red
End Sub
Private Sub Btn_min_MouseLeave(sender As Object, e As EventArgs) Handles Btn_min.MouseLeave
Dim PB As PictureBox = sender
PB.Image = MinImg
End Sub
Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Close.MouseEnter Private Sub Btn_Close_MouseEnter(sender As Object, e As EventArgs) Handles Btn_Close.MouseEnter
Dim PB As PictureBox = sender Dim PB As PictureBox = sender
PB.Image = My.Resources.main_del PB.Image = My.Resources.main_del
@ -205,7 +219,6 @@ Public Class Main
Dim PB As PictureBox = sender Dim PB As PictureBox = sender
PB.Image = CloseImg PB.Image = CloseImg
End Sub End Sub
Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click Private Sub PictureBox6_Click(sender As Object, e As EventArgs) Handles PictureBox6.Click
If TheTextBox.Visible = True Then If TheTextBox.Visible = True Then
TheTextBox.Visible = False TheTextBox.Visible = False
@ -246,8 +259,9 @@ Public Class Main
TheTextBox.Location = New Point(1, Me.Height - ListViewHeightOffset + 7) TheTextBox.Location = New Point(1, Me.Height - ListViewHeightOffset + 7)
TheTextBox.Width = Me.Width - 2 TheTextBox.Width = Me.Width - 2
Btn_Close.Location = New Point(Me.Width - 49, 1) Btn_Close.Location = New Point(Me.Width - 40, 1)
Btn_Settings.Location = New Point(Me.Width - 140, 17) Btn_min.Location = New Point(Me.Width - 68, 10)
Btn_Settings.Location = New Point(Me.Width - 170, 17)
Try Try
For s As Integer = 0 To ListView1.Items.Count - 1 For s As Integer = 0 To ListView1.Items.Count - 1
@ -1597,7 +1611,7 @@ Public Class Main
End If End If
#End Region #End Region
If Reso = 42 Then If Reso = 42 And HybridMode = False Then
If MergeSubstoMP4 = True 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) 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 Else
@ -1633,6 +1647,7 @@ Public Class Main
Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
Else Else
Reso2 = ResoBackString Reso2 = ResoBackString
ResoSave = ResoBackString
End If End If
End If End If
End If End If
@ -1711,8 +1726,10 @@ Public Class Main
Else Else
L2Name = CR_FilenName L2Name = CR_FilenName
End If End If
If Reso = 42 Then If Reso = 42 And HybridMode = False Then
ResoHTMLDisplay = "[Auto]" ResoHTMLDisplay = "[Auto]"
ElseIf Reso = 42 And HybridMode = False Then
ResoHTMLDisplay = Reso2
End If End If
Pfad_DL = Pfad2 Pfad_DL = Pfad2
Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries) Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
@ -1833,8 +1850,11 @@ Public Class Main
End Sub End Sub
Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles Btn_add.Click Private Sub PictureBox4_Click(sender As Object, e As EventArgs) Handles Btn_add.Click
Anime_Add.Show() If Anime_Add.WindowState = System.Windows.Forms.FormWindowState.Minimized Then
Anime_Add.WindowState = System.Windows.Forms.FormWindowState.Normal
Else
Anime_Add.Show()
End If
End Sub End Sub
Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles Btn_Settings.Click Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles Btn_Settings.Click
@ -2727,7 +2747,7 @@ Public Class Main
My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\index.html", c, False) My.Computer.FileSystem.WriteAllText(Application.StartupPath + "\WebInterface\index.html", c, False)
Catch ex As Exception Catch ex As Exception
Debug.WriteLine(ex.ToString) 'Debug.WriteLine(ex.ToString)
'MsgBox(ex.ToString) 'MsgBox(ex.ToString)
End Try End Try
End Sub End Sub
@ -3122,12 +3142,17 @@ Public Class Main
End Sub End Sub
Private Sub Btn_min_Click(sender As Object, e As EventArgs) Handles Btn_min.Click
Me.WindowState = System.Windows.Forms.FormWindowState.Minimized
End Sub
#End Region #End Region
End Class End Class

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.6.6")> <Assembly: AssemblyVersion("3.6.7")>
<Assembly: AssemblyFileVersion("3.6.6")> <Assembly: AssemblyFileVersion("3.6.7")>
<Assembly: NeutralResourcesLanguage("en")> <Assembly: NeutralResourcesLanguage("en")>

View File

@ -743,6 +743,36 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_mini() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_mini", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_mini_dark() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_mini_dark", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property main_mini_red() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("main_mini_red", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>

View File

@ -523,4 +523,13 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
<data name="main_setting_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="main_setting_invert_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-setting_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\main-setting_invert_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="main_mini" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-mini.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_mini_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-mini_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="main_mini_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\main-mini_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root> </root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@ -418,6 +418,21 @@ setInterval(function loadXMLDoc() {
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini_dark">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini_red">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_pause"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_pause">
<summary> <summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.

View File

@ -205,10 +205,10 @@ 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.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.Controls.Add(Me.TabControl2)
Me.TabPage4.Location = New System.Drawing.Point(4, 44) Me.TabPage4.Location = New System.Drawing.Point(4, 35)
Me.TabPage4.Name = "TabPage4" Me.TabPage4.Name = "TabPage4"
Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage4.Size = New System.Drawing.Size(493, 452) Me.TabPage4.Size = New System.Drawing.Size(493, 461)
Me.TabPage4.TabIndex = 3 Me.TabPage4.TabIndex = 3
Me.TabPage4.Text = "Crunchyroll" Me.TabPage4.Text = "Crunchyroll"
' '
@ -223,7 +223,7 @@ Partial Class Einstellungen
Me.TabControl2.Margin = New System.Windows.Forms.Padding(0) Me.TabControl2.Margin = New System.Windows.Forms.Padding(0)
Me.TabControl2.Name = "TabControl2" Me.TabControl2.Name = "TabControl2"
Me.TabControl2.SelectedIndex = 0 Me.TabControl2.SelectedIndex = 0
Me.TabControl2.Size = New System.Drawing.Size(487, 446) Me.TabControl2.Size = New System.Drawing.Size(487, 455)
Me.TabControl2.TabIndex = 0 Me.TabControl2.TabIndex = 0
Me.TabControl2.UseSelectable = True Me.TabControl2.UseSelectable = True
' '
@ -240,7 +240,7 @@ Partial Class Einstellungen
Me.TabPage5.Location = New System.Drawing.Point(4, 44) Me.TabPage5.Location = New System.Drawing.Point(4, 44)
Me.TabPage5.Name = "TabPage5" Me.TabPage5.Name = "TabPage5"
Me.TabPage5.Padding = New System.Windows.Forms.Padding(3) Me.TabPage5.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage5.Size = New System.Drawing.Size(479, 398) Me.TabPage5.Size = New System.Drawing.Size(479, 407)
Me.TabPage5.TabIndex = 0 Me.TabPage5.TabIndex = 0
Me.TabPage5.Text = "Main" Me.TabPage5.Text = "Main"
Me.TabPage5.VerticalScrollbarBarColor = True Me.TabPage5.VerticalScrollbarBarColor = True
@ -424,10 +424,10 @@ Partial Class Einstellungen
Me.TabPage3.HorizontalScrollbarBarColor = True Me.TabPage3.HorizontalScrollbarBarColor = True
Me.TabPage3.HorizontalScrollbarHighlightOnWheel = False Me.TabPage3.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage3.HorizontalScrollbarSize = 10 Me.TabPage3.HorizontalScrollbarSize = 10
Me.TabPage3.Location = New System.Drawing.Point(4, 44) Me.TabPage3.Location = New System.Drawing.Point(4, 35)
Me.TabPage3.Name = "TabPage3" Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3) Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage3.Size = New System.Drawing.Size(479, 398) Me.TabPage3.Size = New System.Drawing.Size(479, 416)
Me.TabPage3.TabIndex = 3 Me.TabPage3.TabIndex = 3
Me.TabPage3.Text = "Subtile Download" Me.TabPage3.Text = "Subtile Download"
Me.TabPage3.VerticalScrollbarBarColor = True Me.TabPage3.VerticalScrollbarBarColor = True
@ -934,10 +934,10 @@ Partial Class Einstellungen
Me.TabPage1.HorizontalScrollbarBarColor = True Me.TabPage1.HorizontalScrollbarBarColor = True
Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage1.HorizontalScrollbarSize = 10 Me.TabPage1.HorizontalScrollbarSize = 10
Me.TabPage1.Location = New System.Drawing.Point(4, 44) Me.TabPage1.Location = New System.Drawing.Point(4, 35)
Me.TabPage1.Name = "TabPage1" Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage1.Size = New System.Drawing.Size(493, 452) Me.TabPage1.Size = New System.Drawing.Size(493, 461)
Me.TabPage1.TabIndex = 0 Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = " Main" Me.TabPage1.Text = " Main"
Me.TabPage1.VerticalScrollbar = True Me.TabPage1.VerticalScrollbar = True
@ -1150,7 +1150,7 @@ Partial Class Einstellungen
Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
Me.TabControl1.Location = New System.Drawing.Point(22, 60) Me.TabControl1.Location = New System.Drawing.Point(22, 60)
Me.TabControl1.Name = "TabControl1" Me.TabControl1.Name = "TabControl1"
Me.TabControl1.SelectedIndex = 2 Me.TabControl1.SelectedIndex = 1
Me.TabControl1.Size = New System.Drawing.Size(501, 500) Me.TabControl1.Size = New System.Drawing.Size(501, 500)
Me.TabControl1.TabIndex = 38 Me.TabControl1.TabIndex = 38
Me.TabControl1.UseSelectable = True Me.TabControl1.UseSelectable = True
@ -1165,10 +1165,10 @@ Partial Class Einstellungen
Me.TabPage6.HorizontalScrollbarBarColor = True Me.TabPage6.HorizontalScrollbarBarColor = True
Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
Me.TabPage6.HorizontalScrollbarSize = 10 Me.TabPage6.HorizontalScrollbarSize = 10
Me.TabPage6.Location = New System.Drawing.Point(4, 44) Me.TabPage6.Location = New System.Drawing.Point(4, 35)
Me.TabPage6.Name = "TabPage6" Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3) Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
Me.TabPage6.Size = New System.Drawing.Size(493, 452) Me.TabPage6.Size = New System.Drawing.Size(493, 461)
Me.TabPage6.TabIndex = 4 Me.TabPage6.TabIndex = 4
Me.TabPage6.Text = "Funimation" Me.TabPage6.Text = "Funimation"
Me.TabPage6.VerticalScrollbarBarColor = True Me.TabPage6.VerticalScrollbarBarColor = True
@ -1336,9 +1336,9 @@ Partial Class Einstellungen
' '
Me.TabPage8.BackColor = System.Drawing.Color.Transparent Me.TabPage8.BackColor = System.Drawing.Color.Transparent
Me.TabPage8.Controls.Add(Me.GroupBox8) Me.TabPage8.Controls.Add(Me.GroupBox8)
Me.TabPage8.Location = New System.Drawing.Point(4, 44) Me.TabPage8.Location = New System.Drawing.Point(4, 35)
Me.TabPage8.Name = "TabPage8" Me.TabPage8.Name = "TabPage8"
Me.TabPage8.Size = New System.Drawing.Size(493, 452) Me.TabPage8.Size = New System.Drawing.Size(493, 461)
Me.TabPage8.TabIndex = 6 Me.TabPage8.TabIndex = 6
Me.TabPage8.Text = " AoD" Me.TabPage8.Text = " AoD"
' '
@ -1407,9 +1407,9 @@ Partial Class Einstellungen
Me.TabPage7.Controls.Add(Me.Label4) Me.TabPage7.Controls.Add(Me.Label4)
Me.TabPage7.Controls.Add(Me.Label6) Me.TabPage7.Controls.Add(Me.Label6)
Me.TabPage7.Controls.Add(Me.Label5) Me.TabPage7.Controls.Add(Me.Label5)
Me.TabPage7.Location = New System.Drawing.Point(4, 44) Me.TabPage7.Location = New System.Drawing.Point(4, 35)
Me.TabPage7.Name = "TabPage7" Me.TabPage7.Name = "TabPage7"
Me.TabPage7.Size = New System.Drawing.Size(493, 452) Me.TabPage7.Size = New System.Drawing.Size(493, 461)
Me.TabPage7.TabIndex = 5 Me.TabPage7.TabIndex = 5
Me.TabPage7.Text = "About " Me.TabPage7.Text = "About "
' '

View File

@ -126,9 +126,6 @@
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 20</value> <value>118, 20</value>
</metadata> </metadata>
<metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>118, 20</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>60</value> <value>60</value>
</metadata> </metadata>

View File

@ -581,12 +581,19 @@ Public Class Einstellungen
Else Else
AAuto.Checked = False AAuto.Checked = False
A360p.Checked = True
End If End If
End If End If
ElseIf HybridMode_CB.Checked = True Then
If AAuto.Checked = True Then
MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information)
AAuto.Checked = False
A1080p.Checked = True
End If
End If End If
End Sub End Sub
Private Sub MergeMP4_Click(sender As Object, e As EventArgs) Handles CheckBox1.Click Private Sub MergeMP4_Click(sender As Object, e As EventArgs) Handles MergeMP4.Click
If MergeMP4.Checked = True Then If MergeMP4.Checked = True Then
If AAuto.Checked = True Then If AAuto.Checked = True Then
If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then If MessageBox.Show("Resolution '[Auto]' and merge the subtitle with the video file will download all resolutions!" + vbNewLine + "Press 'Yes' to enable it anyway", "Prepare for unforeseen consequences.", MessageBoxButtons.YesNo) = DialogResult.Yes Then
@ -598,6 +605,15 @@ Public Class Einstellungen
End If End If
End Sub End Sub
Private Sub HybridMode_CB_Click(sender As Object, e As EventArgs) Handles HybridMode_CB.Click
If HybridMode_CB.Checked = True Then
If AAuto.Checked = True Then
MsgBox("Resolution '[Auto]' and 'Hybride Mode' does not work together", MsgBoxStyle.Information)
HybridMode_CB.Checked = False
End If
End If
End Sub
Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click Private Sub PictureBox5_Click(sender As Object, e As EventArgs) Handles PictureBox5.Click
If Main.SoftSubs.Count > 0 Then If Main.SoftSubs.Count > 0 Then
If CBool(InStr(TextBox2.Text, "crunchyroll.com")) Then If CBool(InStr(TextBox2.Text, "crunchyroll.com")) Then
@ -839,5 +855,13 @@ Public Class Einstellungen
#End Region #End Region
End Class End Class

View File

@ -418,6 +418,21 @@ setInterval(function loadXMLDoc() {
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary> </summary>
</member> </member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini_dark">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_mini_red">
<summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
</summary>
</member>
<member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_pause"> <member name="P:Crunchyroll_Downloader.My.Resources.Resources.main_pause">
<summary> <summary>
Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.