样式修改

BPASmartClient.Academy/App.xaml

@@ -19,7 +19,7 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecButtonStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/TextBoxStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+                <!--<ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />-->
                 <ResourceDictionary>
                     <con:ColorConverter x:Key="ColorConverter" />
                     <con:TextConverter x:Key="TextConverter" />
@@ -37,7 +37,7 @@
                     <ImageBrush x:Key="dbxt" ImageSource="/BPASmartClient.CustomResource;component/Image/顶部线条.png" />
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
-           
+
         </ResourceDictionary>
     </Application.Resources>
 </Application>

BPASmartClient.Academy/View/DeviceMotionView.xaml

@@ -49,12 +49,12 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style x:Key="radiobutton" TargetType="{x:Type RadioButton}">
+        <Style x:Key="radiobutton" TargetType="RadioButton">
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <ControlTemplate TargetType="RadioButton">
                         <Border
                             x:Name="bord"
                             Width="{TemplateBinding Width}"
@@ -127,7 +127,7 @@
                                 Height="40"
                                 BorderThickness="0"
                                 Content="配料搅拌:开"
-                                Foreground="Black"
+                                Foreground="Red"
                                 GroupName="1"
                                 Style="{StaticResource radiobutton}" />
                             <RadioButton