配色更新

ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml

@@ -1,24 +1,27 @@
-<wpf:NeoWindow
-    MinHeight="500"
-    Title="模型检查"
-    Width="600"
-    d:DataContext="{d:DesignInstance modelManager:ModelCheckViewModel}"
-    mc:Ignorable="d"
+<n:NeoWindow
     x:Class="ShrlAlgoToolkit.RevitAddins.ModelManager.ModelCheckView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:ShrlAlgoToolkit.RevitAddins.RvFamily"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:modelManager="clr-namespace:ShrlAlgoToolkit.RevitAddins.ModelManager"
-    xmlns:wpf="https://github.com/ShrlAlgo/NeoUI"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns:n="https://github.com/ShrlAlgo/NeoUI"
+    Title="模型检查"
+    Width="600"
+    MinHeight="500"
+    d:DataContext="{d:DesignInstance modelManager:ModelCheckViewModel}"
+    mc:Ignorable="d">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/ShrlAlgoToolkit.RevitAddins;component/WPFUI.xaml" />
+                <!--<ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/ColorPalette/LightBlue.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/NeoUI;component/Themes/Styles.xaml" />-->
             </ResourceDictionary.MergedDictionaries>
-            <Style TargetType="{x:Type GroupItem}" x:Key="GroupHeaderStyle">
+            <Style x:Key="GroupHeaderStyle" TargetType="{x:Type GroupItem}">
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type GroupItem}">
@@ -34,14 +37,14 @@
             </Style>
         </ResourceDictionary>
     </Window.Resources>
-    <wpf:Grid
+    <n:Grid
         ChildMargin="5"
         Columns="*,Auto"
         Rows="*,Auto,Auto">
         <DataGrid
+            Grid.ColumnSpan="2"
             AutoGenerateColumns="False"
             CanUserAddRows="False"
-            Grid.ColumnSpan="2"
             IsReadOnly="True"
             ItemsSource="{Binding Items}"
             ToolTip="双击行可快速定位">
@@ -87,20 +90,17 @@
                 <DataGridTextColumn Binding="{Binding Element.Room.Name}" Header="房间" />
             </DataGrid.Columns>
         </DataGrid>
-        <StackPanel
+        <UniformGrid
+            Grid.Row="1"
             Grid.Column="0"
             Grid.ColumnSpan="2"
-            Grid.Row="1">
-            <wpf:Card>
-                <TextBlock Text="{Binding ProjectBasePoint, StringFormat=项目基点：{}{0}}" />
-            </wpf:Card>
-            <wpf:Card>
-                <TextBlock Text="{Binding SharedBasePoint, StringFormat=测量点：{}{0}}" />
-            </wpf:Card>
-        </StackPanel>
+            Columns="1">
+            <n:Card Content="{Binding ProjectBasePoint, StringFormat=项目基点：{}{0}}" />
+            <n:Card Content="{Binding SharedBasePoint, StringFormat=测量点：{}{0}}" />
+        </UniformGrid>
         <UniformGrid
-            Grid.Column="0"
             Grid.Row="2"
+            Grid.Column="0"
             Rows="3">
             <CheckBox
                 Content="管线坡度"
@@ -132,30 +132,21 @@
                 ToolTip="检查管线是否重叠" />
         </UniformGrid>
         <UniformGrid
-            Grid.Column="1"
             Grid.Row="2"
+            Grid.Column="1"
             Rows="2">
             <UniformGrid Rows="2">
                 <TextBlock Text="{Binding ErrorCount, Mode=TwoWay, StringFormat=错误数量：{}{0}}" TextWrapping="WrapWithOverflow" />
                 <CheckBox Content="使用剖切框" IsChecked="{Binding UseSectionBox}" />
             </UniformGrid>
             <UniformGrid Rows="2">
-                <Button
-                    Command="{Binding CheckModelCommand}"
-                    Content="模型检查"
-                    Margin="5"
-                    Width="80" />
-                <Button
-                    Command="{Binding ExportToExcelCommand}"
-                    Content="导出结果"
-                    Width="80" />
+                <Button Command="{Binding CheckModelCommand}" Content="模型检查" />
+                <Button Command="{Binding ExportToExcelCommand}" Content="导出结果" />
                 <Button
                     Command="{Binding ModifyModelCommand}"
                     Content="矫正错误"
-                    Margin="5"
-                    ToolTip="对参照标高进行修改、立管坡度修正"
-                    Width="80" />
+                    ToolTip="对参照标高进行修改、立管坡度修正" />
             </UniformGrid>
         </UniformGrid>
-    </wpf:Grid>
-</wpf:NeoWindow>
+    </n:Grid>
+</n:NeoWindow>

ShrlAlgoToolkit.RevitAddins/ModelManager/ModelCheckView.xaml.cs

@@ -1,4 +1,8 @@
-namespace ShrlAlgoToolkit.RevitAddins.ModelManager
+using System.Windows;
+
+using NeoUI.Appearance;
+
+namespace ShrlAlgoToolkit.RevitAddins.ModelManager
 {
     /// <summary>
     /// ModelCheckView.xaml 的交互逻辑
@@ -7,7 +11,9 @@
     {
         public ModelCheckView()
         {
+            //this.Style = (Style)this.FindResource("NeoWindowStyle");
             InitializeComponent();
+            //ThemeManager.ApplyResourcesToElement(this);
         }
     }
 }