# HG changeset patch
# User sarias
# Date 1252789072 -7200
# Node ID f1a26ca4177ebee10dce82b88bf2c2f93e658d2b
# Parent  f003ae353cd79cebfbe129a958037b234d2c6b6a
Travail sur le UserControlPivot + changement de design.

diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj
--- a/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj	Sat Sep 12 22:57:52 2009 +0200
@@ -75,6 +75,10 @@
     <Reference Include="Microsoft.Surface" />
     <Reference Include="Microsoft.Surface.Presentation" />
     <Reference Include="Microsoft.Surface.Presentation.Generic" />
+    <Resource Include="FingersDance.Control.Pivot.Ressource.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
     <Page Include="UserControlPivot.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -116,6 +120,7 @@
     <Resource Include="FingersDance.Control.Pivot.xml" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="FingersDance.Control.Pivot.Ressource_Files\**\*.jpg;FingersDance.Control.Pivot.Ressource_Files\**\*.jpeg;FingersDance.Control.Pivot.Ressource_Files\**\*.png;FingersDance.Control.Pivot.Ressource_Files\**\*.bmp;FingersDance.Control.Pivot.Ressource_Files\**\*.gif;FingersDance.Control.Pivot.Ressource_Files\**\*.tif;FingersDance.Control.Pivot.Ressource_Files\**\*.tiff" />
     <Resource Include="Resources\WindowBackground.jpg" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance.Control.Pivot/UserControlPivot.xaml
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -5,7 +5,54 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d"
 	x:Class="FingersDance.Control.Pivot.UserControlPivot"
-	x:Name="UserControl" Width="52" Height="52">
-
-	<Ellipse Fill="#FF080808" Stroke="#FF000000"/>
+	x:Name="UserControl" Width="52" Height="52" xmlns:Custom="http://schemas.microsoft.com/surface/2008">
+	<UserControl.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="FingersDance.Control.Pivot.Ressource.xaml"/>
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</UserControl.Resources>
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="0.501*"/>
+			<RowDefinition Height="0.499*"/>
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="0.506*"/>
+			<ColumnDefinition Width="0.494*"/>
+		</Grid.ColumnDefinitions>
+		<Ellipse Fill="#FFFFFFFF" Stroke="#FF000000" Grid.ColumnSpan="2" Grid.RowSpan="2"/>
+		<Custom:SurfaceButton BorderThickness="0,0,0,0" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer1" VerticalAlignment="Center" Content="" Background="{DynamicResource Color_8_#230FD2_xaml}"/>
+		<Custom:SurfaceButton Content="" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer2" VerticalAlignment="Center" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_4_#FF0000_xaml}">
+			<Custom:SurfaceButton.RenderTransform>
+				<TransformGroup>
+					<ScaleTransform ScaleX="-1" ScaleY="1"/>
+					<SkewTransform AngleX="0" AngleY="0"/>
+					<RotateTransform Angle="0"/>
+					<TranslateTransform X="0" Y="0"/>
+				</TransformGroup>
+			</Custom:SurfaceButton.RenderTransform>
+		</Custom:SurfaceButton>
+		<Custom:SurfaceButton Content="" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer3" VerticalAlignment="Center" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_12_#00C800_xaml}" >
+			<Custom:SurfaceButton.RenderTransform>
+				<TransformGroup>
+					<ScaleTransform ScaleX="1" ScaleY="-1"/>
+					<SkewTransform AngleX="0" AngleY="0"/>
+					<RotateTransform Angle="0"/>
+					<TranslateTransform X="0" Y="0"/>
+				</TransformGroup>
+			</Custom:SurfaceButton.RenderTransform>
+		</Custom:SurfaceButton>
+		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_2_#FFC800_xaml}">
+			<Custom:SurfaceButton.RenderTransform>
+				<TransformGroup>
+					<ScaleTransform ScaleX="-1" ScaleY="-1"/>
+					<SkewTransform AngleX="0" AngleY="0"/>
+					<RotateTransform Angle="0"/>
+					<TranslateTransform X="0" Y="0"/>
+				</TransformGroup>
+			</Custom:SurfaceButton.RenderTransform>
+		</Custom:SurfaceButton>
+	</Grid>
 </UserControl>
\ No newline at end of file
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -11,7 +11,7 @@
 
     <Grid x:Name="LayoutRoot" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}">
         <Grid VerticalAlignment="Top" Height="50" x:Name="GridTimeLine">
-        	<FingersDance_Control_TimeLine:UserControlTimeLine Margin="0,0,0,20" Height="Auto" x:Name="UserControlTimeLine" DragStarted="UserControlTimeLine_DragStarted" DragCompleted="UserControlTimeLine_DragCompleted" TimerTick="UserControlTimeLine_TimerTick" Width="{Binding Path=ActualWidth, ElementName=LayoutRoot, Mode=Default}" HorizontalAlignment="Left" d:LayoutOverrides="Height"/>
+        	<FingersDance_Control_TimeLine:UserControlTimeLine Margin="0,0,0,20" Height="Auto" x:Name="UserControlTimeLine" DragStarted="UserControlTimeLine_DragStarted" DragCompleted="UserControlTimeLine_DragCompleted" TimerTick="UserControlTimeLine_TimerTick" Width="{Binding Path=ActualWidth, ElementName=LayoutRoot, Mode=Default}" HorizontalAlignment="Left" d:LayoutOverrides="Height" Background="{x:Null}"/>
         </Grid>
         <Grid HorizontalAlignment="Stretch" Width="Auto" Height="Auto" VerticalAlignment="Stretch" x:Name="GridPlayer" Margin="0,54,0,0">
         	<FingersDance_Control_Player:UserControlPlayer PlayerOpened="UserControlPlayer_PlayerOpened" x:Name="UserControlPlayer" VerticalAlignment="Stretch" d:LayoutOverrides="GridBox" Width="{Binding Path=ActualWidth, ElementName=GridPlayer, Mode=Default}" Margin="0,0,0,0" Height="{Binding Path=ActualHeight, ElementName=GridPlayer, Mode=Default}" />
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml
--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -6,9 +6,9 @@
 	mc:Ignorable="d"
 	x:Class="FingersDance.Control.TimeLine.UserControlTimeLine"
 	x:Name="UserControl"
-	d:DesignWidth="383" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Height="Auto" Background="#FF898686" d:DesignHeight="33">
+	d:DesignWidth="383" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Height="Auto" Background="{x:Null}" d:DesignHeight="33">
 
-	<Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="#4CFCFCFC">
-		<Custom:SurfaceSlider  Height="Auto" x:Name="slider" Value="0.5" Width="Auto" Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" Margin="0,0,30,0" />
+	<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" Margin="0,0,30,0" Background="#19FFFFFF" />
 	</Grid>
 </UserControl>
\ No newline at end of file
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml
--- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -9,7 +9,7 @@
 	d:DesignWidth="640" d:DesignHeight="480" 
     xmlns:FingersDance_Control_SyncSource="clr-namespace:FingersDance.Control.SyncSource;assembly=FingersDance.Control.SyncSource">
 
-	<Grid x:Name="LayoutRoot" Background="#1800FF8F">
+	<Grid x:Name="LayoutRoot" Background="{x:Null}">
         <FingersDance_Control_SyncSource:UserControlSyncSource x:Name="UserControlSyncSource" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="{Binding Path=ActualWidth, ElementName=LayoutRoot, Mode=Default}" Margin="0,0,0,0" Height="{Binding Path=ActualHeight, ElementName=LayoutRoot, Mode=Default}"/>
 
     </Grid>
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance/App.xaml
--- a/src/FingersDance/App.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance/App.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -7,6 +7,7 @@
       <ResourceDictionary>
         <ResourceDictionary.MergedDictionaries>
           <ResourceDictionary Source="/Microsoft.Surface.Presentation.Generic;v1.0.0.0;31bf3856ad364e35;component/themes\generic.xaml"/>
+          <ResourceDictionary Source="FingersDance.Control.Pivot.Ressource.xaml"/>
         </ResourceDictionary.MergedDictionaries>
       </ResourceDictionary>
     </Application.Resources>
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance/FingersDance.csproj
--- a/src/FingersDance/FingersDance.csproj	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance/FingersDance.csproj	Sat Sep 12 22:57:52 2009 +0200
@@ -124,12 +124,20 @@
     <Resource Include="Resources\WindowBackground.jpg" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="FingersDance.Control.Pivot.Ressource.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Resource>
     <Page Include="MainSurfaceWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\FingersDance.Control.Pivot\FingersDance.Control.Pivot.csproj">
+      <Project>{0EC4C48C-132C-4926-9A09-A4135C58688C}</Project>
+      <Name>FingersDance.Control.Pivot</Name>
+    </ProjectReference>
     <ProjectReference Include="..\FingersDance.Control.UserPanel\FingersDance.Control.UserPanel.csproj">
       <Project>{E6A3A067-1CB4-43D2-BB9C-DC72361F7E22}</Project>
       <Name>FingersDance.Control.UserPanel</Name>
diff -r f003ae353cd7 -r f1a26ca4177e src/FingersDance/MainSurfaceWindow.xaml
--- a/src/FingersDance/MainSurfaceWindow.xaml	Fri Sep 11 10:58:35 2009 +0200
+++ b/src/FingersDance/MainSurfaceWindow.xaml	Sat Sep 12 22:57:52 2009 +0200
@@ -3,30 +3,38 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:s="http://schemas.microsoft.com/surface/2008"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
+    xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel"
     x:Class="FingersDance.SurfaceWindow1"
     Title="FingersDance"
     Width="1024" Height="768" x:Name="mainSurfaceWindow"
-    xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel"
+    xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot" Background="{x:Null}"
     >
   <s:SurfaceWindow.Resources>
     <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
   </s:SurfaceWindow.Resources>
 
-  <Grid Background="{StaticResource WindowBackground}" x:Name="MainGrid" Width="1024" Height="768" >
+  <Grid x:Name="MainGrid" Width="1024" Height="768" >
+  	<Grid.Background>
+  		<LinearGradientBrush EndPoint="0.505,0.985" StartPoint="0.505,-0.015">
+  			<GradientStop Color="#FF000000" Offset="0"/>
+  			<GradientStop Color="#FF2A2A2A" Offset="0.544"/>
+  			<GradientStop Color="#FF000000" Offset="1"/>
+  		</LinearGradientBrush>
+  	</Grid.Background>
 
-  	<Grid HorizontalAlignment="Left" x:Name="Grid1" VerticalAlignment="Top" Width="100" Height="100" Background="#7EFAFAFA">
+  	<Grid HorizontalAlignment="Left" x:Name="Grid1" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}">
   		<FingersDance_Control_UserPanel:UserControlUserPanel/>
   		<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
   	</Grid>
-  	<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid4" VerticalAlignment="Top" Width="100" Height="100" Background="#7FFFFFFF">
+  	<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid4" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}">
   		<FingersDance_Control_UserPanel:UserControlUserPanel/>
   		<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
   	</Grid>
-  	<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100" Background="#7FFFFFFF">
+  	<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
   		<FingersDance_Control_UserPanel:UserControlUserPanel/>
   		<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF"/>
   	</Grid>
-  	<Grid RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" Margin="0,0,0,0" x:Name="Grid2" VerticalAlignment="Bottom" Width="100" Height="100" Background="#7EFFFFFF">
+  	<Grid RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" Margin="0,0,0,0" x:Name="Grid2" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
   		<Grid.RenderTransform>
   			<TransformGroup>
   				<ScaleTransform ScaleX="1" ScaleY="1"/>
@@ -51,6 +59,9 @@
   			        </Ellipse.RenderTransform>
   		        </Ellipse>
                 </s:ScatterViewItem>
+  		<s:ScatterViewItem CanMove="True" CanRotate="False" CanScale="False" Width="57" Height="57" >
+  			<FingersDance_Control_Pivot:UserControlPivot/>
+  		</s:ScatterViewItem>
   	</s:ScatterView>
 
   </Grid>