整理代码

ShrlAlgoToolkit.RevitAddins/RvView/SectionBoxControllerView.xaml

@@ -1,19 +1,20 @@
 <ui:NeoWindow
-    Height="360"
-    MinHeight="360"
-    MinWidth="340"
-    Title="剖面框"
-    Width="340"
-    d:DataContext="{d:DesignInstance Type=rvManager:SectionBoxControllerViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvView.SectionBoxControllerView"
     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:rvManager="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
     xmlns:rvView="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="剖面框"
+    Width="340"
+    Height="360"
+    MinWidth="340"
+    MinHeight="360"
+    d:DataContext="{d:DesignInstance Type=rvManager:SectionBoxControllerViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
     </Window.Resources>
@@ -29,14 +30,14 @@
                 </StackPanel>
             </GroupBox.Header>
             <ListBox
-                DisplayMemberPath="Name"
+                x:Name="HistoryListBox"
                 HorizontalContentAlignment="Center"
-                ItemsSource="{Binding BoundingBoxes}"
-                SelectedValuePath="Bounding"
                 d:ItemsSource="{d:SampleData ItemCount=5}"
-                x:Name="HistoryListBox" />
+                DisplayMemberPath="Name"
+                ItemsSource="{Binding BoundingBoxes}"
+                SelectedValuePath="Bounding" />
         </GroupBox>
-        <Grid Grid.ColumnSpan="2" Grid.Row="1">
+        <Grid Grid.Row="1" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="auto" />
@@ -58,46 +59,46 @@
                 </UniformGrid>
             </GroupBox>
             <CheckBox
-                Content="是否延展"
                 Grid.Column="1"
-                HorizontalAlignment="Center"
-                IsChecked="{Binding NeedExtend}"
                 Margin="5"
+                HorizontalAlignment="Center"
+                Content="是否延展"
+                IsChecked="{Binding NeedExtend}"
                 ToolTip="是否延展剖面框边界" />
         </Grid>
         <Button
+            Grid.Row="2"
+            Grid.Column="0"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Add}"
             Command="{Binding RecordSectionBoxCommand}"
             Content="临时记录"
-            Grid.Column="0"
-            Grid.Row="2"
-            HorizontalAlignment="Stretch"
-            ToolTip="记录剖面框，以便复用"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Add}" />
+            ToolTip="记录剖面框，以便复用" />
         <Button
+            Grid.Row="2"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Delete}"
             Command="{Binding RemoveSectionBoxCommand}"
             CommandParameter="{Binding SelectedItem, ElementName=HistoryListBox}"
             Content="删除记录"
-            Grid.Column="1"
-            Grid.Row="2"
-            HorizontalAlignment="Stretch"
-            ToolTip="删除已记录的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Delete}" />
+            ToolTip="删除已记录的剖面框" />
         <Button
+            Grid.Row="3"
+            Grid.Column="0"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=KeyboardReturn}"
             Command="{Binding UpdateSectionBoxCommand}"
             CommandParameter="{Binding SelectedValue, ElementName=HistoryListBox}"
             Content="恢复剖面框"
-            Grid.Column="0"
-            Grid.Row="3"
-            HorizontalAlignment="Stretch"
-            ToolTip="返回历史记录的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=KeyboardReturn}" />
+            ToolTip="返回历史记录的剖面框" />
         <Button
+            Grid.Row="3"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch"
+            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Box}"
             Command="{Binding ResetSectionBoxCommand}"
             Content="设置剖面框"
-            Grid.Column="1"
-            Grid.Row="3"
-            HorizontalAlignment="Stretch"
-            ToolTip="重新设置新的剖面框"
-            ui:ButtonAssist.Icon="{ui:Icon SymbolValue=Box}" />
+            ToolTip="重新设置新的剖面框" />
     </ui:Grid>
 </ui:NeoWindow>