# HG changeset patch
# User ymh
# Date 1253084847 -7200
# Node ID 5f547156bda62dd50d198d6d36f9bf15de6c02ab
# Parent  70cca06f0a323b83b10f8868a5ce1316cd9d202f# Parent  3de4c1346bf474960f052aa4c97a007c624a8bf4
Merge from tip

diff -r 3de4c1346bf4 -r 5f547156bda6 src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.csproj
--- a/src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.csproj	Wed Sep 16 00:14:08 2009 +0200
+++ b/src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.csproj	Wed Sep 16 09:07:27 2009 +0200
@@ -110,7 +110,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Resource Include="Resources\SurfaceWindow1Background.jpg" />
-    <Resource Include="FingersDance.Control.SyncSource.xml" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\WindowBackground.jpg" />
diff -r 3de4c1346bf4 -r 5f547156bda6 src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.xml
--- a/src/FingersDance.Control.SyncSource/FingersDance.Control.SyncSource.xml	Wed Sep 16 00:14:08 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-This file contains the information needed to install your application
-with the Surface Shell. Please refer to the documentation for deployment
-instructions.
--->
-<ss:ApplicationInfo
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ss="http://schemas.microsoft.com/Surface/2007/ApplicationMetadata">
-  <Application>
-    <Title>FingersDance.Control.SyncSource</Title>
-    <Description>FingersDance.Control.SyncSource</Description>
-    <ExecutableFile>FingersDance.Control.SyncSource.exe</ExecutableFile>
-    <Arguments></Arguments>
-    <IconImageFile>Resources\icon.png</IconImageFile>
-    <Preview>
-      <PreviewImageFile>Resources\iconPreview.png</PreviewImageFile>
-    </Preview>
-    <Tags>
-      <!--
-      If your application uses tagged objects, please uncomment this section to register the tags with the Shell. 
-      You can register ByteTag(s), IdentityTag(s) or both by using the appropriate instructions below.
-      -->
-      <!--
-      To register ByteTags:
-      1. Please uncomment the Byte Tag Element below.
-      2. Replace "C0" below with the value of your Byte Tag (in hexadecimal format). Repeat this section (this element and its children) for other Byte Tags
-      3. Please remove the Launch element if you do not want to register the tag with Object Routing.
-      -->
-      <!--
-      <ByteTag Value="C0">
-        <Actions>
-          <Launch />
-        </Actions>
-      </ByteTag>
-      -->
-      <!--
-      To register IdentityTags:
-      1. Please uncomment the Identity Tag Element below.
-      2. Replace "0000000000000000" below with the series of your Identity Tag (in hexadecimal format). Repeat this section (this element and its children) for other Identity Tags
-      3. Please remove the Launch element if you do not want to register the tag with Object Routing.
-      -->
-      <!--
-      <IdentityTag Series="0000000000000000">
-        <Actions>
-          <Launch /> 
-        </Actions>
-      </IdentityTag>
-      -->
-    </Tags>
-  </Application>
-
-  <!--
-  Uncomment this section and comment out the Application element above
-  if you are creating an Attract Mode Application.
-  -->
-  <!--
-  <AttractApplication>
-    <ExecutableFile>FingersDance.Control.SyncSource.exe</ExecutableFile>
-    <Arguments></Arguments>
-  </AttractApplication>
-  -->
-</ss:ApplicationInfo>
\ No newline at end of file
diff -r 3de4c1346bf4 -r 5f547156bda6 test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj
--- a/test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj	Wed Sep 16 00:14:08 2009 +0200
+++ b/test/Control.UserPanel.Test/Control.UserPanel.Test/Control.UserPanel.Test.csproj	Wed Sep 16 09:07:27 2009 +0200
@@ -103,6 +103,9 @@
     <Content Include="Resources\Lake.wmv">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\menu.xml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Resource Include="Control.UserPanel.Test.xml" />
   </ItemGroup>
   <ItemGroup>
diff -r 3de4c1346bf4 -r 5f547156bda6 test/Control.UserPanel.Test/Control.UserPanel.Test/Resources/menu.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/Control.UserPanel.Test/Control.UserPanel.Test/Resources/menu.xml	Wed Sep 16 09:07:27 2009 +0200
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<Menu xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<Items>
+		<Item>
+			<Name>Annotation</Name>
+			<Items>
+				<Item>
+					<Name>Cinematographique</Name>
+					<Items>
+						<Item>
+							<Name>MouvCam1</Name>
+							<Items/>
+							<Action>MouvCam1</Action>
+						</Item>
+						<Item>
+							<Name>MouvCam2</Name>
+							<Items/>
+							<Action>MouvCam2</Action>
+						</Item>
+					</Items>
+					<Action>Cinematographique</Action>
+				</Item>
+				<Item>
+					<Name>Camera</Name>
+					<Items>
+						<Item>
+							<Name>Axe camera1</Name>
+							<Items/>
+							<Action>Axe camera1</Action>
+						</Item>
+						<Item>
+							<Name>Axe camera2</Name>
+							<Items/>
+							<Action>Axe camera2</Action>
+						</Item>
+						<Item>
+							<Name>Axe camera3</Name>
+							<Items/>
+							<Action>Axe camera3</Action>
+						</Item>
+						<Item>
+							<Name>Axe camera4</Name>
+							<Items/>
+							<Action>Axe camera4</Action>
+						</Item>
+					</Items>
+					<Action>Camera</Action>
+				</Item>
+				<Item>
+					<Name>Choregraphique</Name>
+					<Items>
+						<Item>
+							<Name>ChildChore1</Name>
+							<Items/>
+							<Action>ChildChore1</Action>
+						</Item>
+						<Item>
+							<Name>ChildChore2</Name>
+							<Items/>
+							<Action>ChildChore2</Action>
+						</Item>
+					</Items>
+					<Action>Choregraphique</Action>
+				</Item>
+			</Items>
+			<Action>Annotation</Action>
+		</Item>
+		<Item>
+			<Name>ButtonRecherche</Name>
+			<Items/>
+			<Action>ButtonRecherche</Action>
+		</Item>
+	</Items>
+</Menu>
\ No newline at end of file