From aacaf792ef4f1baaad560f6437c1a85296c97e89 Mon Sep 17 00:00:00 2001
From: youzi-2333 <youzi5201086@163.com>
Date: Mon, 15 Jul 2024 22:29:29 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/PageVersion/PageVersionExport.xaml  |  4 +-
 .../PageVersion/PageVersionExport.xaml.vb     | 42 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml
index b9210f1..0d6a627 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml	
@@ -33,10 +33,10 @@
                         <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="整合包名称" Margin="0,0,25,0" />
                         <local:MyTextBox Grid.Row="0" x:Name="TbExportName" Grid.ColumnSpan="2" Tag="VersionArgumentTitle" Grid.Column="1" MaxLength="100" />
                         <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Text="图标" Margin="0,0,25,0"  />
-                        <local:MyComboBox x:Name="ItemDisplayLogoCustom" Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="1">
+                        <local:MyComboBox x:Name="ComboDisplayLogo" Grid.Row="2" Grid.ColumnSpan="2" Grid.Column="1">
                             <local:MyComboBoxItem Content="自动" IsSelected="True" Tag="" />
                             <!-- 此处需要添加一个自定义图标 -->
-                            <local:MyComboBoxItem Content="自定义..." />
+                            <local:MyComboBoxItem x:Name="ItemDisplayLogoCustom" Content="自定义..." />
                             <local:MyComboBoxItem Content="圆石" Tag="pack://application:,,,/images/Blocks/CobbleStone.png" />
                             <local:MyComboBoxItem Content="命令方块" Tag="pack://application:,,,/images/Blocks/CommandBlock.png" />
                             <local:MyComboBoxItem Content="金块" Tag="pack://application:,,,/images/Blocks/GoldBlock.png" />
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb
index 1ef3932..213debc 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
@@ -1,4 +1,6 @@
-Public Class PageVersionExport
+Imports System.Runtime.CompilerServices
+
+Public Class PageVersionExport
     Private Sub PageVersionExport_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
         TbExportName.HintText = PageVersionLeft.Version.Name
         Reload()
@@ -6,10 +8,18 @@
 
     Public ItemVersion As MyListItem
     Public Sub Reload()
+        AniControlEnabled += 1
+
         PanDisplayItem.Children.Clear()
-        ItemVersion = PageSelectRight.McVersionListItem(PageVersionLeft.Version)
+        ItemVersion = PageSelectRight.McVersionListItem(PageVersionLeft.Version.Load())
         ItemVersion.IsHitTestVisible = False
+        If Not String.IsNullOrEmpty(CustomLogo) Then
+            ItemVersion.Logo = CustomLogo
+        End If
         PanDisplayItem.Children.Add(ItemVersion)
+        ItemVersion.Title = If(String.IsNullOrWhiteSpace(TbExportName.Text), PageVersionLeft.Version.Name, TbExportName.Text)
+
+        AniControlEnabled -= 1
     End Sub
 
     Private Type As ModpackType = ModpackType.Modrinth
@@ -27,6 +37,34 @@
     Private Sub TbExportName_TextChanged(sender As MyTextBox, e As TextChangedEventArgs) Handles TbExportName.TextChanged
         ItemVersion.Title = If(String.IsNullOrWhiteSpace(sender.Text), PageVersionLeft.Version.Name, sender.Text)
     End Sub
+
+    Private CustomLogoVal As String
+    ''' <summary>
+    ''' 自定义 Logo 的路径。
+    ''' </summary>
+    Public Property CustomLogo() As String
+        Get
+            Return CustomLogoVal
+        End Get
+        Set(value As String)
+            If AniControlEnabled <> 0 Then Exit Property
+            CustomLogoVal = value
+            ItemVersion.Logo = value
+            Reload()
+        End Set
+    End Property
+
+    Private Sub ComboDisplayLogo_SelectionChanged(sender As MyComboBox, e As SelectionChangedEventArgs) Handles ComboDisplayLogo.SelectionChanged
+        If Not AniControlEnabled = 0 Then Exit Sub
+        '选择 自定义 时修改图片
+        If ComboDisplayLogo.SelectedItem Is ItemDisplayLogoCustom Then
+            Dim FileName As String = SelectFile("常用图片文件(*.png;*.jpg;*.gif)|*.png;*.jpg;*.gif", "选择图片")
+            If String.IsNullOrWhiteSpace(FileName) Then Exit Sub
+            CustomLogo = FileName
+        Else
+            CustomLogo = sender.SelectedItem.Tag
+        End If
+    End Sub
 #End Region
 
 #Region "导出"