整理代码

ShrlAlgoToolkit.RevitAddins/RvView/SystemDisplayView.xaml

@@ -1,12 +1,7 @@
 <ui:NeoWindow
-    Height="450"
-    MinWidth="550"
-    Title="系统设置"
-    Width="550"
-    d:DataContext="{d:DesignInstance Type=local:SystemDisplayViewModel}"
-    mc:Ignorable="d"
     x:Class="ShrlAlgoToolkit.RevitAddins.RvView.SystemDisplayView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="clr-namespace:ShrlAlgoToolkit.Mvvm.Converters;assembly=ShrlAlgoToolkit.Mvvm"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvView"
@@ -14,13 +9,19 @@
     xmlns:mep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:rvMep="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvMEP"
     xmlns:ui="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    Title="系统设置"
+    Width="550"
+    Height="450"
+    MinWidth="550"
+    d:DataContext="{d:DesignInstance Type=local:SystemDisplayViewModel}"
+    Icon="{DynamicResource RevitIcon}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <converters:EnumItemsSourceAndConverter Type="{x:Type rvMep:MEPSystemClassification}" x:Key="SystemClassificationConverter" />
+            <converters:EnumItemsSourceAndConverter x:Key="SystemClassificationConverter" Type="{x:Type rvMep:MEPSystemClassification}" />
         </ResourceDictionary>
     </Window.Resources>
     <Grid>
@@ -28,20 +29,20 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <GroupBox Header="配置方式" Margin="5">
+        <GroupBox Margin="5" Header="配置方式">
             <UniformGrid HorizontalAlignment="Center" Rows="1">
-                <RadioButton Content="过滤器" Margin="5" />
-                <RadioButton Content="材质" Margin="5" />
+                <RadioButton Margin="5" Content="过滤器" />
+                <RadioButton Margin="5" Content="材质" />
             </UniformGrid>
         </GroupBox>
         <DataGrid
+            Grid.Row="1"
+            Margin="5"
+            d:ItemsSource="{d:SampleData}"
             AutoGenerateColumns="False"
             EnableRowVirtualization="True"
             FrozenColumnCount="2"
-            Grid.Row="1"
-            ItemsSource="{Binding SystemsCollection}"
-            Margin="5"
-            d:ItemsSource="{d:SampleData}">
+            ItemsSource="{Binding SystemsCollection}">
             <DataGrid.Columns>
                 <!--<DataGridCheckBoxColumn
                         Binding="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}"
@@ -75,7 +76,6 @@
                         <DataTemplate>
                             <Border>
                                 <Button
-                                    Background="{Binding BackgroundColor}"
                                     Command="{Binding DataContext.OpenColorPickerCommand, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
                                     CommandParameter="{Binding}"
                                     Content="编辑" />