|
@@ -277,7 +277,7 @@
|
|
|
<Setter TargetName="root" Property="Border.Background" Value="White" />
|
|
|
</Trigger>
|
|
|
<Trigger Property="IsChecked" Value="{x:Null}">
|
|
|
- <Setter Property="Opacity" TargetName="optionMark" Value="0.56"/>
|
|
|
+ <Setter TargetName="optionMark" Property="Opacity" Value="0.56" />
|
|
|
</Trigger>
|
|
|
</ControlTemplate.Triggers>
|
|
|
</ControlTemplate>
|
|
@@ -285,7 +285,7 @@
|
|
|
</Setter>
|
|
|
</Style>
|
|
|
|
|
|
- <Style x:Key="LocationRadioBtnStyle" TargetType="{x:Type RadioButton}">
|
|
|
+ <Style x:Key="LocationRadioBtnStyle" TargetType="{x:Type RadioButton}">
|
|
|
<Setter Property="Background" Value="{StaticResource RadioButton.Static.Background}" />
|
|
|
<Setter Property="BorderBrush" Value="{StaticResource RadioButton.Static.Border}" />
|
|
|
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
|
|
@@ -406,36 +406,46 @@
|
|
|
</Style>
|
|
|
|
|
|
<Style x:Key="BatchButton" TargetType="{x:Type RadioButton}">
|
|
|
- <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
|
|
|
- <Setter Property="Background" Value="#F7F8FA"/>
|
|
|
- <Setter Property="BorderThickness" Value="0"/>
|
|
|
- <Setter Property="Cursor" Value="Hand"/>
|
|
|
+ <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
|
|
|
+ <Setter Property="Background" Value="#F7F8FA" />
|
|
|
+ <Setter Property="BorderThickness" Value="0" />
|
|
|
+ <Setter Property="Cursor" Value="Hand" />
|
|
|
<Setter Property="Template">
|
|
|
<Setter.Value>
|
|
|
<ControlTemplate TargetType="{x:Type RadioButton}">
|
|
|
<ControlTemplate.Resources>
|
|
|
<Storyboard x:Key="Storyboard1">
|
|
|
- <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="bd">
|
|
|
- <EasingColorKeyFrame KeyTime="0" Value="White"/>
|
|
|
- <EasingColorKeyFrame KeyTime="0:0:0.3" Value="#FFAFAFAF"/>
|
|
|
+ <ColorAnimationUsingKeyFrames Storyboard.TargetName="bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
|
|
|
+ <EasingColorKeyFrame KeyTime="0" Value="White" />
|
|
|
+ <EasingColorKeyFrame KeyTime="0:0:0.3" Value="#FFAFAFAF" />
|
|
|
</ColorAnimationUsingKeyFrames>
|
|
|
</Storyboard>
|
|
|
<Storyboard x:Key="Storyboard2">
|
|
|
- <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" Storyboard.TargetName="bd">
|
|
|
- <EasingColorKeyFrame KeyTime="0" Value="#FFAFAFAF"/>
|
|
|
- <EasingColorKeyFrame KeyTime="0:0:0.5" Value="#D3D3D3"/>
|
|
|
+ <ColorAnimationUsingKeyFrames Storyboard.TargetName="bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
|
|
|
+ <EasingColorKeyFrame KeyTime="0" Value="#FFAFAFAF" />
|
|
|
+ <EasingColorKeyFrame KeyTime="0:0:0.5" Value="#D3D3D3" />
|
|
|
</ColorAnimationUsingKeyFrames>
|
|
|
</Storyboard>
|
|
|
</ControlTemplate.Resources>
|
|
|
<BulletDecorator Background="Transparent">
|
|
|
- <Border x:Name="bd" HorizontalAlignment="Center" Background="White" CornerRadius="5">
|
|
|
+ <Border
|
|
|
+ x:Name="bd"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ Background="White"
|
|
|
+ CornerRadius="5">
|
|
|
<Border.OpacityMask>
|
|
|
- <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
|
|
|
- <GradientStop Color="Black" Offset="0"/>
|
|
|
- <GradientStop Color="White" Offset="1"/>
|
|
|
+ <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
|
|
|
+ <GradientStop Offset="0" Color="Black" />
|
|
|
+ <GradientStop Offset="1" Color="White" />
|
|
|
</LinearGradientBrush>
|
|
|
</Border.OpacityMask>
|
|
|
- <ContentPresenter Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
|
|
+ <ContentPresenter
|
|
|
+ Width="{TemplateBinding Width}"
|
|
|
+ Height="{TemplateBinding Height}"
|
|
|
+ Margin="{TemplateBinding Padding}"
|
|
|
+ HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
|
|
|
+ VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
|
|
+ RecognizesAccessKey="True" />
|
|
|
</Border>
|
|
|
</BulletDecorator>
|
|
|
<ControlTemplate.Triggers>
|
|
@@ -447,17 +457,17 @@
|
|
|
</Trigger>
|
|
|
<Trigger Property="IsChecked" Value="true">
|
|
|
<Trigger.EnterActions>
|
|
|
- <BeginStoryboard x:Name="Storyboard2_BeginStoryboard" Storyboard="{StaticResource Storyboard2}"/>
|
|
|
+ <BeginStoryboard x:Name="Storyboard2_BeginStoryboard" Storyboard="{StaticResource Storyboard2}" />
|
|
|
</Trigger.EnterActions>
|
|
|
<Setter TargetName="bd" Property="Background" Value="#FF606060" />
|
|
|
</Trigger>
|
|
|
<MultiTrigger>
|
|
|
<MultiTrigger.EnterActions>
|
|
|
- <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
|
|
|
+ <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
|
|
|
</MultiTrigger.EnterActions>
|
|
|
<MultiTrigger.Conditions>
|
|
|
- <Condition Property="IsMouseOver" Value="True"/>
|
|
|
- <Condition Property="IsChecked" Value="False"/>
|
|
|
+ <Condition Property="IsMouseOver" Value="True" />
|
|
|
+ <Condition Property="IsChecked" Value="False" />
|
|
|
</MultiTrigger.Conditions>
|
|
|
<Setter TargetName="bd" Property="Background" Value="Red" />
|
|
|
</MultiTrigger>
|