# HG changeset patch
# User PAMPHILE Jonathan <pamphile@efrei.fr>
# Date 1253796501 -7200
# Node ID 33d221312ea107601a60ad8e820961098c3b754c
# Parent  e6e3b164a9a82da84356db73df719376ac007573# Parent  5a49507c81599aeb8a1af37955740e04a66747ef
Merge - PLayer - TimeLine

diff -r e6e3b164a9a8 -r 33d221312ea1 src/FingersDance.Control.Player/UserControlPlayer.xaml
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml	Thu Sep 24 14:46:11 2009 +0200
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml	Thu Sep 24 14:48:21 2009 +0200
@@ -129,9 +129,9 @@
         	<Viewbox Margin="0,0,0,0" Width="{Binding ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding ActualHeight, ElementName=UserControl, Mode=Default}" Stretch="Uniform">
         		<Grid Width="560" Height="400">
         			<MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" />
-        			<Custom:SurfaceButton x:Name="Rewind_area" Content="" ContactDown="ButtonRewind_ContactDown" Click="ButtonRewind_Click" Foreground="{x:Null}" Background="{x:Null}" BorderBrush="{x:Null}" Opacity="1" Width="72" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.PlayerButton}" VerticalAlignment="Top" Height="120"/>
-        			<Custom:SurfaceButton x:Name="Fast_Forward_area" Content="" ContactDown="ButtonFastForward_ContactDown" Click="ButtonFastForward_Click" Foreground="{x:Null}" Background="{x:Null}" BorderBrush="{x:Null}" Opacity="1" Width="72" HorizontalAlignment="Right" Style="{DynamicResource FingersDance.Control.PlayerButton}" VerticalAlignment="Top" Height="120"/>
-        			<Custom:SurfaceButton x:Name="Play_Pause_area" ContactDown="ButtonPlayPause_ContactDown" Click="ButtonPlayPause_Click" Foreground="{x:Null}" Background="{x:Null}" BorderBrush="{x:Null}" Margin="76,0" Style="{DynamicResource FingersDance.Control.PlayerButton}" Opacity="0.99" VerticalAlignment="Top" Height="120"/>
+        			<Custom:SurfaceButton x:Name="Rewind_area" Content="" ContactDown="ButtonRewind_ContactDown" Click="ButtonRewind_Click" Foreground="{x:Null}" Background="{x:Null}" BorderBrush="{x:Null}" Opacity="0" Width="72" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.PlayerButton}" Margin="0,0,0,196"/>
+        			<Custom:SurfaceButton x:Name="Fast_Forward_area" Content="" ContactDown="ButtonFastForward_ContactDown" Click="ButtonFastForward_Click" Foreground="{x:Null}" Background="#FFFFFFFF" BorderBrush="{x:Null}" Opacity="0" Width="72" HorizontalAlignment="Right" Style="{DynamicResource FingersDance.Control.PlayerButton}" Margin="0,0,0,196"/>
+        			<Custom:SurfaceButton x:Name="Play_Pause_area" ContactDown="ButtonPlayPause_ContactDown" Click="ButtonPlayPause_Click" Foreground="{x:Null}" Background="#FFFFFFFF" BorderBrush="{x:Null}" Margin="76,0,76,196" Style="{DynamicResource FingersDance.Control.PlayerButton}" Opacity="0"/>
         		</Grid>
         	</Viewbox>
         </Grid>
diff -r e6e3b164a9a8 -r 33d221312ea1 src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs	Thu Sep 24 14:46:11 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml.cs	Thu Sep 24 14:48:21 2009 +0200
@@ -188,7 +188,7 @@
 
         private void slider_ContactTapGesture(object sender, Microsoft.Surface.Presentation.ContactEventArgs e)
         {
-            addAnnotation();
+            //addAnnotation();
         }
 
         public void addAnnotation()
diff -r e6e3b164a9a8 -r 33d221312ea1 src/FingersDance/MainSurfaceWindow.xaml.cs
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs	Thu Sep 24 14:46:11 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs	Thu Sep 24 14:48:21 2009 +0200
@@ -341,7 +341,7 @@
                 actualGrid.Children.Add(SessionInput);
                 
                 //2.5 rensegner la video choisie au screen
-                ((UserControlScreen)actualGrid.Parent).Path = ((CustomListBoxItem)sender).Path;
+                ((UserControlScreen)actualGrid.Parent).Path = ((UserControlListVideo)sender).path;
                 //3-Creation des Events
                 SessionInput.EH_SurfaceButtonSubmit_ContactDown += new System.EventHandler(this.SessionInput_EH_SurfaceButtonSubmit_ContactDown);
                 //4-Supression du UC List Video