src/FingersDance.Control.Player/UserControlPlayer.xaml
changeset 215 d13dbcf861d7
parent 202 e15e7110ef6d
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml	Thu Nov 19 18:37:26 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml	Thu Nov 19 18:05:52 2009 +0100
@@ -8,7 +8,7 @@
 	xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player"
 	x:Class="FingersDance.Control.Player.UserControlPlayer"
 	x:Name="UserControl" AllowDrop="True" Custom:SurfaceDragDrop.DragOver="Play_Pause_area_DragOver" Custom:SurfaceDragDrop.DragEnter="Play_Pause_area_DragEnter" Custom:SurfaceDragDrop.DragLeave="Play_Pause_area_DragLeave" Custom:SurfaceDragDrop.Drop="Play_Pause_area_Drop"
-	Width="560" Height="400" 
+	Width="560" Height="423" 
     xmlns:GestureControl="clr-namespace:GestureControl;assembly=GestureControl">
 	<UserControl.Resources>
 		<Storyboard x:Key="OnClick1"/>
@@ -150,6 +150,334 @@
 				<SplineDoubleKeyFrame KeyTime="00:00:01" Value="1" KeySpline="0,0,0.5,1"/>
 			</DoubleAnimationUsingKeyFrames>
 		</Storyboard>
+		<Style x:Key="SurfaceRadioButtonStyle1" TargetType="{x:Type Custom:SurfaceRadioButton}">
+			<Setter Property="HorizontalContentAlignment" Value="Left"/>
+			<Setter Property="Background" Value="Transparent"/>
+			<Setter Property="Foreground" Value="Black"/>
+			<Setter Property="BorderBrush" Value="Transparent"/>
+			<Setter Property="Padding" Value="5,0,0,0"/>
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="{x:Type Custom:SurfaceRadioButton}">
+						<ControlTemplate.Resources>
+							<Storyboard x:Key="ThreeStateExit">
+								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+									<SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+								</DoubleAnimationUsingKeyFrames>
+							</Storyboard>
+							<Storyboard x:Key="Press">
+								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+									<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+								</DoubleAnimationUsingKeyFrames>
+								<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+									<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+								</ThicknessAnimationUsingKeyFrames>
+							</Storyboard>
+							<Storyboard x:Key="Checked">
+								<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+							</Storyboard>
+							<Storyboard x:Key="Release">
+								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+									<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+									<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+								</DoubleAnimationUsingKeyFrames>
+								<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+									<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+									<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+								</ThicknessAnimationUsingKeyFrames>
+							</Storyboard>
+							<Storyboard x:Key="Unchecked">
+								<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+							</Storyboard>
+							<Storyboard x:Key="ThreeStateEnter">
+								<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+									<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+								</DoubleAnimationUsingKeyFrames>
+							</Storyboard>
+						</ControlTemplate.Resources>
+						<BulletDecorator x:Name="bulletDecorator" MinHeight="30" MinWidth="30" Height="Auto" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+							<BulletDecorator.Bullet>
+								<Grid MinHeight="30" MinWidth="30" Width="30" Height="30" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+									<Rectangle x:Name="Base" Fill="{TemplateBinding Background}" Stroke="Transparent" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+									<Rectangle x:Name="Button" Fill="#33A4B4BD" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="2" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+										<Rectangle.Stroke>
+											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+												<GradientStop Color="#66000000" Offset="0"/>
+												<GradientStop Color="#33000000" Offset="1"/>
+											</LinearGradientBrush>
+										</Rectangle.Stroke>
+									</Rectangle>
+									<Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+										<Rectangle.Fill>
+											<RadialGradientBrush GradientOrigin="0.5,0.072">
+												<RadialGradientBrush.RelativeTransform>
+													<TransformGroup>
+														<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="-2.281" ScaleY="-1.484"/>
+														<SkewTransform AngleX="0" AngleY="0" CenterX="0.5" CenterY="0.5"/>
+														<RotateTransform Angle="359.337" CenterX="0.5" CenterY="0.5"/>
+														<TranslateTransform X="-0.001" Y="-0.126"/>
+													</TransformGroup>
+												</RadialGradientBrush.RelativeTransform>
+												<GradientStop Color="Transparent" Offset="0.205"/>
+												<GradientStop Color="#26000000" Offset="0.652"/>
+											</RadialGradientBrush>
+										</Rectangle.Fill>
+										<Rectangle.Stroke>
+											<LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+												<GradientStop Color="#7FFFFFFF" Offset="0"/>
+												<GradientStop Color="#0CFFFFFF" Offset="1"/>
+											</LinearGradientBrush>
+										</Rectangle.Stroke>
+									</Rectangle>
+									<Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" Margin="2" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
+									<Rectangle x:Name="Checkmark" Fill="{x:Null}" StrokeThickness="7" RadiusX="6" RadiusY="6" Margin="8" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+										<Rectangle.Stroke>
+											<LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+												<GradientStop Color="#FF292929" Offset="1"/>
+												<GradientStop Color="Red" Offset="0.276"/>
+											</LinearGradientBrush>
+										</Rectangle.Stroke>
+									</Rectangle>
+									<Rectangle x:Name="ThreeStateMark" StrokeThickness="1" RadiusX="13" RadiusY="13" Margin="6" Opacity="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Fill="Red">
+										<Rectangle.Stroke>
+											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+												<GradientStop Color="#66000000" Offset="0"/>
+												<GradientStop Color="#33000000" Offset="1"/>
+											</LinearGradientBrush>
+										</Rectangle.Stroke>
+									</Rectangle>
+								</Grid>
+							</BulletDecorator.Bullet>
+							<Grid HorizontalAlignment="Stretch" Margin="5,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+								<Grid x:Name="ContentBox" HorizontalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Background="Transparent">
+									<ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ClipToBounds="False" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
+								</Grid>
+							</Grid>
+						</BulletDecorator>
+						<ControlTemplate.Triggers>
+							<MultiTrigger>
+								<MultiTrigger.EnterActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+												<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="0.9"/>
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</BeginStoryboard>
+								</MultiTrigger.EnterActions>
+								<MultiTrigger.ExitActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ThreeStateMark" Storyboard.TargetProperty="(UIElement.Opacity)">
+												<SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
+											</DoubleAnimationUsingKeyFrames>
+										</Storyboard>
+									</BeginStoryboard>
+								</MultiTrigger.ExitActions>
+								<MultiTrigger.Conditions>
+									<Condition Property="IsThreeState" Value="True"/>
+									<Condition Property="IsChecked" Value="{x:Null}"/>
+								</MultiTrigger.Conditions>
+							</MultiTrigger>
+							<Trigger Property="IsChecked" Value="False">
+								<Trigger.EnterActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.EnterActions>
+								<Trigger.ExitActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.ExitActions>
+							</Trigger>
+							<Trigger Property="IsChecked" Value="True">
+								<Trigger.EnterActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="1"/>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.EnterActions>
+								<Trigger.ExitActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimation Duration="00:00:00.2000000" Storyboard.TargetName="Checkmark" Storyboard.TargetProperty="Opacity" To="0"/>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.ExitActions>
+							</Trigger>
+							<Trigger Property="IsPressed" Value="True">
+								<Trigger.EnterActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+												<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+											</DoubleAnimationUsingKeyFrames>
+											<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+												<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-2"/>
+											</ThicknessAnimationUsingKeyFrames>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.EnterActions>
+								<Trigger.ExitActions>
+									<BeginStoryboard>
+										<Storyboard>
+											<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(UIElement.Opacity)">
+												<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+												<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+											</DoubleAnimationUsingKeyFrames>
+											<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="GlowBorder" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+												<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-2"/>
+												<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="2"/>
+											</ThicknessAnimationUsingKeyFrames>
+										</Storyboard>
+									</BeginStoryboard>
+								</Trigger.ExitActions>
+							</Trigger>
+							<Trigger Property="IsEnabled" Value="False">
+								<Setter Property="Fill" TargetName="Button" Value="#00000000"/>
+								<Setter Property="Stroke" TargetName="Button" Value="#33000000"/>
+								<Setter Property="Foreground" Value="#A5333333"/>
+								<Setter Property="Fill" TargetName="RenderOverlay" Value="#00000000"/>
+								<Setter Property="Stroke" TargetName="Checkmark" Value="#33000000"/>
+								<Setter Property="Opacity" TargetName="RenderOverlay" Value="0.5"/>
+							</Trigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+			<Style.BasedOn>
+				<Style TargetType="{x:Type ButtonBase}">
+					<Setter Property="SnapsToDevicePixels" Value="True"/>
+					<Setter Property="FocusVisualStyle">
+						<Setter.Value>
+							<Style>
+								<Setter Property="Control.Template">
+									<Setter.Value>
+										<ControlTemplate/>
+									</Setter.Value>
+								</Setter>
+							</Style>
+						</Setter.Value>
+					</Setter>
+					<Setter Property="FontFamily" Value="Segoe UI"/>
+					<Setter Property="FontSize" Value="10"/>
+					<Setter Property="Foreground" Value="Black"/>
+					<Setter Property="Background" Value="#33A4B4BD"/>
+					<Setter Property="BorderBrush">
+						<Setter.Value>
+							<LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+								<GradientStop Color="#7FFFFFFF" Offset="0"/>
+								<GradientStop Color="#0CFFFFFF" Offset="1"/>
+							</LinearGradientBrush>
+						</Setter.Value>
+					</Setter>
+					<Setter Property="BorderThickness" Value="1"/>
+					<Setter Property="HorizontalContentAlignment" Value="Center"/>
+					<Setter Property="VerticalContentAlignment" Value="Center"/>
+					<Setter Property="Padding" Value="15,6"/>
+					<Setter Property="IsTabStop" Value="False"/>
+					<Setter Property="Focusable" Value="False"/>
+					<Setter Property="MinWidth" Value="30"/>
+					<Setter Property="MinHeight" Value="30"/>
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="{x:Type ButtonBase}">
+								<ControlTemplate.Resources>
+									<Storyboard x:Key="Press">
+										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+											<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+										</DoubleAnimationUsingKeyFrames>
+										<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+											<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+										</ThicknessAnimationUsingKeyFrames>
+									</Storyboard>
+									<Storyboard x:Key="Release">
+										<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+											<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+											<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+										</DoubleAnimationUsingKeyFrames>
+										<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+											<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+											<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+										</ThicknessAnimationUsingKeyFrames>
+									</Storyboard>
+								</ControlTemplate.Resources>
+								<Grid x:Name="Grid" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+									<Border x:Name="Shadow" Margin="1,1,1,0" BorderBrush="#33000000" BorderThickness="0,0,0,1" CornerRadius="6" Padding="1"/>
+									<Rectangle x:Name="Base" Fill="{TemplateBinding Background}" StrokeThickness="1" RadiusX="5" RadiusY="5" Margin="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+										<Rectangle.Stroke>
+											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+												<GradientStop Color="#66000000" Offset="0"/>
+												<GradientStop Color="#33000000" Offset="1"/>
+											</LinearGradientBrush>
+										</Rectangle.Stroke>
+									</Rectangle>
+									<Rectangle x:Name="RenderOverlay" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="1" RadiusX="4" RadiusY="4" Margin="2" Opacity="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+										<Rectangle.Fill>
+											<LinearGradientBrush EndPoint="0,0" StartPoint="0,1">
+												<GradientStop Color="#26000000" Offset="0"/>
+												<GradientStop Color="#4CFFFFFF" Offset="1"/>
+											</LinearGradientBrush>
+										</Rectangle.Fill>
+									</Rectangle>
+									<Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="Glow" Margin="1" Opacity="0" Color="White" CornerRadius="4"/>
+									<ContentPresenter x:Name="Content" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}">
+										<ContentPresenter.RenderTransform>
+											<TranslateTransform X="0" Y="-1"/>
+										</ContentPresenter.RenderTransform>
+									</ContentPresenter>
+								</Grid>
+								<ControlTemplate.Triggers>
+									<Trigger Property="IsPressed" Value="True">
+										<Trigger.EnterActions>
+											<BeginStoryboard>
+												<Storyboard>
+													<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+														<SplineDoubleKeyFrame KeyTime="00:00:00.1000000" Value="1"/>
+													</DoubleAnimationUsingKeyFrames>
+													<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+														<SplineThicknessKeyFrame KeyTime="00:00:00.1000000" Value="-3"/>
+													</ThicknessAnimationUsingKeyFrames>
+												</Storyboard>
+											</BeginStoryboard>
+										</Trigger.EnterActions>
+										<Trigger.ExitActions>
+											<BeginStoryboard>
+												<Storyboard>
+													<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(UIElement.Opacity)">
+														<SplineDoubleKeyFrame KeyTime="00:00:00" Value="1"/>
+														<SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="0"/>
+													</DoubleAnimationUsingKeyFrames>
+													<ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Glow" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+														<SplineThicknessKeyFrame KeyTime="00:00:00" Value="-3"/>
+														<SplineThicknessKeyFrame KeySpline="0.5,0.5,0.5,1" KeyTime="00:00:00.5000000" Value="1"/>
+													</ThicknessAnimationUsingKeyFrames>
+												</Storyboard>
+											</BeginStoryboard>
+										</Trigger.ExitActions>
+									</Trigger>
+									<Trigger Property="IsEnabled" Value="True"/>
+									<Trigger Property="IsEnabled" Value="False">
+										<Setter Property="Fill" TargetName="RenderOverlay" Value="#0CFFFFFF"/>
+										<Setter Property="Stroke" TargetName="RenderOverlay" Value="#33FFFFFF"/>
+										<Setter Property="Stroke" TargetName="Base" Value="#33000000"/>
+										<Setter Property="BorderBrush" TargetName="Shadow" Value="#00000000"/>
+										<Setter Property="Foreground" Value="#A5333333"/>
+										<Setter Property="Background" Value="Transparent"/>
+									</Trigger>
+								</ControlTemplate.Triggers>
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Style.BasedOn>
+		</Style>
 	</UserControl.Resources>
 	<UserControl.Triggers>
 		<EventTrigger RoutedEvent="FrameworkElement.Loaded">
@@ -159,26 +487,28 @@
 			<BeginStoryboard Storyboard="{StaticResource Rect4Annotation}"/>
 		</EventTrigger>
 	</UserControl.Triggers>
-    <Grid x:Name="LayoutRoot" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Background="{x:Null}">
-    	<Viewbox Margin="0,0,0,0" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Stretch="Uniform" AllowDrop="True">
-    		<Grid Width="560" Height="400" HorizontalAlignment="Left" x:Name="GridPlayer">
+    <Grid x:Name="LayoutRoot" Background="{x:Null}">
+    	<Viewbox Stretch="Uniform" AllowDrop="True">
+    		<Grid Width="556.439" Height="423" x:Name="GridPlayer">
     			<Grid.RowDefinitions>
-    				<RowDefinition Height="0.898*"/>
-    				<RowDefinition Height="0.102*"/>
+    				<RowDefinition Height="0.849*"/>
+    				<RowDefinition Height="0.151*"/>
     			</Grid.RowDefinitions>
     			<Grid.ColumnDefinitions>
-    				<ColumnDefinition Width="0.912*"/>
-    				<ColumnDefinition Width="0.088*"/>
+    				<ColumnDefinition Width="0.917*"/>
+    				<ColumnDefinition Width="0.083*"/>
     			</Grid.ColumnDefinitions>
-    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-0.498,0,11.298" x:Name="usercontrolInfoUser" Grid.Column="0" Grid.Row="1" Height="30"/>
-    			<MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" Grid.Column="0" Grid.Row="0" />
-    			<StackPanel Opacity="1" Background="{x:Null}" x:Name="StackPanelAnnotation" Height="Auto" d:LayoutOverrides="Height" Margin="0,77,0,0" Grid.Column="1" Grid.Row="0">
+    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-0.425,-0.465,0" x:Name="usercontrolInfoUser" Grid.Column="0" Grid.Row="1" Height="30" VerticalAlignment="Top"/>
+    			<MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" Grid.Column="0" Grid.Row="0" Margin="0,0,-0.465,-0.073" />
+    			<StackPanel Opacity="1" Background="{x:Null}" x:Name="StackPanelAnnotation" Height="Auto" d:LayoutOverrides="Height" Margin="0.465,77,-3.561,-0.074" Grid.Column="1" Grid.Row="0">
     				<Rectangle x:Name="rect1" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" Margin="0.14,0"/>
     				<Rectangle x:Name="rect2" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
     				<Rectangle x:Name="rect3" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
     				<Rectangle x:Name="rect4" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000" VerticalAlignment="Bottom"/>
     			</StackPanel>
-                <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="0" GestureEvent="GestureDetected"/>
+                <GestureControl:GestureControl HorizontalAlignment="Stretch" x:Name="gestureControl" VerticalAlignment="Stretch" Content="" Grid.Row="0" GestureEvent="GestureDetected" Margin="0,0,-0.465,-0.073"/>
+                <Custom:SurfaceRadioButton x:Name="AnnotationButton" ContactLeave="AnnotationButton_ContactLeave" HorizontalAlignment="Left" Margin="0,29.575,0,4.297" Width="3" Height="1" Content="SurfaceRadioButton" Style="{DynamicResource SurfaceRadioButtonStyle1}" Grid.Row="1"/>
+                <Label x:Name="AnnotationLabel" Margin="30,29.575,0,0" Content="" Foreground="White" HorizontalAlignment="Left" Width="203" Grid.Row="1" VerticalAlignment="Top" Height="30"/>
     		</Grid>
     	</Viewbox>
     </Grid>