--- a/src/FingersDance/MainSurfaceWindow.xaml Mon Nov 23 09:59:11 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml Mon Nov 23 16:16:21 2009 +0100
@@ -2,6 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:s="http://schemas.microsoft.com/surface/2008"
+ xmlns:System="clr-namespace:System;assembly=mscorlib"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel"
xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot"
@@ -17,10 +18,8 @@
Title="FingersDance"
Width="1024" Height="768" x:Name="mainSurfaceWindow"
Background="{x:Null}" Loaded="mainSurfaceWindow_Loaded"
-
-
>
- <s:SurfaceWindow.Resources>
+ <s:SurfaceWindow.Resources>
<ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
<Style x:Key="FingersDance.Control.ScatterView" TargetType="{x:Type s:ScatterViewItem}">
<Setter Property="Background">
@@ -124,7 +123,7 @@
</Setter.Value>
</Setter>
</Style>
- </s:SurfaceWindow.Resources>
+ </s:SurfaceWindow.Resources>
<s:SurfaceWindow.Triggers>
<EventTrigger RoutedEvent="FrameworkElement.Loaded"/>
</s:SurfaceWindow.Triggers>
@@ -140,9 +139,14 @@
<TranslateTransform X="0" Y="0"/>
</TransformGroup>
</Grid.RenderTransform>
-
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF" x:Name="rect1" StrokeThickness="0.1"/>
- </Grid>
+ <s:SurfaceButton x:Name="CreditsButton1" Background="Black" Foreground="White" Content="Crédits" HorizontalAlignment="Center" VerticalAlignment="Bottom" Panel.ZIndex="100"
+ Click="CreditsButton_ContactDown" ContactDown="CreditsButton_ContactDown"/>
+ <s:SurfaceScrollViewer x:Name="CreditsScroll1" Margin="50,20,30,30" HorizontalScrollBarVisibility="Disabled" Visibility="Hidden" Panel.ZIndex="101">
+ <TextBlock x:Name="CreditsText1" Text="Crédits" Foreground="White"
+ FontSize="12" TextWrapping="Wrap" Background="Black"></TextBlock>
+ </s:SurfaceScrollViewer>
+ </Grid>
<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid2" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}" RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform>
<TransformGroup>
@@ -152,9 +156,14 @@
<TranslateTransform X="0" Y="0"/>
</TransformGroup>
</Grid.RenderTransform>
-
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF" x:Name="rect2" StrokeThickness="0.1"/>
- </Grid>
+ <s:SurfaceButton x:Name="CreditsButton2" Background="Black" Foreground="White" Content="Crédits" HorizontalAlignment="Center" VerticalAlignment="Bottom" Panel.ZIndex="100"
+ Click="CreditsButton_ContactDown" ContactDown="CreditsButton_ContactDown"/>
+ <s:SurfaceScrollViewer x:Name="CreditsScroll2" Margin="50,20,30,30" HorizontalScrollBarVisibility="Disabled" Visibility="Hidden" Panel.ZIndex="101">
+ <TextBlock x:Name="CreditsText2" Text="Crédits" Foreground="White"
+ FontSize="12" TextWrapping="Wrap" Background="Black"></TextBlock>
+ </s:SurfaceScrollViewer>
+ </Grid>
<Grid RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" Margin="0,0,0,0" x:Name="Grid3" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
<Grid.RenderTransform>
<TransformGroup>
@@ -165,17 +174,26 @@
</TransformGroup>
</Grid.RenderTransform>
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF" x:Name="rect3" StrokeThickness="0.1"/>
-
- </Grid>
+ <s:SurfaceButton x:Name="CreditsButton3" Background="Black" Foreground="White" Content="Crédits" HorizontalAlignment="Center" VerticalAlignment="Bottom" Panel.ZIndex="100"
+ Click="CreditsButton_ContactDown" ContactDown="CreditsButton_ContactDown"/>
+ <s:SurfaceScrollViewer x:Name="CreditsScroll3" Margin="50,20,30,30" HorizontalScrollBarVisibility="Disabled" Visibility="Hidden" Panel.ZIndex="101">
+ <TextBlock x:Name="CreditsText3" Text="Crédits" Foreground="White"
+ FontSize="12" TextWrapping="Wrap" Background="Black"></TextBlock>
+ </s:SurfaceScrollViewer>
+ </Grid>
<Grid HorizontalAlignment="Right" Margin="0,0,0,0" x:Name="Grid4" VerticalAlignment="Bottom" Width="100" Height="100" Background="{x:Null}">
-
<Rectangle Fill="{x:Null}" Stroke="#FFFFFFFF" x:Name="rect4" StrokeThickness="0.1"/>
- </Grid>
+ <s:SurfaceButton x:Name="CreditsButton4" Background="Black" Foreground="White" Content="Crédits" HorizontalAlignment="Center" VerticalAlignment="Bottom" Panel.ZIndex="100"
+ Click="CreditsButton_ContactDown" ContactDown="CreditsButton_ContactDown"/>
+ <s:SurfaceScrollViewer x:Name="CreditsScroll4" Margin="50,20,30,30" HorizontalScrollBarVisibility="Disabled" Visibility="Hidden" Panel.ZIndex="101">
+ <TextBlock x:Name="CreditsText4" Text="Crédits"
+ FontSize="12" TextWrapping="Wrap" Background="Black"></TextBlock>
+ </s:SurfaceScrollViewer>
+ </Grid>
<s:ScatterView x:Name="scaterview" ContactChanged="scaterview_ContactChanged">
<s:ScatterViewItem Center="512,384" CanMove="True" CanRotate="False" CanScale="False" Background="{x:Null}" x:Name="ScatterViewItemPivot" ContactChanged="ScatterViewItemPivot_ContactChanged" Style="{DynamicResource FingersDance.Control.ScatterView}" BorderBrush="{x:Null}" Foreground="{x:Null}" >
<FingersDance_Control_Pivot:UserControlPivot x:Name="UserControlPivot" EH_SurfaceButtonPlayer_ContactDown="UserControlPivot_EH_SurfaceButtonPlayer_ContactDown"/>
</s:ScatterViewItem>
</s:ScatterView>
-
- </Grid>
+ </Grid>
</s:SurfaceWindow>
--- a/src/FingersDance/MainSurfaceWindow.xaml.cs Mon Nov 23 09:59:11 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml.cs Mon Nov 23 16:16:21 2009 +0100
@@ -56,6 +56,9 @@
InitGridPositions();
// Add handlers for Application activation events
AddActivationHandlers();
+ // Add credit text
+ CreditsText1.Text = CreditsText2.Text = CreditsText3.Text = CreditsText4.Text =
+ "MICROSOFT :\nPierre-Louis Xech\n\nEFREI :\nSantiago Aria\nRiley Ikni\nJonathan Pamphile\nAmine Tarari\n\nSTRATE COLLEGE :\nAnnabelle Eugénia\nHuieun Kim\nBaptiste Lanne\nIoana Ocnarescu\nVanessa Reiser\nDominique Sciamma\n\nINSTITUT DE RECHERCHE ET D'INNOVATION\nThibaut Cavalié\nYves-Marie Haussonne\nVincent Puig";
}
#endregion
@@ -296,7 +299,7 @@
switch ((int)sender)
{
case 1:
- if (Panel1 == null && Grid1.Children.Count == 1)
+ if (Panel1 == null && Grid1.Children.Count == 3)
{
//1-Creation du control Screen
UserControlScreen Screen = new UserControlScreen(1, _mainviewmodel);
@@ -309,7 +312,7 @@
}
else //Affichage du message de confirmation
{
- if (Panel1 != null && Grid1.Children.Count == 2)
+ if (Panel1 != null && Grid1.Children.Count == 4)
{
UserControlClose UCclose = new UserControlClose(1, "Êtes-vous sûr de vouloir quitter ?");
UCclose.Name = "CloseAlert1";
@@ -319,7 +322,7 @@
}
break;
case 2:
- if (Panel2 == null && Grid2.Children.Count == 1)
+ if (Panel2 == null && Grid2.Children.Count == 3)
{
//1-Creation du control Screen
UserControlScreen Screen = new UserControlScreen(2, _mainviewmodel);
@@ -332,7 +335,7 @@
}
else //Affichage du message de confirmation
{
- if (Panel2 != null && Grid2.Children.Count == 2)
+ if (Panel2 != null && Grid2.Children.Count == 4)
{
UserControlClose UCclose = new UserControlClose(2, "Êtes-vous sûr de vouloir quitter ?");
UCclose.Name = "CloseAlert2";
@@ -342,7 +345,7 @@
}
break;
case 3:
- if (Panel3 == null && Grid3.Children.Count == 1)
+ if (Panel3 == null && Grid3.Children.Count == 3)
{
//1-Creation du control Screen
UserControlScreen Screen = new UserControlScreen(3, _mainviewmodel);
@@ -355,7 +358,7 @@
}
else //Affichage du message de confirmation
{
- if (Panel3 != null && Grid3.Children.Count == 2)
+ if (Panel3 != null && Grid3.Children.Count == 4)
{
UserControlClose UCclose = new UserControlClose(3, "Êtes-vous sûr de vouloir quitter ?");
UCclose.Name = "CloseAlert3";
@@ -365,7 +368,7 @@
}
break;
case 4:
- if (Panel4 == null && Grid4.Children.Count == 1)
+ if (Panel4 == null && Grid4.Children.Count == 3)
{
//1-Creation du control Screen
UserControlScreen Screen = new UserControlScreen(4, _mainviewmodel);
@@ -378,7 +381,7 @@
}
else //Affichage du message de confirmation
{
- if (Panel4 != null && Grid4.Children.Count == 2)
+ if (Panel4 != null && Grid4.Children.Count == 4)
{
UserControlClose UCclose = new UserControlClose(4, "Êtes-vous sûr de vouloir quitter ?");
UCclose.Name = "CloseAlert4";
@@ -626,5 +629,26 @@
}
}
+
+ private void CreditsButton_ContactDown(object sender, EventArgs e)
+ {
+ Console.WriteLine("CreditsButton_ContactDown");
+ if(sender==CreditsButton1)
+ {
+ CreditsScroll1.Visibility = (CreditsScroll1.Visibility == Visibility.Hidden) ? Visibility.Visible : Visibility.Hidden;
+ }
+ else if (sender == CreditsButton2)
+ {
+ CreditsScroll2.Visibility = (CreditsScroll2.Visibility == Visibility.Hidden) ? Visibility.Visible : Visibility.Hidden;
+ }
+ else if (sender == CreditsButton3)
+ {
+ CreditsScroll3.Visibility = (CreditsScroll3.Visibility == Visibility.Hidden) ? Visibility.Visible : Visibility.Hidden;
+ }
+ else if (sender == CreditsButton4)
+ {
+ CreditsScroll4.Visibility = (CreditsScroll4.Visibility == Visibility.Hidden) ? Visibility.Visible : Visibility.Hidden;
+ }
+ }
}
}
\ No newline at end of file