整理代码

ShrlAlgoToolkit.RevitAddins/RvCivil/CreateOpeningsView.xaml

@@ -1,17 +1,18 @@
 <ui:NeoWindow
-    Height="220"
-    Title="开洞设置"
-    Width="200"
-    d:DataContext="{d:DesignInstance Type={x:Type rvCivil1:CreateOpeningsViewModel}}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvCivil.CreateOpeningsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     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:rvCivil1="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvCivil"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="开洞设置"
+    Width="200"
+    Height="220"
+    d:DataContext="{d:DesignInstance Type={x:Type rvCivil1:CreateOpeningsViewModel}}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
     </Window.Resources>
@@ -26,9 +27,9 @@
             ui:InputAssist.Suffix="mm"
             Text="{Binding Distance, StringFormat={}{0:N2}}" />
         <CheckBox
+            x:Name="CbAddCasing"
             Content="添加套管"
-            IsChecked="{Binding AddCasing}"
-            x:Name="CbAddCasing" />
+            IsChecked="{Binding AddCasing}" />
         <ComboBox
             DisplayMemberPath="Name"
             IsEnabled="{Binding IsChecked, ElementName=CbAddCasing}"
@@ -36,10 +37,10 @@
             SelectedItem="{Binding SelectedCasing}" />
         <!--  Command="{Binding DataContext.CloseWinCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}, Mode=FindAncestor}}"  -->
         <Button
+            HorizontalAlignment="Stretch"
+            ui:Grid.RowHeightOverride="Auto"
             Command="{Binding CreateOpeningsCommand}"
             Content="开洞"
-            HorizontalAlignment="Stretch"
-            ToolTip="选择添加套管则使用套管开洞"
-            ui:Grid.RowHeightOverride="Auto" />
+            ToolTip="选择添加套管则使用套管开洞" />
     </ui:Grid>
 </ui:NeoWindow>