# HG changeset patch
# User riley
# Date 1255880541 -7200
# Node ID e78e40b9d761096b25b6d2815c261f1898fd6472
# Parent  09700eb267020a39a854cbba1f8d867f66d3d429
Pivot Improved and methods for timeline

diff -r 09700eb26702 -r e78e40b9d761 src/FingersDance.Control.Pivot/UserControlPivot.xaml
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Fri Oct 16 22:19:24 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Sun Oct 18 17:42:21 2009 +0200
@@ -6,7 +6,7 @@
 	mc:Ignorable="d"
 	xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
 	x:Class="FingersDance.Control.Pivot.UserControlPivot"
-	x:Name="UserControl" Width="90" Height="90" Foreground="{x:Null}">
+	x:Name="UserControl" Width="88.5" Height="90" Foreground="{x:Null}">
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
@@ -134,12 +134,12 @@
 			<RowDefinition Height="0.499*"/>
 		</Grid.RowDefinitions>
 		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="0.506*"/>
-			<ColumnDefinition Width="0.494*"/>
+			<ColumnDefinition Width="0.515*"/>
+			<ColumnDefinition Width="0.485*"/>
 		</Grid.ColumnDefinitions>
-		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Fill="#FF615E5E" Margin="0.462,0,-0.462,0"/>
-		<Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="0.47,-5.377,-0.681,-5.83" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}"/>
-		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="-0.875,-4.844,-0.416,-5.441" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}">
+		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Margin="0.72,0.584,-0.915,0.999" Fill="#FFF6F2F2"/>
+		<Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="0.47,-5.252,-0.643,-5.955" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}"/>
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="-1.413,-4.813,-1.416,-5.472" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" d:LayoutOverrides="HorizontalMargin">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="1"/>
@@ -149,7 +149,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="0.178,-4.737,-0.388,-4.103" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="0.397,-5.393,-0.57,-3.447" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="1" ScaleY="-1"/>
@@ -159,7 +159,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="-0.788,-5.521,-0.502,-4.569" Style="{DynamicResource FingersDance.Pivot.Button}" Width="45.75">
+		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource DefaultColor_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="-1.419,-6.021,-1.409,-4.069" Style="{DynamicResource FingersDance.Pivot.Button}" Width="45.75">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="-1"/>
@@ -169,6 +169,6 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Ellipse Margin="-20.319,0,0,-19" StrokeThickness="0.5" Fill="Black" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="40.655" Height="40.335" Grid.Column="1"/>
+		<Ellipse Margin="0,0,-20.299,-19" StrokeThickness="0.5" Fill="Black" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="40.655" Height="40.335"/>
 	</Grid>
 </UserControl>
\ No newline at end of file
diff -r 09700eb26702 -r e78e40b9d761 src/FingersDance.Control.Player/UserControlPlayer.xaml.cs
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Fri Oct 16 22:19:24 2009 +0200
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs	Sun Oct 18 17:42:21 2009 +0200
@@ -29,7 +29,7 @@
         #endregion
 
         public event EventHandler PlayerOpened;
-
+        public event EventHandler PlayerStopOrPause;
         public UserControlPlayer()
         {
             this.InitializeComponent();
@@ -73,6 +73,8 @@
         public void playerPause()
         {
             MediaElementVideo.Pause();
+            if (PlayerStopOrPause != null)
+                PlayerStopOrPause(this, new EventArgs());
         }
         public void playerPlay()
         {
@@ -81,10 +83,13 @@
         public void playerStop()
         {
             MediaElementVideo.Stop();
+            if (PlayerStopOrPause != null)
+                PlayerStopOrPause(this, new EventArgs());
         }
         
         #endregion
 
+        
         #region Button Simple Player Actions
         private void ButtonPlayPause_ContactDown(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
         {
diff -r 09700eb26702 -r e78e40b9d761 src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs	Fri Oct 16 22:19:24 2009 +0200
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs	Sun Oct 18 17:42:21 2009 +0200
@@ -32,6 +32,7 @@
             UCTimeLine.initTimer(col, projCutting);
             this.UserControlPlayer.playerPlay();
             this.userControlTimeLine.OnSuccessAnnotation+=new EventHandler(userControlTimeLine_OnSuccessAnnotation);
+            this.UserControlPlayer.PlayerStopOrPause +=new EventHandler(UserControlPlayer_PlayerStopOrPause);
         }
 
         #region player
@@ -48,6 +49,11 @@
         public void UserControlPlayer_DisplayAnnotation(int id, Brush b)
         {
             UserControlPlayer.displayStackPanelAnnotations(id, b);
+
+        }
+        public void UserControlPlayer_PlayerStopOrPause(object sender, EventArgs e)
+        { 
+            
         }
         #endregion
 
diff -r 09700eb26702 -r e78e40b9d761 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Fri Oct 16 22:19:24 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Sun Oct 18 17:42:21 2009 +0200
@@ -162,6 +162,16 @@
                                                                     <Rectangle x:Name="RenderOverlay" StrokeThickness="1" RadiusX="15" RadiusY="15" HorizontalAlignment="Stretch" Margin="6" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Opacity="1" SnapsToDevicePixels="True" Fill="{x:Null}" Stroke="{x:Null}"/>
                                                                     <Microsoft_Surface_Presentation_Generic:SurfaceShadowChrome x:Name="GlowBorder" HorizontalAlignment="Stretch" Margin="2" VerticalAlignment="Stretch" Width="Auto" Height="Auto" Opacity="0" Color="White" CornerRadius="{Binding ActualHeight, ElementName=GlowBorder}"/>
                                                                     <Rectangle x:Name="Contact" Fill="Transparent" Stroke="{x:Null}"/>
+                                                                    <Rectangle x:Name="PauseSymbol" Fill="{DynamicResource Play_xaml}" Stroke="{x:Null}" RenderTransformOrigin="0.5,0.5" Margin="0,-4.435,0.676,11.231" HorizontalAlignment="Right" Width="12.393" Visibility="Collapsed">
+                                                                    	<Rectangle.RenderTransform>
+                                                                    		<TransformGroup>
+                                                                    			<ScaleTransform/>
+                                                                    			<SkewTransform/>
+                                                                    			<RotateTransform Angle="89.649"/>
+                                                                    			<TranslateTransform/>
+                                                                    		</TransformGroup>
+                                                                    	</Rectangle.RenderTransform>
+                                                                    </Rectangle>
                                                                 </Grid>
                                                                 <ControlTemplate.Triggers>
                                                                     <Trigger Property="IsFocused" Value="True"/>
@@ -776,12 +786,23 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
+        <Style x:Key="TimelineViewStyle1" TargetType="{x:Type vw:TimelineView}">
+        	<Setter Property="Template">
+        		<Setter.Value>
+        			<ControlTemplate TargetType="{x:Type vw:TimelineView}">
+        				<Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+        					<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+        				</Border>
+        			</ControlTemplate>
+        		</Setter.Value>
+        	</Setter>
+        </Style>
     </UserControl.Resources>
 
     <Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}">
         <Custom:SurfaceSlider  Height="Auto" x:Name="slider" Value="0.5" Width="Auto" 
                                Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" />
-        <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}"/>
+        <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}" Style="{DynamicResource TimelineViewStyle1}"/>
         <popup:UserControlClose x:Name="confirmCancelPopup" Question="Êtes-vous de sûr de vouloir effacer cette annotation ?" Visibility="Hidden" ConfirmYesOrNo="confirmCancelPopup_ConfirmYesOrNo" />
     </Grid>
 </UserControl>
\ No newline at end of file