From a379fcc04d1146359813faf03eb6e768c11377de Mon Sep 17 00:00:00 2001
From: Chuong Ho <chuongpqvn@gmail.com>
Date: Wed, 24 May 2023 15:00:42 +0800
Subject: [PATCH] improve user interface

---
 AddInManager.sln                          | 40 ++++++------
 CadAddinManager/CadAddinManager.csproj    | 14 ++++-
 CadAddinManager/PackageContents.xml       |  2 +-
 CadAddinManager/View/FrmAddInManager.xaml | 75 +++++++++++------------
 4 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/AddInManager.sln b/AddInManager.sln
index 17769b2..6ee595e 100644
--- a/AddInManager.sln
+++ b/AddInManager.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CadAddinManager", "CadAddinManager\CadAddinManager.csproj", "{E05305A7-28E1-4658-B505-E035FEDDD266}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestVB", "TestVB\TestVB.vbproj", "{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "TestVB", "TestVB\TestVB.vbproj", "{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,45 +28,47 @@ Global
 		Release A23|Any CPU = Release A23|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.ActiveCfg = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.Build.0 = Release|Any CPU
 		{E3C87D34-638C-47A0-A73A-D967B119458D}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
-		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
+		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Installer|Any CPU.ActiveCfg = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Installer|Any CPU.Build.0 = Release|Any CPU
 		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
-		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
-		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
-		{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.ActiveCfg = Debug A21|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.Build.0 = Debug A21|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
+		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
 		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.ActiveCfg = Debug A21|Any CPU
-		{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.Build.0 = Debug A21|Any CPU
+		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.ActiveCfg = Debug A22|Any CPU
+		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.Build.0 = Debug A22|Any CPU
+		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
+		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
 		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
 		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
 		{E05305A7-28E1-4658-B505-E035FEDDD266}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
 		{E05305A7-28E1-4658-B505-E035FEDDD266}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
 		{E05305A7-28E1-4658-B505-E035FEDDD266}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
-		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
-		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
-		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.ActiveCfg = Debug A22|Any CPU
-		{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.Build.0 = Debug A22|Any CPU
+		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.ActiveCfg = Debug A23|Any CPU
+		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.Build.0 = Debug A23|Any CPU
+		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A22|Any CPU.ActiveCfg = Debug A23|Any CPU
+		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A22|Any CPU.Build.0 = Debug A23|Any CPU
 		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A23|Any CPU.ActiveCfg = Release A23|Any CPU
 		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A23|Any CPU.Build.0 = Release A23|Any CPU
 		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
 		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
 		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
-		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.ActiveCfg = Debug A23|Any CPU
-		{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.Build.0 = Debug A23|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CadAddinManager/CadAddinManager.csproj b/CadAddinManager/CadAddinManager.csproj
index c3dfef8..dadf855 100644
--- a/CadAddinManager/CadAddinManager.csproj
+++ b/CadAddinManager/CadAddinManager.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>true</ImplicitUsings>
     <UseWindowsForms>false</UseWindowsForms>
     <TargetFramework>net48</TargetFramework>
-    <Configurations>Debug A22;Debug A23;Debug A24</Configurations>
+    <Configurations>Debug A21;Debug A22;Debug A23;Debug A24</Configurations>
     <Configurations>$(Configurations);Release A22;Release A23;Release A24</Configurations>
     <RootNamespace>CadAddinManager</RootNamespace>
   </PropertyGroup>
@@ -20,10 +20,22 @@
     <DebugType>none</DebugType>
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration.Contains('A21'))">
+    <CADVersion>2021</CADVersion>
+    <DefineConstants>$(DefineConstants);A21</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration.Contains('A22'))">
+    <CADVersion>2022</CADVersion>
+    <DefineConstants>$(DefineConstants);A22</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="$(Configuration.Contains('A23'))">
     <CADVersion>2023</CADVersion>
     <DefineConstants>$(DefineConstants);A23</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition="$(Configuration.Contains('A24'))">
+    <CADVersion>2024</CADVersion>
+    <DefineConstants>$(DefineConstants);A24</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup>
     <Version>$(CADVersion)</Version>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
diff --git a/CadAddinManager/PackageContents.xml b/CadAddinManager/PackageContents.xml
index 1039723..11f35ff 100644
--- a/CadAddinManager/PackageContents.xml
+++ b/CadAddinManager/PackageContents.xml
@@ -4,7 +4,7 @@
                     ProductType="Application"
                     Name="CadAddinManager">
   <RuntimeRequirements SeriesMin="15.0"
-                       SeriesMax="25.0"
+                       SeriesMax="26.0"
                     Platform="AutoCAD|AutoCAD*"
                     OS="Win32|Win64" />
   <Components>
diff --git a/CadAddinManager/View/FrmAddInManager.xaml b/CadAddinManager/View/FrmAddInManager.xaml
index e8e883f..225c2c9 100644
--- a/CadAddinManager/View/FrmAddInManager.xaml
+++ b/CadAddinManager/View/FrmAddInManager.xaml
@@ -2,9 +2,9 @@
     x:Class="CadAddinManager.View.FrmAddInManager"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:control="clr-namespace:CadAddinManager.View.Control"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:control="clr-namespace:CadAddinManager.View.Control"
     xmlns:viewModel="clr-namespace:CadAddinManager.ViewModel"
     Title="CAD Add In Manager"
     Width="400"
@@ -13,16 +13,15 @@
     MinHeight="400"
     d:DataContext="{d:DesignInstance viewModel:AddInManagerViewModel}"
     FocusManager.FocusedElement="{x:Reference tbxSearch}"
-    PreviewKeyDown="CloseFormEvent"
     Icon="../Resources/dev.ico"
+    PreviewKeyDown="CloseFormEvent"
     mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <!--  Load this specific theme because the Aero theme for CheckBox has issues.  -->
             <ResourceDictionary.MergedDictionaries>
                 <!--<ResourceDictionary Source="/PresentationFramework.Luna;component/themes/Luna.NormalColor.xaml" />-->
-                <ResourceDictionary
-                    Source="/PresentationFramework.Royale;V3.0.0.0;31bf3856ad364e35;component\themes\royale.normalcolor.xaml" />
+                <ResourceDictionary Source="/PresentationFramework.Royale;V3.0.0.0;31bf3856ad364e35;component\themes\royale.normalcolor.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Window.Resources>
@@ -46,25 +45,38 @@
             <TextBox
                 x:Name="tbxSearch"
                 Grid.Row="0"
-                Margin="5,0,5,0"
+                Height="25"
+                Margin="1,0,5,0"
                 VerticalAlignment="Center"
-                Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                PreviewKeyDown="HandleTextboxKeyPress">
+                PreviewKeyDown="HandleTextboxKeyPress"
+                Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <TextBox.Resources>
                     <VisualBrush
                         x:Key="tbxText"
                         AlignmentX="Left"
+                        AlignmentY="Center"
                         Stretch="None"
                         TileMode="None">
                         <VisualBrush.Visual>
-                            <TextBlock Foreground="DimGray" Text="Search..." />
+                            <Grid Background="Transparent">
+                                <TextBlock
+                                    Margin="5,0"
+                                    Foreground="DimGray"
+                                    Text="Search..." />
+                            </Grid>
                         </VisualBrush.Visual>
                     </VisualBrush>
+                    <Style TargetType="{x:Type Border}">
+                        <Setter Property="CornerRadius" Value="3" />
+                    </Style>
                 </TextBox.Resources>
                 <TextBox.Style>
                     <Style TargetType="TextBox">
-                        <Setter Property="BorderBrush" Value="AliceBlue" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="BorderBrush" Value="#FFAFAFAF" />
+                        <Setter Property="BorderThickness" Value="0.5" />
                         <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Margin" Value="5,5,0,5" />
                         <Style.Triggers>
                             <Trigger Property="Text" Value="">
                                 <Setter Property="Background" Value="{StaticResource tbxText}" />
@@ -86,15 +98,14 @@
         </Grid>
 
         <Grid Grid.Row="1">
-            <TabControl x:Name="TabControl"
-                        SelectedIndex="{Binding SelectedTab, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <TabControl x:Name="TabControl" SelectedIndex="{Binding SelectedTab, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <TabItem
                     x:Name="TabCommand"
                     FontSize="14"
                     Foreground="SteelBlue"
                     Header="Command"
-                    PreviewKeyDown="HandleTreeViewCommandKeyPress"
-                    IsSelected="{Binding IsTabCmdSelected}">
+                    IsSelected="{Binding IsTabCmdSelected}"
+                    PreviewKeyDown="HandleTreeViewCommandKeyPress">
                     <control:ExtendedTreeView
                         x:Name="TreeViewCommand"
                         FontSize="12"
@@ -111,8 +122,7 @@
                             </ContextMenu>
                         </TreeView.ContextMenu>
                         <TreeView.ItemTemplate>
-                            <HierarchicalDataTemplate DataType="viewModel:AddinModel"
-                                                      ItemsSource="{Binding Children, Mode=OneTime}">
+                            <HierarchicalDataTemplate DataType="viewModel:AddinModel" ItemsSource="{Binding Children, Mode=OneTime}">
                                 <StackPanel Orientation="Horizontal">
                                     <CheckBox
                                         VerticalAlignment="Center"
@@ -130,19 +140,15 @@
                                 <Setter Property="control:VirtualToggleButton.IsVirtualToggleButton" Value="True" />
                                 <Setter Property="control:VirtualToggleButton.IsChecked" Value="{Binding IsChecked}" />
                                 <Setter Property="control:MouseDoubleClick.CommandParameter" Value="{Binding}" />
-                                <Setter Property="control:MouseDoubleClick.Command"
-                                        Value="{Binding Path=DataContext.ExecuteAddinCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
-                                <Setter Property="control:ExtendedTreeView.ContextMenuOpened"
-                                        Value="{Binding ContextMenu.IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
+                                <Setter Property="control:MouseDoubleClick.Command" Value="{Binding Path=DataContext.ExecuteAddinCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
+                                <Setter Property="control:ExtendedTreeView.ContextMenuOpened" Value="{Binding ContextMenu.IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
                                 <Style.Triggers>
                                     <MultiTrigger>
                                         <MultiTrigger.Conditions>
                                             <Condition Property="IsSelected" Value="true" />
-                                            <Condition Property="control:ExtendedTreeView.ContextMenuOpened"
-                                                       Value="true" />
+                                            <Condition Property="control:ExtendedTreeView.ContextMenuOpened" Value="true" />
                                         </MultiTrigger.Conditions>
-                                        <Setter Property="Background"
-                                                Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                         <Setter Property="Foreground" Value="Red" />
                                     </MultiTrigger>
                                 </Style.Triggers>
@@ -155,8 +161,8 @@
                     FontSize="14"
                     Foreground="SteelBlue"
                     Header="Lisp Function"
-                    PreviewKeyDown="HandleTreeViewLispKeyPress"
-                    IsSelected="{Binding IsTabLispSelected}">
+                    IsSelected="{Binding IsTabLispSelected}"
+                    PreviewKeyDown="HandleTreeViewLispKeyPress">
                     <control:ExtendedTreeView
                         x:Name="TreeViewLispFunction"
                         FontSize="12"
@@ -172,8 +178,7 @@
                             </ContextMenu>
                         </TreeView.ContextMenu>
                         <TreeView.ItemTemplate>
-                            <HierarchicalDataTemplate DataType="viewModel:AddinModel"
-                                                      ItemsSource="{Binding Children, Mode=OneTime}">
+                            <HierarchicalDataTemplate DataType="viewModel:AddinModel" ItemsSource="{Binding Children, Mode=OneTime}">
                                 <StackPanel Orientation="Horizontal">
                                     <CheckBox
                                         VerticalAlignment="Center"
@@ -191,19 +196,15 @@
                                 <Setter Property="control:VirtualToggleButton.IsVirtualToggleButton" Value="True" />
                                 <Setter Property="control:VirtualToggleButton.IsChecked" Value="{Binding IsChecked}" />
                                 <Setter Property="control:MouseDoubleClick.CommandParameter" Value="{Binding}" />
-                                <Setter Property="control:MouseDoubleClick.Command"
-                                        Value="{Binding Path=DataContext.ExecuteAddinCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
-                                <Setter Property="control:ExtendedTreeView.ContextMenuOpened"
-                                        Value="{Binding ContextMenu.IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
+                                <Setter Property="control:MouseDoubleClick.Command" Value="{Binding Path=DataContext.ExecuteAddinCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
+                                <Setter Property="control:ExtendedTreeView.ContextMenuOpened" Value="{Binding ContextMenu.IsOpen, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TreeView}}}" />
                                 <Style.Triggers>
                                     <MultiTrigger>
                                         <MultiTrigger.Conditions>
                                             <Condition Property="IsSelected" Value="true" />
-                                            <Condition Property="control:ExtendedTreeView.ContextMenuOpened"
-                                                       Value="true" />
+                                            <Condition Property="control:ExtendedTreeView.ContextMenuOpened" Value="true" />
                                         </MultiTrigger.Conditions>
-                                        <Setter Property="Background"
-                                                Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
                                         <Setter Property="Foreground" Value="Red" />
                                     </MultiTrigger>
                                 </Style.Triggers>
@@ -216,9 +217,7 @@
                     Header="Listener"
                     IsSelected="{Binding IsTabLogSelected}"
                     ToolTip="Support Listen Event Trace, Debug,Revit Events">
-                    <control:LogControl
-                        x:Name="LogControl"
-                        DataContext="{x:Null}" />
+                    <control:LogControl x:Name="LogControl" DataContext="{x:Null}" />
                 </TabItem>
             </TabControl>
         </Grid>