整理

ShrlAlgoToolkit.RevitAddins/RvCivil/FloorFinishesView.xaml

@@ -1,4 +1,4 @@
-<ui:FluentWindowEx
+<ui:NeoWindow
     Height="500"
     MinHeight="500"
     MinWidth="275"
@@ -12,7 +12,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:rvCivil="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
-    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 Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
@@ -21,7 +21,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>-->
     </Window.Resources>
-    <ui:AutoGrid
+    <ui:Grid
         ChildMargin="5"
         Columns="*"
         Rows="Auto,*,Auto,Auto">
@@ -41,16 +41,16 @@
                 SelectedValue="{Binding SelectedFloorType, UpdateSourceTrigger=PropertyChanged}"
                 x:Name="LbFloorType" />
         </GroupBox>
-        <ui:TextBox
+        <TextBox
             Grid.Row="2"
             InputMethod.IsInputMethodEnabled="False"
-            PlaceholderText="楼板偏移"
-            Text="{Binding FloorOffset, StringFormat=\{0:N2\}, UpdateSourceTrigger=PropertyChanged}" />
+            ui:InputAssist.Placeholder="楼板偏移"
+            Text="{Binding FloorOffset, StringFormat={}{0:N2}, UpdateSourceTrigger=PropertyChanged}" />
         <!--<TextBox
                 Grid.Row="2"
                 InputMethod.IsInputMethodEnabled="False"
                 md:HintAssist.Hint="楼板偏移"
-                md:TextFieldAssist.SuffixText="mm">
+                md:TextFieldAssist.ui:InputAssist.SuffixText="mm">
                 <TextBox.Text>
                     <Binding
                         Path="FloorOffset"
@@ -65,12 +65,12 @@
                     </Binding>
                 </TextBox.Text>
             </TextBox>-->
-        <ui:Button
+        <Button
             Command="{Binding PlaceFloorCommand}"
             Content="布置"
             Grid.Row="3"
             HorizontalAlignment="Stretch"
-            Icon="{ui:FontIcon Glyph=&#xeab9;,
+            ui:ButtonAssist.Icon="{ui:FontIcon Glyph=&#xeab9;,
                                FontFamily={StaticResource BoxIcons}}" />
-    </ui:AutoGrid>
-</ui:FluentWindowEx>
+    </ui:Grid>
+</ui:NeoWindow>