--- a/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs	Wed Sep 16 08:34:32 2009 +0200
+++ b/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs	Wed Sep 16 09:07:27 2009 +0200
@@ -54,29 +54,28 @@
              try
              {
                  StackPanel MItem = new StackPanel();
-                 Microsoft.Surface.Presentation.Controls.SurfaceButton ItemButton = new Microsoft.Surface.Presentation.Controls.SurfaceButton();
+                 CustomSurfaceButton ItemButton = new CustomSurfaceButton();
                  ItemButton.Content = item.Name;
+                 ItemButton.Style = (Style)FindResource(item.Ressource);
                  if (item.Items.Count > 0)
                  {
                      ItemButton.ContactDown += ButtonMenu_ContactDown;
                      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.ContactDown += GenerateAction;
-                     ItemButton.Click += GenerateAction;
+                     ItemButton.Action = item.Action;
                      MItem.Children.Add(ItemButton);
                  }
                  return MItem;
@@ -87,27 +86,12 @@
              }
          }
 
-         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)((Microsoft.Surface.Presentation.Controls.SurfaceButton)sender).Parent).Children)
+             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)
                          {