# HG changeset patch
# User sarias
# Date 1252943021 -7200
# Node ID 09d0bc6970b5ae888250225408459272d7975348
# Parent  81ff82bd00c9d66b2c0416ac11faca67b4be1ecb
UserPanel avec SyncSource et Menu

diff -r 81ff82bd00c9 -r 09d0bc6970b5 src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj
--- a/src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj	Mon Sep 14 17:26:20 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/FingersDance.Control.UserPanel.csproj	Mon Sep 14 17:43:41 2009 +0200
@@ -128,6 +128,10 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\FingersDance.Control.Menu\FingersDance.Control.Menu.csproj">
+      <Project>{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}</Project>
+      <Name>FingersDance.Control.Menu</Name>
+    </ProjectReference>
     <ProjectReference Include="..\FingersDance.Control.SyncSource\FingersDance.Control.SyncSource.csproj">
       <Project>{BE5AD2E7-8BC2-414A-AB92-34E4D7357740}</Project>
       <Name>FingersDance.Control.SyncSource</Name>
diff -r 81ff82bd00c9 -r 09d0bc6970b5 src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml
--- a/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Mon Sep 14 17:26:20 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/UserControlUserPanel.xaml	Mon Sep 14 17:43:41 2009 +0200
@@ -7,10 +7,17 @@
 	x:Class="FingersDance.Control.UserPanel.UserControlUserPanel"
 	x:Name="UserControl"
 	d:DesignWidth="640" d:DesignHeight="480" 
-    xmlns:FingersDance_Control_SyncSource="clr-namespace:FingersDance.Control.SyncSource;assembly=FingersDance.Control.SyncSource">
+    xmlns:FingersDance_Control_SyncSource="clr-namespace:FingersDance.Control.SyncSource;assembly=FingersDance.Control.SyncSource"
+    xmlns:FingersDance_Control_Menu="clr-namespace:FingersDance.Control.Menu;assembly=FingersDance.Control.Menu">
+
 
-	<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 x:Name="LayoutRoot" Background="{x:Null}">
+        <Grid x:Name="GridSyncSource" Margin="136,0,0,0" Background="{x:Null}">
+        	<FingersDance_Control_SyncSource:UserControlSyncSource x:Name="UserControlSyncSource" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=ActualWidth, ElementName=GridSyncSource, Mode=Default}" Margin="0,0,0,0" Height="{Binding Path=ActualHeight, ElementName=GridSyncSource, Mode=Default}"/>
+        </Grid>
+        <Grid HorizontalAlignment="Left" Width="132" x:Name="GridMenu" Background="{x:Null}" Margin="0,49,0,0">
+            <FingersDance_Control_Menu:UserControlMenu x:Name="UserControlMenu" Width="{Binding Path=ActualWidth, ElementName=GridMenu, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=GridMenu, Mode=Default}" Margin="0,0,0,0"/>
+        </Grid>
 
     </Grid>
 </UserControl>
\ No newline at end of file
diff -r 81ff82bd00c9 -r 09d0bc6970b5 test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml
--- a/test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml	Mon Sep 14 17:26:20 2009 +0200
+++ b/test/Control.UserPanel.Test/Control.UserPanel.Test/SurfaceWindow1.xaml	Mon Sep 14 17:43:41 2009 +0200
@@ -14,8 +14,8 @@
     <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
   </s:SurfaceWindow.Resources>
 
-  <Grid Background="{StaticResource WindowBackground}">
-  	<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserControlUserPanel1" Margin="0,0,-8,-30" />
+  <Grid Background="{StaticResource WindowBackground}" Height="768" Width="1024">
+  	<FingersDance_Control_UserPanel:UserControlUserPanel x:Name="UserControlUserPanel1" d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="0,0,176.702,225.045" />
 
   </Grid>
 </s:SurfaceWindow>
diff -r 81ff82bd00c9 -r 09d0bc6970b5 test/TestMenu/TestMenu.sln
--- a/test/TestMenu/TestMenu.sln	Mon Sep 14 17:26:20 2009 +0200
+++ b/test/TestMenu/TestMenu.sln	Mon Sep 14 17:43:41 2009 +0200
@@ -11,6 +11,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Player", "..\..\src\FingersDance.Control.Player\FingersDance.Control.Player.csproj", "{E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FingersDance.Control.Menu", "..\..\src\FingersDance.Control.Menu\FingersDance.Control.Menu.csproj", "{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,6 +55,14 @@
 		{E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|x86.ActiveCfg = Release|x86
 		{E3CD404C-F344-4B0D-9C72-61F45EAE3BE1}.Release|x86.Build.0 = Release|x86
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Debug|x86.ActiveCfg = Debug|x86
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Debug|x86.Build.0 = Debug|x86
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Release|x86.ActiveCfg = Release|x86
+		{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff -r 81ff82bd00c9 -r 09d0bc6970b5 test/TestMenu/TestMenu/SurfaceWindow1.xaml
--- a/test/TestMenu/TestMenu/SurfaceWindow1.xaml	Mon Sep 14 17:26:20 2009 +0200
+++ b/test/TestMenu/TestMenu/SurfaceWindow1.xaml	Mon Sep 14 17:43:41 2009 +0200
@@ -4,6 +4,7 @@
     xmlns:s="http://schemas.microsoft.com/surface/2008"
     xmlns:FingersDance_Debug="clr-namespace:FingersDance.Debug;assembly=FingersDance.Debug" x:Class="TestMenu.SurfaceWindow1"
     Title="TestMenu"
+    xmlns:FingersDance_Control_Menu="clr-namespace:FingersDance.Control.Menu;assembly=FingersDance.Control.Menu"
     >
   <s:SurfaceWindow.Resources>
     <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
@@ -12,5 +13,6 @@
   <Grid Background="{StaticResource WindowBackground}" >
   	<s:SurfaceMenu x:Name="MyMenu" Cursor="None" Height="52" VerticalAlignment="Bottom" Margin="77,0,88,179"/>
   	<FingersDance_Debug:UserControlDebug x:Name="debug" HorizontalAlignment="Right" Margin="0,21,60,0" VerticalAlignment="Top" Width="136" Height="133"/>
+  	<FingersDance_Control_Menu:UserControlMenu HorizontalAlignment="Left" VerticalAlignment="Top"/>
   </Grid>
 </s:SurfaceWindow>
diff -r 81ff82bd00c9 -r 09d0bc6970b5 test/TestMenu/TestMenu/TestMenu.csproj
--- a/test/TestMenu/TestMenu/TestMenu.csproj	Mon Sep 14 17:26:20 2009 +0200
+++ b/test/TestMenu/TestMenu/TestMenu.csproj	Mon Sep 14 17:43:41 2009 +0200
@@ -142,6 +142,10 @@
       <Project>{1E80D5A1-C45C-443B-8992-4A4D78D280FC}</Project>
       <Name>FingersDance.Actions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\src\FingersDance.Control.Menu\FingersDance.Control.Menu.csproj">
+      <Project>{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}</Project>
+      <Name>FingersDance.Control.Menu</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\src\FingersDance.Debug\FingersDance.Debug.csproj">
       <Project>{148FE4AA-2C30-4D08-9291-BF22023F0AAA}</Project>
       <Name>FingersDance.Debug</Name>