Skip to content
This repository has been archived by the owner on Jul 13, 2024. It is now read-only.

Commit

Permalink
fix musik/convert; added user button
Browse files Browse the repository at this point in the history
fix musik api stream deletion #987
added button for users #988
added test for account details and premium (probably #982)
  • Loading branch information
hama3254 committed Jun 17, 2024
1 parent 588fc58 commit 773ac24
Show file tree
Hide file tree
Showing 17 changed files with 360 additions and 198 deletions.
Binary file modified .vs/Crunchyroll Downloader/v17/.suo
Binary file not shown.
4 changes: 2 additions & 2 deletions Crunchyroll Downloader/CRD_List_Item.vb
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@ Public Class CRD_List_Item
'File.WriteAllText(logfile, HybrideLog)
WriteText(logfile, HybrideLog)
Catch ex As Exception
Error_msg.ShowErrorDia(ex.ToString, "Unable to write Hybrid Mode logfile", False)
Error_msg.ShowErrorDia(ex.ToString, "Unable to write Hybrid Mode logfile", "None")
'MsgBox(ex.ToString)
End Try
End If
Expand All @@ -1738,7 +1738,7 @@ Public Class CRD_List_Item

Catch ex As Exception
'MsgBox(ex.ToString)
Error_msg.ShowErrorDia(ex.ToString, "Unable to write logfile", False)
Error_msg.ShowErrorDia(ex.ToString, "Unable to write logfile", "None")

End Try

Expand Down
16 changes: 8 additions & 8 deletions Crunchyroll Downloader/Crunchyroll Downloader.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,11 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="GetData.vb" />
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="queue.Designer.vb">
<DependentUpon>queue.vb</DependentUpon>
</Compile>
Expand All @@ -182,11 +187,6 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="GlobalSuppressions.vb" />
<Compile Include="My Project\Resources.Designer.vb">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Anime_Add.Designer.vb">
<DependentUpon>Anime_Add.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -384,6 +384,9 @@
<Content Include="bin\x86\Debug\Lib\swiftshader\libEGL.dll" />
<Content Include="bin\x86\Debug\Lib\swiftshader\libGLESv2.dll" />
<Content Include="icon.ico" />
<None Include="Resources\main_login_invert_dark.png" />
<None Include="Resources\main_login_invert.png" />
<None Include="Resources\main_login.png" />
<None Include="Resources\error_dis.png" />
<None Include="Resources\BG.png" />
<None Include="Resources\ffmpeg_OK_cL.png" />
Expand All @@ -400,10 +403,8 @@
<None Include="Resources\main-mini.png" />
<None Include="Resources\main-setting_invert_dark.png" />
<None Include="Resources\main-close_dark.png" />
<None Include="Resources\main-browser_invert_dark.png" />
<None Include="Resources\main-add_invert_dark.png" />
<None Include="Resources\main-setting_invert.png" />
<None Include="Resources\main-browser_invert.png" />
<None Include="Resources\main-add_invert.png" />
<None Include="Resources\Main_top.png" />
<None Include="Resources\about_icon.png" />
Expand All @@ -418,7 +419,6 @@
<None Include="Resources\add_mass_cancel_hover.png" />
<None Include="Resources\add_mass_cancel.png" />
<None Include="Resources\main-settings.png" />
<None Include="Resources\main-browser.png" />
<None Include="Resources\main-add.png" />
<None Include="Resources\main-close.png" />
<None Include="Resources\main-background.png" />
Expand Down
95 changes: 57 additions & 38 deletions Crunchyroll Downloader/Error_msg.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 24 additions & 12 deletions Crunchyroll Downloader/Error_msg.vb
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,25 @@ Public Class Error_msg
End Try

Me.Location = New Point(CInt(Main.Location.X + Main.Width / 2 - Me.Width / 2), CInt(Main.Location.Y + Main.Height / 2 - Me.Height / 2))

ErrorText.TextAlign = HorizontalAlignment.Center
End Sub

Public Sub ShowErrorDia(ByVal Details As String, ShortError As String, Optional ByVal IgnoreOption As Boolean = False)
Public Sub ShowErrorDia(ByVal Details As String, ShortError As String, Optional ByVal ThirdOption As String = "None")
Me.Show()
ErrorBox.Text = Details
ErrorLabel.Text = ShortError
If IgnoreOption = False Then
btn_ign.BackgroundImage = My.Resources.error_dis
btn_ign.Cursor = Cursors.No
btn_ign.Enabled = False
ErrorText.Text = ShortError

If ThirdOption = "None" Then
btn_option.BackgroundImage = My.Resources.error_dis
btn_option.Cursor = Cursors.No
btn_option.Enabled = False
ElseIf ThirdOption = "Ignore" Then
AddHandler btn_option.Click, AddressOf Ignore
ElseIf ThirdOption = "Help" Then
AddHandler btn_option.Click, AddressOf MoreInfo
btn_option.Text = "More Info"
End If

End Sub

Private Sub btn_ok_Click(sender As Object, e As EventArgs) Handles btn_ok.Click
Expand All @@ -83,16 +90,21 @@ Public Class Error_msg
Private Sub Btn_cl_MouseLeave(sender As Object, e As EventArgs) Handles btn_cl.MouseLeave
btn_cl.BackgroundImage = My.Resources.ffmpeg_OK_cL
End Sub
Private Sub Btn_ign_MouseEnter(sender As Object, e As EventArgs) Handles btn_ign.MouseEnter
btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
Private Sub Btn_ign_MouseEnter(sender As Object, e As EventArgs) Handles btn_option.MouseEnter
btn_option.BackgroundImage = My.Resources.ffmpeg_OK_cL_hover
End Sub

Private Sub Btn_ign_MouseLeave(sender As Object, e As EventArgs) Handles btn_ign.MouseLeave
btn_ign.BackgroundImage = My.Resources.ffmpeg_OK_cL
Private Sub Btn_ign_MouseLeave(sender As Object, e As EventArgs) Handles btn_option.MouseLeave
btn_option.BackgroundImage = My.Resources.ffmpeg_OK_cL
End Sub

Private Sub btn_ign_Click(sender As Object, e As EventArgs) Handles btn_ign.Click
Private Sub Ignore(sender As Object, e As EventArgs) 'Handles btn_ign.Click
Main.IgnoreErrorDia = True
Me.Close()
End Sub
Private Sub MoreInfo(sender As Object, e As EventArgs) 'Handles btn_ign.Click
Process.Start("https://github.com/hama3254/Crunchyroll-Downloader-v3.0/issues/929")
'Main.IgnoreErrorDia = True
'Me.Close()
End Sub
End Class
Loading

0 comments on commit 773ac24

Please sign in to comment.