更新

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <None Remove="Fonts\iconfont.ttf" />
+    <None Remove="Fonts\Quartz Regular.ttf" />
     <None Remove="Image\bg.png" />
     <None Remove="Image\btn_close.png" />
     <None Remove="Image\btn_normal.png" />
@@ -86,6 +87,7 @@
     <None Remove="Image\告警\预警f44b4b.png" />
     <None Remove="Image\图层1.png" />
     <None Remove="Image\圆形.png" />
+    <None Remove="Image\圆角矩形 30 拷贝.png" />
     <None Remove="Image\圆角矩形 4.png" />
     <None Remove="Image\圆角矩形.png" />
     <None Remove="Image\底部背景.png" />
@@ -179,6 +181,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Fonts\Quartz Regular.ttf" />
     <Resource Include="Image\btn_close.png" />
     <Resource Include="Image\ComboBoxPopSelect.png" />
     <Resource Include="Image\ComboBoxSelect.png" />
@@ -193,6 +196,7 @@
     <Resource Include="Image\告警\无告警.png" />
     <Resource Include="Image\告警\无告警1.png" />
     <Resource Include="Image\告警\轻微告警.png" />
+    <Resource Include="Image\圆角矩形 30 拷贝.png" />
     <Resource Include="Image\背景2.png" />
     <Resource Include="Image\边角.png" />
   </ItemGroup>

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -3,18 +3,33 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
 
-
-
-
-
-    <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png" />
-
-    <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png" />
-    <ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png" />
+    <!--#region Color-->
+    <SolidColorBrush x:Key="foreground" Color="#a2c2e8" />
+    <SolidColorBrush x:Key="borderBrush" Color="#FF074B92" />
+    <SolidColorBrush x:Key="Titleforeground" Color="#FF07D7FF" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="#00c2f4"/>
+    <SolidColorBrush x:Key="LabelColor" Color="#FF00EEF3"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="#feffff"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="#4fade8"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="#3afdff"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="#8f723c"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="White"/>
+
+    <!--<SolidColorBrush x:Key="foreground" Color="Red" />
+    <SolidColorBrush x:Key="borderBrush" Color="Red" />
+    <SolidColorBrush x:Key="Titleforeground" Color="Red" />
+    <SolidColorBrush x:Key="LabelColor" Color="Red" />
+    <SolidColorBrush x:Key="DataGridColumnHeaderColor" Color="Red"/>
+    <SolidColorBrush x:Key="MainTitleforeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="ButtonUnSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunSelectForeground" Color="Red"/>
+    <SolidColorBrush x:Key="MeunUnSelectForeground" Color="Red"/>-->
+    <!--#endregion-->
 
     <!--#region Label-->
     <Style TargetType="{x:Type Label}">
-        <Setter Property="Foreground" Value="#FF00EEF3" />
+        <Setter Property="Foreground" Value="{DynamicResource LabelColor}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Padding" Value="5" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
@@ -46,10 +61,6 @@
     </Style>
     <!--#endregion-->
 
-    <!--#region Color-->
-    <SolidColorBrush x:Key="foreground" Color="#FFA2C2E8" />
-    <!--#endregion-->
-
     <!--#region ToggleButton-->
     <Style x:Key="StatusBtnStyle告警" TargetType="ToggleButton">
         <Style.Setters>
@@ -158,6 +169,10 @@
     <!--#endregion-->
 
     <!--#region Image-->
+    <ImageBrush x:Key="imageBJ" ImageSource="/BPASmartClient.CustomResource;component/Image/图层1.png" />
+    <ImageBrush x:Key="image1" ImageSource="/BPASmartClient.CustomResource;component/Image/shape.png" />
+    <ImageBrush x:Key="image2" ImageSource="/BPASmartClient.CustomResource;component/Image/shape1.png" />
+    
     <Style TargetType="Image">
         <Style.Setters>
             <Setter Property="UseLayoutRounding" Value="True" />
@@ -353,7 +368,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="button_select" TargetType="Border">
         <Style.Setters>
 
@@ -365,7 +379,6 @@
         </Style.Setters>
     </Style>
 
-
     <Style x:Key="bordertopL" TargetType="Border">
         <Style.Setters>
             <Setter Property="Height" Value="80" />
@@ -962,13 +975,13 @@
         <Style.Setters>
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
                         <Border x:Name="BD" Cursor="Hand">
-                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Cursor="Hand">
                                 <!--<Border Width="16" Margin="5">
                                     <Border.Background>
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮图标.png" />
@@ -979,7 +992,7 @@
                                     Margin="10,0,10,0"
                                     VerticalAlignment="Center"
                                     FontSize="14"
-                                    Foreground="#4fade8"
+                                    Foreground="{DynamicResource ButtonSelectForeground}"
                                     Text="{TemplateBinding Content}" />
                                 <!--  Text="{TemplateBinding Content}"  -->
                             </StackPanel>
@@ -991,7 +1004,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -999,7 +1012,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1007,7 +1020,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -1020,7 +1033,7 @@
         <Style.Setters>
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+            <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
             <Setter Property="Width" Value="68" />
             <Setter Property="Height" Value="25" />
             <Setter Property="Template">
@@ -1040,7 +1053,7 @@
                                     x:Name="textBlock"
                                     VerticalAlignment="Center"
                                     FontSize="14"
-                                    Foreground="#4fade8"
+                                    Foreground="{DynamicResource ButtonSelectForeground}"
                                     Text="{TemplateBinding Content}" />
                                 <!--  Text="{TemplateBinding Content}"  -->
                             </StackPanel>
@@ -1052,7 +1065,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮2.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsMouseOver" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1060,7 +1073,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/顶部切图/返回按钮1.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#4fade8" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="BD" Property="Background">
@@ -1068,7 +1081,7 @@
                                         <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/buttonOn.png" />
                                     </Setter.Value>
                                 </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="#3afdff" />
+                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
@@ -1640,7 +1653,7 @@
     <!--#region TextBlock-->
     <Style TargetType="TextBlock">
         <Style.Setters>
-            <Setter Property="Foreground" Value="#a2c2e8" />
+            <Setter Property="Foreground" Value="{DynamicResource foreground}" />
             <Setter Property="HorizontalAlignment" Value="Left" />
             <Setter Property="VerticalAlignment" Value="Center" />
             <Setter Property="FontSize" Value="20" />
@@ -1653,15 +1666,22 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
     </Style>
+
+    <Style x:Key="数码管Text" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="../Fonts/#Quartz M"></Setter>
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+    </Style>
     <!--#endregion-->
 
     <!--#region GroupBox-->
     <BorderGapMaskConverter x:Key="BorderGapMaskConverter" />
-
     <Style TargetType="{x:Type GroupBox}">
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Foreground" Value="#FF68D8FE" />
+        <Setter Property="Foreground" Value="{DynamicResource Titleforeground}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
@@ -1721,7 +1741,7 @@
     </Style>
     <!--#endregion-->
 
-    <!--  空MenuHeader  -->
+    <!--#region 空MenuHeader-->
     <Style x:Key="MenuItem_NonStyle" TargetType="{x:Type MenuItem}">
         <Setter Property="Height" Value="Auto" />
         <Setter Property="Template">
@@ -1737,4 +1757,6 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <!--#endregion-->
+    
 </ResourceDictionary>

BPASmartClient.CustomResource/UserControls/Style3ArcConverter.cs

@@ -46,7 +46,7 @@ namespace BPASmartClient.CustomResource.UserControls
             }
             else
             {
-                return PenLineCap.Round;
+                return PenLineCap.Flat;
             }
 
         }

BPASmartClient/Control/VersionView.xaml

@@ -23,7 +23,7 @@
         <Border Grid.Row="0" Style="{DynamicResource border阴影边框扩展}"></Border>
         <Border x:Name="border" Grid.Row="1" Style="{DynamicResource border阴影边框扩展}"></Border>
         <Border Grid.Row="2" Style="{DynamicResource border阴影边框扩展}"></Border>
-        <Button Grid.Row="0" Content="保存本地" Width="75" Style="{DynamicResource CommonBtn_返回}" Margin="100,0,10,0" HorizontalAlignment="Right"   VerticalAlignment="Center" Click="Button_Click"  Cursor="Hand"/>
+        <Button Grid.Row="0" Content="保存本地" Margin="100,0,10,0" HorizontalAlignment="Right"   VerticalAlignment="Center" Click="Button_Click"  Cursor="Hand"/>
         <Label HorizontalAlignment="Left" VerticalAlignment="Center" x:Name="label_currentver" Margin="10,0,0,0">1.0</Label>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <TextBox FontSize="16" x:Name="memoEdit1" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" UseLayoutRounding="True" AcceptsReturn="True" TextWrapping="Wrap" UndoLimit="200" Height="{Binding Height, ElementName=border}" />