From 414eb28867c4c468e11e9693c30f198ca2f40b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Sun, 12 Mar 2023 23:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/ToolBoxControl.xaml              | 47 +++++--------------
 AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs  | 19 ++++++++
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml b/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml
index 30eeab5..2aa1971 100644
--- a/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml
+++ b/AIStudio.Wpf.Mind/Controls/ToolBoxControl.xaml
@@ -13,6 +13,10 @@
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Mind;component/Styles/Button.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Mind;component/Styles/ToggleButton.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/AIStudio.Wpf.Mind;component/Controls/DropDownButton.xaml" />
+                <ResourceDictionary>
+                    <dd:ColorBrushConverter x:Key="ColorBrushConverter"/>
+                    <dd:EnumDescriptionConverter x:Key="EnumDescriptionConverter"/>
+                </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -339,38 +343,11 @@
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <controls:DropDownButton>
-                        <controls:DropDownButton.Style>
-                            <Style TargetType="{x:Type controls:DropDownButton}" BasedOn="{StaticResource AIStudio.Styles.DropDownButton}">
-                                <Setter Property="Content">
-                                    <Setter.Value>
-                                        <Path Margin="5" Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M900 1050C982.85 1050 1050 982.85 1050 900S982.85 750 900 750H750C684.6999999999999 750 629.15 791.7 608.55 850H550C495 850 450 805 450 750V741.45C508.3 720.8499999999999 550 665.3000000000001 550 600C550 534.6999999999999 508.3 479.15 450 458.55V450C450 394.9999999999999 495 350 550 350H608.5C629.1 408.25 684.6999999999999 450 750 450H900C982.85 450 1050 382.85 1050 300S982.85 150 900 150H750C684.6999999999999 150 629.15 191.6999999999999 608.55 250H550C439.5 250 350 339.5 350 450H250C167.15 450 100 517.15 100 600S167.15 750 250 750H350C350 860.5 439.5 950 550 950H608.5C629.1 1008.25 684.6999999999999 1050 750 1050H900zM900 350H750C722.4 350 700 327.6 700 300S722.4 250 750 250H900C927.6 250 950 272.4 950 300S927.6 350 900 350zM400 650H250C222.4 650 200 627.6 200 600S222.4 550 250 550H400C427.6 550 450 572.4 450 600S427.6 650 400 650zM900 950H750C722.4 950 700 927.6 700 900S722.4 850 750 850H900C927.6 850 950 872.4000000000001 950 900S927.6 950 900 950z"></Path>
-                                    </Setter.Value>
-                                </Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding MindType}" Value="Mind">
-                                        <Setter Property="Content">
-                                            <Setter.Value>
-                                                <Path Margin="5" Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M900 1050C982.85 1050 1050 982.85 1050 900S982.85 750 900 750H750C684.6999999999999 750 629.15 791.7 608.55 850H550C495 850 450 805 450 750V741.45C508.3 720.8499999999999 550 665.3000000000001 550 600C550 534.6999999999999 508.3 479.15 450 458.55V450C450 394.9999999999999 495 350 550 350H608.5C629.1 408.25 684.6999999999999 450 750 450H900C982.85 450 1050 382.85 1050 300S982.85 150 900 150H750C684.6999999999999 150 629.15 191.6999999999999 608.55 250H550C439.5 250 350 339.5 350 450H250C167.15 450 100 517.15 100 600S167.15 750 250 750H350C350 860.5 439.5 950 550 950H608.5C629.1 1008.25 684.6999999999999 1050 750 1050H900zM900 350H750C722.4 350 700 327.6 700 300S722.4 250 750 250H900C927.6 250 950 272.4 950 300S927.6 350 900 350zM400 650H250C222.4 650 200 627.6 200 600S222.4 550 250 550H400C427.6 550 450 572.4 450 600S427.6 650 400 650zM900 950H750C722.4 950 700 927.6 700 900S722.4 850 750 850H900C927.6 850 950 872.4000000000001 950 900S927.6 950 900 950z"></Path>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding MindType}" Value="Directory">
-                                        <Setter Property="Content">
-                                            <Setter.Value>
-                                                <Path Margin="5" Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M1024 320v256h-704v-64h-128v192h576v256h-768v-256h128v-640h192v-128h704v256h-704v-64h-128v320h128v-128z"></Path>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding MindType}" Value="Organizational">
-                                        <Setter Property="Content">
-                                            <Setter.Value>
-                                                <Path Margin="5" Width="18" Height="18" Stretch="Uniform" Fill="Black" Data="M928 192v288h-384v224h96v256h-256v-256h96v-224h-384v-288h-96v-256h256v256h-96v224h320v-224h-96v-256h256v256h-96v224h320v-224h-96v-256h256v256z"></Path>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </controls:DropDownButton.Style>
+                        <controls:DropDownButton.Content>
+                            <Border CornerRadius="3">
+                                <TextBlock Margin="5" Width="60" TextAlignment="Center" Text="{Binding MindType,Converter={StaticResource EnumDescriptionConverter}}"></TextBlock>
+                            </Border>
+                        </controls:DropDownButton.Content>
                         <controls:DropDownButton.Items>
                             <MenuItem Header="思维导图" IsCheckable="True" IsChecked="{Binding MindType,Converter={dd:ConverterValueMapToBool Parameter='Mind'}, ConverterParameter='Mind'}" />
                             <MenuItem Header="目录组织图" IsCheckable="True" IsChecked="{Binding MindType,Converter={dd:ConverterValueMapToBool Parameter='Directory'}, ConverterParameter='Directory'}" />
@@ -383,9 +360,9 @@
                     <Line  Grid.Column="1" X1="0" Y1="0" X2="0" Y2="100" StrokeDashArray="1" Stroke="Gray"  StrokeThickness="1"></Line>
                     <controls:DropDownButton Grid.Column="2">
                         <controls:DropDownButton.Content>
-                            <StackPanel>
-                                <TextBlock>主题</TextBlock>
-                            </StackPanel>
+                            <Border Background="{Binding MindThemeModel.MindThemeLevel1.FillColor,Converter={StaticResource ColorBrushConverter}}" CornerRadius="3">
+                                <TextBlock Margin="5" Text="{Binding MindThemeModel.Name}"></TextBlock>
+                            </Border>
                         </controls:DropDownButton.Content>
                         <controls:DropDownButton.ItemsPanel>
                             <ItemsPanelTemplate>
diff --git a/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs b/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs
index 820f647..9ded7ea 100644
--- a/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs
+++ b/AIStudio.Wpf.Mind/Helpers/MindThemeHelper.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
+using System.Xml.Linq;
 using AIStudio.Wpf.DiagramDesigner.Geometrys;
 using AIStudio.Wpf.Mind.ViewModels;
 
@@ -37,6 +38,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "天空蓝",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -70,6 +72,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑蓝",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -103,6 +106,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "文艺绿",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -136,6 +140,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑绿",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -169,6 +174,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "脑残粉",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -202,6 +208,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑粉",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -235,6 +242,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "浪漫紫",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -268,6 +276,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑紫",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -301,6 +310,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "清新红",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -334,6 +344,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑红",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -367,6 +378,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "泥土黄",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -400,6 +412,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑黄",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -433,6 +446,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "冷光黄",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -466,6 +480,7 @@ namespace AIStudio.Wpf.Mind.Helpers
         {
             return new MindThemeModel()
             {
+                Name = "紧凑黄",
                 MindThemeLevel1 = new MindTheme()
                 {
                     ItemWidth = 110,
@@ -567,6 +582,10 @@ namespace AIStudio.Wpf.Mind.Helpers
 
     public class MindThemeModel
     {
+        public string Name
+        {
+            get; set;
+        }
         public MindTheme MindThemeLevel1
         {
             get; set;