--- a/src/FingersDance.Control.Menu/Item.cs Tue Sep 15 22:14:36 2009 +0200
+++ b/src/FingersDance.Control.Menu/Item.cs Tue Sep 15 22:34:02 2009 +0200
@@ -11,5 +11,6 @@
public List<Item> Items = new List<Item>();
public string Name = "";
public string Action = "";
+ public string Ressource = "";
}
}
--- a/src/FingersDance.Control.Menu/UserControlMenu.xaml Tue Sep 15 22:14:36 2009 +0200
+++ b/src/FingersDance.Control.Menu/UserControlMenu.xaml Tue Sep 15 22:34:02 2009 +0200
@@ -38,7 +38,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,1,1"/>
- <Setter Property="HorizontalContentAlignment" Value="Center"/>
+ <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="15,6,15,6"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -152,7 +152,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,1,1"/>
- <Setter Property="HorizontalContentAlignment" Value="Center"/>
+ <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="15,6,15,6"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -255,7 +255,7 @@
</Setter>
<Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="FontSize" Value="10"/>
- <Setter Property="Foreground" Value="#FF000000"/>
+ <Setter Property="Foreground" Value="#FFFF0000"/>
<Setter Property="Background" Value="#33A4B4BD"/>
<Setter Property="BorderBrush">
<Setter.Value>
@@ -266,7 +266,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,1,1"/>
- <Setter Property="HorizontalContentAlignment" Value="Center"/>
+ <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="15,6,15,6"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -380,7 +380,7 @@
</Setter.Value>
</Setter>
<Setter Property="BorderThickness" Value="1,1,1,1"/>
- <Setter Property="HorizontalContentAlignment" Value="Center"/>
+ <Setter Property="HorizontalContentAlignment" Value="Left"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="15,6,15,6"/>
<Setter Property="IsTabStop" Value="False"/>
@@ -468,14 +468,7 @@
</Style>
</UserControl.Resources>
- <StackPanel x:Name="LayoutRoot" Width="Auto" Height="Auto">
- <StackPanel.Background>
- <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
- <GradientStop Color="#FF000000" Offset="0"/>
- <GradientStop Color="#FF444444" Offset="0.991"/>
- <GradientStop Color="#FF757575" Offset="0.906"/>
- <GradientStop Color="#FF414141" Offset="0.772"/>
- </LinearGradientBrush>
- </StackPanel.Background>
+ <StackPanel x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}">
+
</StackPanel>
</UserControl>
\ No newline at end of file
--- a/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs Tue Sep 15 22:14:36 2009 +0200
+++ b/src/FingersDance.Control.Menu/UserControlMenu.xaml.cs Tue Sep 15 22:34:02 2009 +0200
@@ -56,6 +56,7 @@
StackPanel MItem = new StackPanel();
CustomSurfaceButton ItemButton = new CustomSurfaceButton();
ItemButton.Content = item.Name;
+ ItemButton.Style = (Style)FindResource(item.Ressource);
if (item.Items.Count > 0)
{
ItemButton.ContactDown += ButtonMenu_ContactDown;
@@ -76,7 +77,6 @@
else
{
ItemButton.Action = item.Action;
- ItemButton.Style = (Style)FindResource("FingersDanceAnnotationButtonNiveau4");
//ItemButton.ApplyTemplate();
//ItemButton.ContactDown += GenerateAction;
//ItemButton.Click += GenerateAction;
--- a/src/FingersDance/Resources/menu.xml Tue Sep 15 22:14:36 2009 +0200
+++ b/src/FingersDance/Resources/menu.xml Tue Sep 15 22:34:02 2009 +0200
@@ -10,14 +10,17 @@
<Item>
<Name>MouvCam1</Name>
<Items/>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
<Action>MouvCam1</Action>
</Item>
<Item>
<Name>MouvCam2</Name>
<Items/>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
<Action>MouvCam2</Action>
</Item>
</Items>
+ <Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
<Action>Cinematographique</Action>
</Item>
<Item>
@@ -26,24 +29,29 @@
<Item>
<Name>Axe camera1</Name>
<Items/>
- <Action>Axe camera1</Action>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+ <Action>Axecamera1</Action>
</Item>
<Item>
<Name>Axe camera2</Name>
<Items/>
- <Action>Axe camera2</Action>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+ <Action>Axecamera2</Action>
</Item>
<Item>
<Name>Axe camera3</Name>
<Items/>
- <Action>Axe camera3</Action>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+ <Action>Axecamera3</Action>
</Item>
<Item>
<Name>Axe camera4</Name>
<Items/>
- <Action>Axe camera4</Action>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
+ <Action>Axecamera4</Action>
</Item>
</Items>
+ <Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
<Action>Camera</Action>
</Item>
<Item>
@@ -52,22 +60,27 @@
<Item>
<Name>ChildChore1</Name>
<Items/>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
<Action>ChildChore1</Action>
</Item>
<Item>
<Name>ChildChore2</Name>
<Items/>
+ <Ressource>FingersDanceAnnotationButtonNiveau3</Ressource>
<Action>ChildChore2</Action>
</Item>
</Items>
+ <Ressource>FingersDanceAnnotationButtonNiveau2</Ressource>
<Action>Choregraphique</Action>
</Item>
</Items>
+ <Ressource>FingersDanceAnnotationButtonNiveau1</Ressource>
<Action>Annotation</Action>
</Item>
<Item>
<Name>ButtonRecherche</Name>
<Items/>
+ <Ressource>FingersDanceAnnotationButtonNiveau1</Ressource>
<Action>ButtonRecherche</Action>
</Item>
</Items>