# HG changeset patch
# User sarias
# Date 1253724405 -7200
# Node ID 5d6ebbd6557f9aeee5c34482331bc07a9c300878
# Parent  ac20121c930b4d1ae44d3f8df933e365b339a411
Controls Players

diff -r ac20121c930b -r 5d6ebbd6557f src/FingersDance.Control.Player/UserControlPlayer.xaml
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml	Wed Sep 23 19:49:21 2009 +0200
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml	Wed Sep 23 18:46:45 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="Play/Pause" ContactDown="ButtonRewind_ContactDown" Click="ButtonRewind_Click" Foreground="{x:Null}" Background="#FFF7F0F0" BorderBrush="{x:Null}" Opacity="0" Width="72" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.PlayerButton}" VerticalAlignment="Top" Height="48"/>
-        			<Custom:SurfaceButton x:Name="Fast_Forward_area" Content="Play/Pause" ContactDown="ButtonFastForward_ContactDown" Click="ButtonFastForward_Click" Foreground="{x:Null}" Background="#FFF7F0F0" BorderBrush="{x:Null}" Opacity="0" Width="72" HorizontalAlignment="Right" Style="{DynamicResource FingersDance.Control.PlayerButton}" VerticalAlignment="Top" Height="48"/>
-        			<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" VerticalAlignment="Top" Height="48"/>
+        			<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"/>
         		</Grid>
         	</Viewbox>
         </Grid>
diff -r ac20121c930b -r 5d6ebbd6557f src/FingersDance.Control.Screen/UserControlScreen.xaml
--- a/src/FingersDance.Control.Screen/UserControlScreen.xaml	Wed Sep 23 19:49:21 2009 +0200
+++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml	Wed Sep 23 18:46:45 2009 +0200
@@ -8,7 +8,7 @@
     xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel"
 	x:Class="FingersDance.Control.Screen.UserControlScreen"
 	x:Name="UserControl"
-	d:DesignWidth="640" d:DesignHeight="480" Width="Auto" Height="Auto" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Background="#FF54FF00">
+	d:DesignWidth="640" d:DesignHeight="480" Width="Auto" Height="Auto" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Background="{x:Null}">
 
     <Grid x:Name="LayoutRoot">
     	<Custom:ScatterView HorizontalAlignment="Left" VerticalAlignment="Top" Foreground="{x:Null}" x:Name="ScatterViewScreen"/>
diff -r ac20121c930b -r 5d6ebbd6557f src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj
--- a/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj	Wed Sep 23 19:49:21 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj	Wed Sep 23 18:46:45 2009 +0200
@@ -76,10 +76,10 @@
     <Reference Include="Microsoft.Surface" />
     <Reference Include="Microsoft.Surface.Presentation" />
     <Reference Include="Microsoft.Surface.Presentation.Generic" />
-    <Page Include="FingersDance.Control.TimeLine.Ressources.xaml">
+    <Resource Include="FingersDance.Control.TimeLine.Ressources.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
-    </Page>
+    </Resource>
     <Page Include="UserControlTimeLine.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>