# HG changeset patch
# User PAMPHILE Jonathan <pamphile@efrei.fr>
# Date 1253049195 -7200
# Node ID 3ec392c8f45bb8c7c99bad928d89324cf0f27ac9
# Parent  91b5a333614d41acb9f5ccc52475ff1f46ba700c
Menu

diff -r 91b5a333614d -r 3ec392c8f45b src/FingersDance.Control.Menu/UserControlMenu.xaml.cs
--- a/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs	Tue Sep 15 22:34:02 2009 +0200
+++ b/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs	Tue Sep 15 23:13:15 2009 +0200
@@ -63,23 +63,19 @@
                      ItemButton.Click += ButtonMenu_ContactDown;
                      MItem.Children.Add(ItemButton);
                      StackPanel Temp = new StackPanel();
-                     Temp.Margin = new Thickness(15,0,0,0);
                      foreach (Item elt in item.Items)
                          try
                          {
                              Temp.Children.Add(CreateMenuItem(elt));
                          }
                          catch (Exception) { }
-                     Temp.Name = ItemButton.Content + "Panel";
+                     Temp.Name = ItemButton.Content.ToString().Replace(' ', '_') + "Panel";
                      Temp.Visibility = Visibility.Collapsed;
                      MItem.Children.Add(Temp);
                  }
                  else
                  {
                      ItemButton.Action = item.Action;
-                     //ItemButton.ApplyTemplate();
-                     //ItemButton.ContactDown += GenerateAction;
-                     //ItemButton.Click += GenerateAction;
                      MItem.Children.Add(ItemButton);
                  }
                  return MItem;
@@ -89,34 +85,13 @@
                  throw ex;
              }
          }
-        
-        /*
-         *  Déplacé dans le CustomSurfaceButton
-         
-         private void GenerateAction(Object sender, RoutedEventArgs Event)
-         {
-             try
-             {
-                 ActionFactory.ActionGenerator AG = (new ActionFactory.ActionFactory()).GetGenerator();
-                 FingersDance.Actions.ActionBase action = AG.GetAction("Action" + ((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Content, null);
-                 if (action != null)
-                 {
-                     //action.Execute();
-                     //this.debug.addToList(action.GetType().ToString());
-                 }
-             }
-             catch (Exception e) { }
-         }
-         
-         * 
-         */
 
          private void ButtonMenu_ContactDown(object sender, RoutedEventArgs e)
          {
              foreach (UIElement Child in ((Panel)((CustomSurfaceButton)sender).Parent).Children)
                  try
                  {
-                     if (((StackPanel)Child).Name.Equals(((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Content + "Panel"))
+                     if (((StackPanel)Child).Name.Equals(((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Content.ToString().Replace(' ', '_') + "Panel"))
                      {
                          if (((StackPanel)Child).Visibility == Visibility.Collapsed)
                          {
diff -r 91b5a333614d -r 3ec392c8f45b src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs	Tue Sep 15 22:34:02 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml.cs	Tue Sep 15 23:13:15 2009 +0200
@@ -20,7 +20,7 @@
 		public UserControlPivot()
 		{
 			this.InitializeComponent();
-
+            
 			// Insert code required on object creation below this point.
 		}
 
diff -r 91b5a333614d -r 3ec392c8f45b src/FingersDance/Resources/menu.xml
--- a/src/FingersDance/Resources/menu.xml	Tue Sep 15 22:34:02 2009 +0200
+++ b/src/FingersDance/Resources/menu.xml	Tue Sep 15 23:13:15 2009 +0200
@@ -8,52 +8,59 @@
 					<Name>Cinematographique</Name>
 					<Items>
 						<Item>
-							<Name>MouvCam1</Name>
-							<Items/>
+							<Name>Mouv Camera</Name>
+							<Items>
+								<Item>
+									<Name>MouvCam1</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>MouvCam1</Action>
+								</Item>
+								<Item>
+									<Name>MouvCam2</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>MouvCam2</Action>
+								</Item>
+							</Items>
 							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>MouvCam1</Action>
+							<Action>MouvCam</Action>
 						</Item>
 						<Item>
-							<Name>MouvCam2</Name>
-							<Items/>
+							<Name>Axe de Camera</Name>
+							<Items>
+								<Item>
+									<Name>Axe camera1</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>Axecamera1</Action>
+								</Item>
+								<Item>
+									<Name>Axe camera2</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>Axecamera2</Action>
+								</Item>
+								<Item>
+									<Name>Axe camera3</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>Axecamera3</Action>
+								</Item>
+								<Item>
+									<Name>Axe camera4</Name>
+									<Items/>
+									<Ressource>FingersDanceAnnotationButtonNiveau4</Ressource>
+									<Action>Axecamera4</Action>
+								</Item>
+							</Items>
 							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>MouvCam2</Action>
+							<Action>Axecamera</Action>
 						</Item>
 					</Items>
 					<Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
 					<Action>Cinematographique</Action>
-				</Item>
-				<Item>
-					<Name>Camera</Name>
-					<Items>
-						<Item>
-							<Name>Axe camera1</Name>
-							<Items/>
-							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>Axecamera1</Action>
-						</Item>
-						<Item>
-							<Name>Axe camera2</Name>
-							<Items/>
-							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>Axecamera2</Action>
-						</Item>
-						<Item>
-							<Name>Axe camera3</Name>
-							<Items/>
-							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>Axecamera3</Action>
-						</Item>
-						<Item>
-							<Name>Axe camera4</Name>
-							<Items/>
-							<Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
-							<Action>Axecamera4</Action>
-						</Item>
-					</Items>
-					<Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
-					<Action>Camera</Action>
-				</Item>
+				</Item>						
 				<Item>
 					<Name>Choregraphique</Name>
 					<Items>