整理

ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryView.xaml

@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
     Height="600"
     MinHeight="600"
     MinWidth="1050"
@@ -13,7 +13,7 @@
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily.FamilyLibrary"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="https://github.com/ShrlAlgo/WPFluent"
+    xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Window.Resources>
         <ResourceDictionary>
@@ -35,13 +35,13 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="220" />
         </Grid.ColumnDefinitions>
-        <ui:Button
+        <Button
             Command="{Binding SelectPathCommand}"
             Content="打开族目录"
             FontFamily="{StaticResource BoxIcons}"
             Grid.Row="0"
             HorizontalAlignment="Stretch"
-            Icon="{ui:FontIcon Glyph=&#xEADF;,
+            ui:ButtonAssist.Icon="{ui:FontIcon Glyph=&#xEADF;,
                                FontFamily={StaticResource BoxIcons}}"
             Margin="5"
             ToolTip="{Binding FamilyPath, Mode=OneWay, StringFormat=族目录：{}{0}}" />
@@ -63,19 +63,19 @@
             HorizontalAlignment="Center"
             ShowsPreview="True"
             Width="1" />
-        <ui:TextBox
+        <TextBox
             Cursor="IBeam"
             Grid.Column="2"
             Grid.Row="0"
             Margin="5"
-            PlaceholderText="请输入搜索关键词"
+            ui:InputAssist.Placeholder="请输入搜索关键词"
             x:Name="SearchBox">
             <i:Interaction.Triggers>
                 <i:EventTrigger EventName="KeyDown">
                     <i:InvokeCommandAction Command="{Binding SearchFamilyCommand}" CommandParameter="{Binding Text, RelativeSource={RelativeSource AncestorType={x:Type TextBox}, Mode=FindAncestor}}" />
                 </i:EventTrigger>
             </i:Interaction.Triggers>
-        </ui:TextBox>
+        </TextBox>
         <ui:ListView
             Grid.Column="2"
             Grid.Row="1"
@@ -188,14 +188,14 @@
                                         </Style.Triggers>
                                     </Style>
                                 </StackPanel.Style>
-                                <ui:Button
+                                <Button
                                     Appearance="Primary"
                                     Command="{Binding DataContext.ImportFamilyCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
                                     Content="&#xEDB7;载入"
                                     FontFamily="{StaticResource BoxIcons}"
                                     ToolTip="将族载入到当前项目" />
-                                <ui:Button
+                                <Button
                                     Appearance="Primary"
                                     Command="{Binding DataContext.LocationFamilyFileCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"
                                     CommandParameter="{Binding}"
@@ -280,10 +280,10 @@
             Grid.Column="4"
             Grid.Row="0"
             Orientation="Horizontal">
-            <ui:ComboBoxEx
+            <ComboBox
                 DisplayMemberPath="Name"
                 ItemsSource="{Binding SymbolTypes, Mode=TwoWay}"
-                PlaceholderText="选择族类型"
+                ui:InputAssist.Placeholder="选择族类型"
                 SelectedItem="{Binding SelectedSymbolType, UpdateSourceTrigger=PropertyChanged}"
                 ui:StackPanel.Fill="Fill"
                 x:Name="CbbSymbols" />
@@ -311,4 +311,4 @@
             Grid.Row="2"
             Text="{Binding RevitVersion, Mode=OneWay, StringFormat=当前文件版本：Revit \{0\}}" />
     </Grid>
-</ui:FluentWindowEx>
+</ui:NeoWindow>

ShrlAlgoToolkit.RevitAddins/RvFamily/FamilyLibrary/FamilyLibraryViewModel.cs

@@ -68,7 +68,7 @@ public partial class FamilyLibraryViewModel : ObservableObject
     private bool activeSnackbar;
 
     [ObservableProperty]
-    private WPFluent.Controls.InfoBar messageQueue = new();
+    private NeoUI.Controls.InfoBar messageQueue = new();
 
     [ObservableProperty]
     private string message;
@@ -428,7 +428,7 @@ public partial class FamilyLibraryViewModel : ObservableObject
     [RelayCommand]
     private void SelectPath()
     {
-        var dialog = new WPFluent.Controls.VistaFolderBrowserDialog();
+        var dialog = new NeoUI.Controls.VistaFolderBrowserDialog();
         if (dialog.ShowDialog() == true)
         {
             try