Mercurial Mercurial > fingersdance / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Menu XML modifications
authorARIAS Santiago
Sun, 25 Oct 2009 19:59:28 +0100
changeset 172 e408e158c1a2
parent 171 171e466b80d1
child 173 e99fe78cd168
Menu XML modifications
src/FingersDance.Control.Player/UserControlInfoUser.xaml file | annotate | diff | comparison | revisions
src/FingersDance.Control.Player/UserControlPlayer.xaml file | annotate | diff | comparison | revisions
src/FingersDance/Resources/menu.xml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.Player/UserControlInfoUser.xaml	Sun Oct 25 19:26:37 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlInfoUser.xaml	Sun Oct 25 19:59:28 2009 +0100
@@ -5,10 +5,10 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d"
 	x:Class="FingersDance.Control.Player.UserControlInfoUser"
-	x:Name="UserControl" Background="#CCC2C2C2">
+	x:Name="UserControl" Background="#CCC2C2C2" Height="40">
 
 	<StackPanel x:Name="LayoutRoot" Orientation="Horizontal">
-		<Label x:Name="LabelSession" Width="Auto" Height="Auto" FontFamily="Arial"  FontSize="14" Content="" Foreground="#FFFFFFFF" />
-		<Label x:Name="LabelUser" Width="Auto" Height="Auto" FontFamily="Arial"  FontSize="14" Content="" Foreground="#FFFFFFFF" />
+		<Label x:Name="LabelSession" Width="Auto" Height="Auto" FontFamily="Arial"  FontSize="12" Content="" Foreground="#FFFFFFFF" />
+		<Label x:Name="LabelUser" Width="Auto" Height="Auto" FontFamily="Arial"  FontSize="12" Content="" Foreground="#FFFFFFFF" />
 	</StackPanel>
 </UserControl>
\ No newline at end of file
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml	Sun Oct 25 19:26:37 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml	Sun Oct 25 19:59:28 2009 +0100
@@ -172,7 +172,7 @@
     				<ColumnDefinition Width="0.912*"/>
     				<ColumnDefinition Width="0.088*"/>
     			</Grid.ColumnDefinitions>
-    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-4.398,0,7.398" x:Name="usercontrolInfoUser" Grid.ColumnSpan="1" Grid.Row="1"/>
+    			<FingersDance_Control_Player:UserControlInfoUser Margin="0,-4.398,0,7.398" x:Name="usercontrolInfoUser" Grid.ColumnSpan="1" Grid.Row="1" Height="30"/>
     			<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="#FFFFFFFF" BorderBrush="{x:Null}" 
--- a/src/FingersDance/Resources/menu.xml	Sun Oct 25 19:26:37 2009 +0100
+++ b/src/FingersDance/Resources/menu.xml	Sun Oct 25 19:59:28 2009 +0100
@@ -76,6 +76,160 @@
 							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
 							<Action>ActionStartOrEndAnnotation</Action>
 						</Item>
+            <Item>
+              <Name>Grammaire Chorégraphique</Name>
+              <Items>
+                <Item>
+                  <Name>1 danseur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>2 danseur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>3 danseur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>4 danseur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Tous les danseurs</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Mouvement Rotatif</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Contact Table/Danseur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+              </Items>
+              <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+              <Action>Grammaire Chorégraphique</Action>
+            </Item>
+            <Item>
+              <Name>Personnages</Name>
+              <Items>
+                <Item>
+                  <Name>Trigger</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Jeux de contre point</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Glissades</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Choutes contre la pesanteur</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Alignements</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Contact visuel</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Mouvement contraintes</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>U-ing @ O-wing (détourage)</Name>
+               <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+             </Items>
+              <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+              <Action>Personnage</Action>
+            </Item>
+            <Item>
+              <Name>Objets</Name>
+              <Items>
+                <Item>
+                  <Name>Une</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Deux</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Trois</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Toutes</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+              </Items>
+              <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+              <Action>Objets</Action>
+            </Item>
+            <Item>
+              <Name>Les alignements des tables</Name>
+              <Items>
+                <Item>
+                  <Name>Sous la table</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+                <Item>
+                  <Name>Sur la table</Name>
+                  <Items/>
+                  <Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+                  <Action>ActionStartOrEndAnnotation</Action>
+                </Item>
+              </Items>
+              <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+              <Action>Les alignements des tables</Action>
+            </Item>
 					</Items>
 					<Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
 					<Action>Choregraphique</Action>
fingersdance