Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

下载管理 -> 任务列表 #5812

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Plain Craft Launcher 2/FormMain.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -854,9 +854,9 @@ Public Class FormMain
''' </summary>
VersionSelect = 5
''' <summary>
''' 下载管理。这是一个副页面。
''' 任务列表。这是一个副页面。
''' </summary>
DownloadManager = 6
TaskList = 6
''' <summary>
''' 版本设置。这是一个副页面。
''' </summary>
Expand Down Expand Up @@ -909,8 +909,8 @@ Public Class FormMain
Select Case Stack.Page
Case PageType.VersionSelect
Return "版本选择"
Case PageType.DownloadManager
Return "下载管理"
Case PageType.TaskList
Return "任务列表"
Case PageType.VersionSetup
Return "版本设置 - " & If(PageVersionLeft.Version Is Nothing, "未知版本", PageVersionLeft.Version.Name)
Case PageType.CompDetail
Expand Down Expand Up @@ -1141,7 +1141,7 @@ Public Class FormMain
If FrmSelectLeft Is Nothing Then FrmSelectLeft = New PageSelectLeft
If FrmSelectRight Is Nothing Then FrmSelectRight = New PageSelectRight
PageChangeAnim(FrmSelectLeft, FrmSelectRight)
Case PageType.DownloadManager '下载管理
Case PageType.TaskList '任务列表
If FrmSpeedLeft Is Nothing Then FrmSpeedLeft = New PageSpeedLeft
If FrmSpeedRight Is Nothing Then FrmSpeedRight = New PageSpeedRight
PageChangeAnim(FrmSpeedLeft, FrmSpeedRight)
Expand Down Expand Up @@ -1317,10 +1317,10 @@ Public Class FormMain

'下载管理
Private Sub BtnExtraDownload_Click(sender As Object, e As EventArgs) Handles BtnExtraDownload.Click
PageChange(PageType.DownloadManager)
PageChange(PageType.TaskList)
End Sub
Private Function BtnExtraDownload_ShowCheck() As Boolean
Return HasDownloadingTask() AndAlso Not PageCurrent = PageType.DownloadManager
Return HasDownloadingTask() AndAlso Not PageCurrent = PageType.TaskList
End Function

'投降
Expand Down
10 changes: 5 additions & 5 deletions Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ Retry:
Loader.Start(Request.TargetVersionFolder)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskList))
Return Loader
End Function

Expand Down Expand Up @@ -479,7 +479,7 @@ Retry:
Loader.Start(Request.TargetVersionFolder)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskList))
Return Loader
End Function

Expand Down Expand Up @@ -561,7 +561,7 @@ Retry:
Loader.Start(Request.TargetVersionFolder)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskList))
Return Loader
End Function

Expand Down Expand Up @@ -699,7 +699,7 @@ Retry:
Loader.Start(Request.TargetVersionFolder)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskList))
Return Loader
End Function

Expand Down Expand Up @@ -784,7 +784,7 @@ Retry:
Loader.Start(Request.TargetVersionFolder)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskList))
Return Loader
End Function

Expand Down
6 changes: 3 additions & 3 deletions Plain Craft Launcher 2/Pages/PageSpeedLeft.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Public Class PageSpeedLeft
'定时器任务
Private ReadOnly RightCards As New Dictionary(Of String, MyCard)
Private Sub Watcher()
If Not FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then Exit Sub
If Not FrmMain.PageCurrent = FormMain.PageType.TaskList Then Exit Sub
Try

#Region "更新左边栏"
Expand Down Expand Up @@ -191,7 +191,7 @@ Public Class PageSpeedLeft
AddHandler Cancel.Click,
Sub(sender As MyIconButton, e As EventArgs)
AniDispose(sender, False)
AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then FrmMain.PageBack())
AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.TaskList Then FrmMain.PageBack())
RightCards.Remove(Loader.Name)
LoaderTaskbar.Remove(Loader)
Log($"[Taskbar] 关闭下载管理卡片:{Loader.Name},且移出任务列表")
Expand Down Expand Up @@ -228,7 +228,7 @@ Public Class PageSpeedLeft
''' 若没有任务,尝试返回主页。
''' </summary>
Private Sub TryReturnToHome()
If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then
If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.TaskList Then
FrmMain.PageBack()
End If
End Sub
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ Public Class PageVersionExport
Dim LoaderName As String = $"导出整合包:" & PackName
For Each OngoingLoader In LoaderTaskbar
If OngoingLoader.Name <> LoaderName Then Continue For
FrmMain.PageChange(FormMain.PageType.DownloadManager)
FrmMain.PageChange(FormMain.PageType.TaskList)
Return
Next

Expand Down Expand Up @@ -691,7 +691,7 @@ Public Class PageVersionExport
LoaderTaskbarAdd(MainLoader)
FrmMain.BtnExtraDownload.ShowRefresh()
FrmMain.BtnExtraDownload.Ribble()
FrmMain.PageChange(FormMain.PageType.DownloadManager)
FrmMain.PageChange(FormMain.PageType.TaskList)
End Sub

#End Region
Expand Down