1.修改全部字体从 YouYuan 变为 Microsoft Sans Serif

2.添加菜单页 Style

1.修改全部字体从 YouYuan 变为 Microsoft Sans Serif
2.添加菜单页 Style
c21b43d0 · 潘栩锋 · cecb057a · c21b43d0 · c21b43d0 · c21b43d0
Commit c21b43d0 authored Jul 08, 2021 by 潘栩锋 🚴
15 changed files
--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
@@ -250,6 +250,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Resource>
+    <Page Include="Themes\PgMenuStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="Themes\SectionStyle2.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle.xaml
@@ -43,7 +43,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="36" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>
@@ -73,7 +73,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>
@@ -106,7 +106,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle2.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ButtonStyle2.xaml
@@ -41,7 +41,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="36" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>
@@ -71,7 +71,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>
@@ -104,7 +104,7 @@
        <Setter Property="Foreground" Value="#FFFFFFFF" />
        <Setter Property="FontWeight" Value="Bold" />
        <Setter Property="FontSize" Value="48" />
-        <Setter Property="FontFamily" Value="YouYuan" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
        <Setter Property="Background" Value="#FF3B3B3B" />
        <Setter Property="Template">
            <Setter.Value>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Dictionary_MyStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/Dictionary_MyStyle.xaml
@@ -22,5 +22,6 @@
        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/UiModuleStyle2.xaml"/>
        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/IconButtonStyle2.xaml"/>
        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/CardStyle.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/PgMenuStyle.xaml"/>
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle.xaml
@@ -18,7 +18,7 @@
                <Setter Property="Foreground" Value="Black"/>
                <Setter Property="HorizontalAlignment" Value="Center"/>
                <Setter Property="TextAlignment" Value="Center"/>
-                <Setter Property="FontFamily" Value="YouYuan"/>
+                <Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
                <Setter Property="Margin" Value="3"/>
            </Style>
            <Style TargetType="iconPacks:PackIconMaterial" >

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle2.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/IconButtonStyle2.xaml
@@ -18,7 +18,7 @@
                <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Text}"/>
                <Setter Property="HorizontalAlignment" Value="Center"/>
                <Setter Property="TextAlignment" Value="Center"/>
-                <Setter Property="FontFamily" Value="YouYuan"/>
+                <Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
                <Setter Property="Margin" Value="3"/>
            </Style>
            <Style TargetType="iconPacks:PackIconMaterial" >

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/NoToggleButtonStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/NoToggleButtonStyle.xaml
@@ -22,7 +22,7 @@
                        <Grid>
                            <Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/>
                            <StackPanel x:Name="SP_Text" Orientation="Horizontal"  Margin="20,15" HorizontalAlignment="Right">
-                                <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
+                                <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="Microsoft Sans Serif"/>
                            </StackPanel>
                        </Grid>
                    </Border>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/PgMenuStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/PgMenuStyle.xaml
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/ButtonStyle2.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style x:Key="Styles.PgMenu.ItemText" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="FontSize" Value="40"/>
+        <Setter Property="Background" Value="#C00083D7"/>
+        <Setter Property="Padding" Value="10"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+    </Style>
+    <Style x:Key="Styles.PgMenu.ItemImage" TargetType="Image">
+        <Setter Property="Stretch" Value="UniformToFill"/>
+    </Style>
+    <Style x:Key="Styles.PgMenu.ItemButton" TargetType="Button" BasedOn="{StaticResource Styles.Button.Empty}">
+        <Setter Property="Background" Value="#FF0083D7"/>
+        <Setter Property="Width" Value="225"/>
+        <Setter Property="Height" Value="140"/>
+        <Setter Property="Margin" Value="5"/>
+        <Style.Resources>
+            <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.PgMenu.ItemText}"/>
+            <Style TargetType="Image" BasedOn="{StaticResource Styles.PgMenu.ItemImage}"/>
+        </Style.Resources>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle.xaml
@@ -11,7 +11,7 @@
        <Setter Property="Foreground"  Value="#FFFFFFFF" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="30" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Right" />
    </Style>
    
@@ -42,7 +42,7 @@
        <Setter Property="Foreground"  Value="#FFFFFFFF" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="30" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Right" />
    </Style>

@@ -52,7 +52,7 @@
        <Setter Property="Foreground"  Value="White" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="60" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
        <Setter Property="VerticalAlignment"  Value="Center" />
    </Style>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml
@@ -14,7 +14,7 @@
        <Setter Property="Foreground"  Value="White" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="30" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Right" />
    </Style>
    
@@ -44,7 +44,7 @@
        <Setter Property="Foreground"  Value="White" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="60" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
        <Setter Property="VerticalAlignment"  Value="Center" />
    </Style>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle.xaml
@@ -41,7 +41,7 @@
        <Setter Property="Foreground"  Value="#FF0083D7" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="22" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
    </Style>

@@ -51,7 +51,7 @@
        <Setter Property="Foreground"  Value="#FF3B3B3B" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="22" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
    </Style>


--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml
@@ -47,7 +47,7 @@
        <Setter Property="Foreground"  Value="#FF3B3B3B" />
        <Setter Property="FontWeight"  Value="Bold" />
        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader}" />
-        <Setter Property="FontFamily"  Value="YouYuan" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
    </Style>
    
@@ -74,9 +74,9 @@
    <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent">
        <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
        <Setter Property="Foreground"  Value="#FF3B3B3B" />
-        <Setter Property="FontWeight"  Value="Bold" />
+        <!--<Setter Property="FontWeight"  Value="Bold" />-->
        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
-        <Setter Property="FontFamily"  Value="Arial" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
    </Style>

@@ -84,9 +84,9 @@
    <Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" BasedOn="{StaticResource Styles.Text.Input}">
        <Setter Property="Margin"  Value="{StaticResource Margin.Text}" />
        <Setter Property="Foreground"  Value="#FF3B3B3B" />
-        <Setter Property="FontWeight"  Value="Bold" />
+        <!--<Setter Property="FontWeight"  Value="Bold" />-->
        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
-        <Setter Property="FontFamily"  Value="Arial" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
        <Setter Property="MinWidth"  Value="30" />
    </Style>
@@ -108,7 +108,7 @@
    <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
        <Setter Property="Foreground"  Value="#FF888888" />
        <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent.Small}" />
-        <Setter Property="FontFamily"  Value="Arial" />
+        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
        <Setter Property="TextAlignment"  Value="Left" />
        <Setter Property="VerticalAlignment"  Value="Bottom" />
    </Style>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ToggleButtonOnOffStyle.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ToggleButtonOnOffStyle.xaml
@@ -21,7 +21,7 @@
                        <Grid>
                            <Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/>
                            <StackPanel x:Name="SP_Text" Orientation="Horizontal"  Margin="20,15" HorizontalAlignment="Right">
-                                <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="YouYuan"/>
+                                <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="Microsoft Sans Serif"/>
                            </StackPanel>
                        </Grid>
                    </Border>

--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_Tip.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_Tip.xaml
@@ -13,8 +13,8 @@
    <Border BorderThickness="1" BorderBrush="Black">
        <Grid>
            <StackPanel Margin="10,5">
-                <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="30" FontFamily="YouYuan" Margin="10,5"/>
-                <TextBlock Text="{Binding Message}" FontWeight="Bold" FontSize="15" FontFamily="YouYuan" Margin="20,5" TextWrapping="Wrap" />
+                <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="30" FontFamily="Microsoft Sans Serif" Margin="10,5"/>
+                <TextBlock Text="{Binding Message}" FontWeight="Bold" FontSize="15" FontFamily="Microsoft Sans Serif" Margin="20,5" TextWrapping="Wrap" />
            </StackPanel>
            <Button Style="{StaticResource ResourceKey=Styles.Button.Empty}" Command="{Binding CloseCmd}" Background="Red" VerticalAlignment="Top" HorizontalAlignment="Right" >


--- a/Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_WarningTip.xaml
+++ b/Project.FLY.ControlLibrary/FLY.ControlLibrary/Window_WarningTip.xaml
@@ -11,7 +11,7 @@
                <Setter Property="Foreground" Value="#FFFFFFFF" />
                <Setter Property="FontWeight" Value="Bold" />
                <Setter Property="FontSize" Value="48" />
-                <Setter Property="FontFamily" Value="YouYuan" />
+                <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
                <Setter Property="Background" Value="#FF3B3B3B" />
                <Setter Property="Template">
                    <Setter.Value>
@@ -41,8 +41,8 @@
    <Grid>
        <Border Background="Red" Opacity="0.9" />
        <StackPanel Margin="80,40">
-            <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="72" FontFamily="YouYuan" Margin="40,20" Foreground="White" />
-            <TextBlock Text="{Binding Message}" FontWeight="Bold" FontSize="36" FontFamily="YouYuan" Margin="40,20" TextWrapping="Wrap" Foreground="White" />
+            <TextBlock Text="{Binding Title}" FontWeight="Bold" FontSize="72" FontFamily="Microsoft Sans Serif" Margin="40,20" Foreground="White" />
+            <TextBlock Text="{Binding Message}" FontWeight="Bold" FontSize="36" FontFamily="Microsoft Sans Serif" Margin="40,20" TextWrapping="Wrap" Foreground="White" />
        </StackPanel>
        <StackPanel Orientation="Horizontal" FlowDirection="RightToLeft" VerticalAlignment="Bottom" Margin="10,0">
            <StackPanel.Resources>
@@ -78,7 +78,7 @@
                </Style>

            </StackPanel.Resources>
-            <Button Content="{Binding OKContent}" FontFamily="YouYuan" Click="button_ok_Click"/>
+            <Button Content="{Binding OKContent}" FontFamily="Microsoft Sans Serif" Click="button_ok_Click"/>
        </StackPanel>

    </Grid>