From 88be968866c7ae4041838fd9bd2cde373762303b Mon Sep 17 00:00:00 2001 From: CreeperIsASpy <162774918+CreeperIsASpy@users.noreply.github.com> Date: Tue, 29 Apr 2025 21:36:19 +0800 Subject: [PATCH 1/3] fix #6222 --- .../Pages/PageSetup/ModSetup.vb | 37 ------------------ .../Pages/PageSetup/PageSetupUI.xaml.vb | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index 6c4440f..949ff5d 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -585,43 +585,6 @@ End Select End Sub - '主页 - Public Sub UiCustomType(Value As Integer) - If FrmSetupUI Is Nothing Then Exit Sub - Select Case Value - Case 0 '无 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed - Case 1 '本地 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Visible - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Visible - FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) - FrmSetupUI.HintCustom.Text = $"从 PCL 文件夹下的 Custom.xaml 读取主页内容。{vbCrLf}你可以手动编辑该文件，向主页添加文本、图片、常用网站、快捷启动等功能。" - FrmSetupUI.HintCustom.EventType = "" - FrmSetupUI.HintCustom.EventData = "" - Case 2 '联网 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Visible - FrmSetupUI.HintCustom.Visibility = Visibility.Visible - FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) - FrmSetupUI.HintCustom.Text = $"从指定网址联网获取主页内容。服主也可以用于动态更新服务器公告。{vbCrLf}如果你制作了稳定运行的联网主页，可以点击这条提示投稿，若合格即可加入预设！" - FrmSetupUI.HintCustom.EventType = "打开网页" - FrmSetupUI.HintCustom.EventData = "https://github.com/Hex-Dragon/PCL2/discussions/2528" - Case 3 '预设 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Visible - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed - End Select - FrmSetupUI.CardCustom.TriggerForceResize() - End Sub '顶部栏 Public Sub UiLogoType(Value As Integer) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb index 9798b6d..f42c80d 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb @@ -185,6 +185,7 @@ End Sub Private Shared Sub RadioBoxChange(sender As MyRadioBox, e As Object) Handles RadioLogoType0.Check, RadioLogoType1.Check, RadioLogoType2.Check, RadioLogoType3.Check, RadioLauncherTheme0.Check, RadioLauncherTheme1.Check, RadioLauncherTheme2.Check, RadioLauncherTheme3.Check, RadioLauncherTheme4.Check, RadioLauncherTheme5.Check, RadioLauncherTheme6.Check, RadioLauncherTheme7.Check, RadioLauncherTheme8.Check, RadioLauncherTheme9.Check, RadioLauncherTheme10.Check, RadioLauncherTheme11.Check, RadioLauncherTheme12.Check, RadioLauncherTheme13.Check, RadioLauncherTheme14.Check, RadioCustomType0.Check, RadioCustomType1.Check, RadioCustomType2.Check, RadioCustomType3.Check If AniControlEnabled = 0 Then Setup.Set(sender.Tag.ToString.Split("/")(0), Val(sender.Tag.ToString.Split("/")(1))) + UiCustomType(Setup.Get("UiCustomType")) End Sub '背景图片 @@ -425,6 +426,44 @@ Refresh: "直接将主页文件拖进 PCL 窗口也可以快捷加载。", "主页自定义教程") End Sub + '主页卡片的实际处理 + Public Shared Sub UiCustomType(Value As Integer) + If FrmSetupUI Is Nothing Then Exit Sub + Select Case Value + Case 0 '无 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed + Case 1 '本地 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Visible + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Visible + FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) + FrmSetupUI.HintCustom.Text = $"从 PCL 文件夹下的 Custom.xaml 读取主页内容。{vbCrLf}你可以手动编辑该文件，向主页添加文本、图片、常用网站、快捷启动等功能。" + FrmSetupUI.HintCustom.EventType = "" + FrmSetupUI.HintCustom.EventData = "" + Case 2 '联网 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Visible + FrmSetupUI.HintCustom.Visibility = Visibility.Visible + FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) + FrmSetupUI.HintCustom.Text = $"从指定网址联网获取主页内容。服主也可以用于动态更新服务器公告。{vbCrLf}如果你制作了稳定运行的联网主页，可以点击这条提示投稿，若合格即可加入预设！" + FrmSetupUI.HintCustom.EventType = "打开网页" + FrmSetupUI.HintCustom.EventData = "https://github.com/Hex-Dragon/PCL2/discussions/2528" + Case 3 '预设 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Visible + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed + End Select + FrmSetupUI.CardCustom.TriggerForceResize() + End Sub + '主题 Private Sub LabLauncherTheme5Unlock_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles LabLauncherTheme5Unlock.MouseLeftButtonUp RadioLauncherTheme5Gray.Opacity -= 0.23 From 825334cb9db135b6c1d56136fc01911dbc3f404e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 3 May 2025 14:10:30 +0800 Subject: [PATCH 2/3] Revert(88be968866c7ae4041838fd9bd2cde373762303b): fix Hex-Dragon#6222 --- .../Pages/PageSetup/ModSetup.vb | 37 ++++++++++++++++++ .../Pages/PageSetup/PageSetupUI.xaml.vb | 39 ------------------- 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index 949ff5d..6c4440f 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -585,6 +585,43 @@ End Select End Sub + '主页 + Public Sub UiCustomType(Value As Integer) + If FrmSetupUI Is Nothing Then Exit Sub + Select Case Value + Case 0 '无 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed + Case 1 '本地 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Visible + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Visible + FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) + FrmSetupUI.HintCustom.Text = $"从 PCL 文件夹下的 Custom.xaml 读取主页内容。{vbCrLf}你可以手动编辑该文件，向主页添加文本、图片、常用网站、快捷启动等功能。" + FrmSetupUI.HintCustom.EventType = "" + FrmSetupUI.HintCustom.EventData = "" + Case 2 '联网 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Visible + FrmSetupUI.HintCustom.Visibility = Visibility.Visible + FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) + FrmSetupUI.HintCustom.Text = $"从指定网址联网获取主页内容。服主也可以用于动态更新服务器公告。{vbCrLf}如果你制作了稳定运行的联网主页，可以点击这条提示投稿，若合格即可加入预设！" + FrmSetupUI.HintCustom.EventType = "打开网页" + FrmSetupUI.HintCustom.EventData = "https://github.com/Hex-Dragon/PCL2/discussions/2528" + Case 3 '预设 + FrmSetupUI.PanCustomPreset.Visibility = Visibility.Visible + FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed + FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed + FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed + End Select + FrmSetupUI.CardCustom.TriggerForceResize() + End Sub '顶部栏 Public Sub UiLogoType(Value As Integer) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb index f42c80d..9798b6d 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb @@ -185,7 +185,6 @@ End Sub Private Shared Sub RadioBoxChange(sender As MyRadioBox, e As Object) Handles RadioLogoType0.Check, RadioLogoType1.Check, RadioLogoType2.Check, RadioLogoType3.Check, RadioLauncherTheme0.Check, RadioLauncherTheme1.Check, RadioLauncherTheme2.Check, RadioLauncherTheme3.Check, RadioLauncherTheme4.Check, RadioLauncherTheme5.Check, RadioLauncherTheme6.Check, RadioLauncherTheme7.Check, RadioLauncherTheme8.Check, RadioLauncherTheme9.Check, RadioLauncherTheme10.Check, RadioLauncherTheme11.Check, RadioLauncherTheme12.Check, RadioLauncherTheme13.Check, RadioLauncherTheme14.Check, RadioCustomType0.Check, RadioCustomType1.Check, RadioCustomType2.Check, RadioCustomType3.Check If AniControlEnabled = 0 Then Setup.Set(sender.Tag.ToString.Split("/")(0), Val(sender.Tag.ToString.Split("/")(1))) - UiCustomType(Setup.Get("UiCustomType")) End Sub '背景图片 @@ -426,44 +425,6 @@ Refresh: "直接将主页文件拖进 PCL 窗口也可以快捷加载。", "主页自定义教程") End Sub - '主页卡片的实际处理 - Public Shared Sub UiCustomType(Value As Integer) - If FrmSetupUI Is Nothing Then Exit Sub - Select Case Value - Case 0 '无 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed - Case 1 '本地 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Visible - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Visible - FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) - FrmSetupUI.HintCustom.Text = $"从 PCL 文件夹下的 Custom.xaml 读取主页内容。{vbCrLf}你可以手动编辑该文件，向主页添加文本、图片、常用网站、快捷启动等功能。" - FrmSetupUI.HintCustom.EventType = "" - FrmSetupUI.HintCustom.EventData = "" - Case 2 '联网 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Visible - FrmSetupUI.HintCustom.Visibility = Visibility.Visible - FrmSetupUI.HintCustomWarn.Visibility = If(Setup.Get("HintCustomWarn"), Visibility.Collapsed, Visibility.Visible) - FrmSetupUI.HintCustom.Text = $"从指定网址联网获取主页内容。服主也可以用于动态更新服务器公告。{vbCrLf}如果你制作了稳定运行的联网主页，可以点击这条提示投稿，若合格即可加入预设！" - FrmSetupUI.HintCustom.EventType = "打开网页" - FrmSetupUI.HintCustom.EventData = "https://github.com/Hex-Dragon/PCL2/discussions/2528" - Case 3 '预设 - FrmSetupUI.PanCustomPreset.Visibility = Visibility.Visible - FrmSetupUI.PanCustomLocal.Visibility = Visibility.Collapsed - FrmSetupUI.PanCustomNet.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustom.Visibility = Visibility.Collapsed - FrmSetupUI.HintCustomWarn.Visibility = Visibility.Collapsed - End Select - FrmSetupUI.CardCustom.TriggerForceResize() - End Sub - '主题 Private Sub LabLauncherTheme5Unlock_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles LabLauncherTheme5Unlock.MouseLeftButtonUp RadioLauncherTheme5Gray.Opacity -= 0.23 From 85bd89fbc0bd82074749ba06ca6b5f83eb6a6fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 3 May 2025 14:13:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(PageSetupUI):=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BA=86=E5=86=85=E5=AE=B9=E8=A7=81=20ModSet?= =?UTF-8?q?up=20=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb index 9798b6d..5e3cbe1 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb @@ -89,7 +89,7 @@ Catch Setup.Reset("UiCustomPreset") End Try - CType(FindName("RadioCustomType" & Setup.Load("UiCustomType")), MyRadioBox).Checked = True + CType(FindName("RadioCustomType" & Setup.Load("UiCustomType",ForceReload:=True)), MyRadioBox).Checked = True TextCustomNet.Text = Setup.Get("UiCustomNet") '功能隐藏