--- a/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj Sun Oct 25 12:55:07 2009 +0100
+++ b/src/FingersDance.Control.Player/FingersDance.Control.Player.csproj Sun Oct 25 19:26:16 2009 +0100
@@ -90,10 +90,17 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="UserControlInfoUser.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="UserControlPlayer.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Compile Include="UserControlInfoUser.xaml.cs">
+ <DependentUpon>UserControlInfoUser.xaml</DependentUpon>
+ </Compile>
<Compile Include="UserControlPlayer.xaml.cs">
<DependentUpon>UserControlPlayer.xaml</DependentUpon>
</Compile>
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml Sun Oct 25 12:55:07 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml Sun Oct 25 19:26:16 2009 +0100
@@ -7,7 +7,7 @@
xmlns:Custom="http://schemas.microsoft.com/surface/2008" xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic"
x:Class="FingersDance.Control.Player.UserControlPlayer"
x:Name="UserControl" AllowDrop="True" Custom:SurfaceDragDrop.DragOver="Play_Pause_area_DragOver" Custom:SurfaceDragDrop.DragEnter="Play_Pause_area_DragEnter" Custom:SurfaceDragDrop.DragLeave="Play_Pause_area_DragLeave" Custom:SurfaceDragDrop.Drop="Play_Pause_area_Drop"
- Width="560" Height="400">
+ Width="560" Height="400" xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player">
<UserControl.Resources>
<Storyboard x:Key="OnClick1"/>
<Style x:Key="FingersDance.Control.PlayerButton" TargetType="{x:Type Custom:SurfaceButton}">
@@ -161,19 +161,28 @@
<BeginStoryboard Storyboard="{StaticResource Rect4Annotation}"/>
</EventTrigger>
</UserControl.Triggers>
- <Grid x:Name="LayoutRoot" Width="{Binding ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding ActualHeight, ElementName=UserControl, Mode=Default}" Background="{x:Null}">
- <Viewbox Margin="0,0,0,0" Width="{Binding ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding ActualHeight, ElementName=UserControl, Mode=Default}" Stretch="Uniform" AllowDrop="True">
+ <Grid x:Name="LayoutRoot" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Background="{x:Null}">
+ <Viewbox Margin="0,0,0,0" Width="{Binding Path=ActualWidth, ElementName=UserControl, Mode=Default}" Height="{Binding Path=ActualHeight, ElementName=UserControl, Mode=Default}" Stretch="Uniform" AllowDrop="True">
<Grid Width="560" Height="400" HorizontalAlignment="Left" x:Name="GridPlayer">
- <MediaElement x:Name="MediaElementVideo" MediaOpened="MediaElementVideo_MediaOpened" Stretch="Fill" ScrubbingEnabled="False" StretchDirection="Both" Margin="0,0,50,0" />
+ <Grid.RowDefinitions>
+ <RowDefinition Height="0.898*"/>
+ <RowDefinition Height="0.102*"/>
+ </Grid.RowDefinitions>
+ <Grid.ColumnDefinitions>
+ <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"/>
+ <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}"
- Opacity="0" Width="72" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.PlayerButton}" Margin="0,0,0,0"/>
+ Opacity="0" Style="{DynamicResource FingersDance.Control.PlayerButton}" HorizontalAlignment="Left" Width="72"/>
<Custom:SurfaceButton x:Name="Fast_Forward_area" Content="" ContactDown="ButtonFastForward_ContactDown" Click="ButtonFastForward_Click"
- Foreground="{x:Null}" Background="#FFFFFFFF" BorderBrush="{x:Null}" Opacity="0" Width="72" HorizontalAlignment="Right"
- Style="{DynamicResource FingersDance.Control.PlayerButton}" Margin="0,0,54,0"/>
+ Foreground="{x:Null}" Background="#FFFFFFFF" BorderBrush="{x:Null}" Opacity="0"
+ Style="{DynamicResource FingersDance.Control.PlayerButton}" HorizontalAlignment="Right" Width="72"/>
<Custom:SurfaceButton x:Name="Play_Pause_area" ContactDown="ButtonPlayPause_ContactDown" Click="ButtonPlayPause_Click" Foreground="{x:Null}"
- Background="#FFFFFFFF" BorderBrush="{x:Null}" Margin="72,0,126,0" Style="{DynamicResource FingersDance.Control.PlayerButton}" Opacity="0"/>
- <StackPanel Opacity="1" HorizontalAlignment="Right" Width="50" Background="{x:Null}" x:Name="StackPanelAnnotation" VerticalAlignment="Bottom" Height="Auto">
+ Background="#FFFFFFFF" BorderBrush="{x:Null}" Style="{DynamicResource FingersDance.Control.PlayerButton}" Opacity="0" Margin="72,0,72,0"/>
+ <StackPanel Opacity="1" Background="{x:Null}" x:Name="StackPanelAnnotation" Height="Auto" d:LayoutOverrides="Height" Margin="-1,-159.4,0,0" Grid.Column="1" Grid.Row="1" Grid.RowSpan="1">
<Rectangle x:Name="rect1" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
<Rectangle x:Name="rect2" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
<Rectangle x:Name="rect3" Width="50" Height="50" Fill="{x:Null}" Stroke="#FF000000"/>
--- a/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Sun Oct 25 12:55:07 2009 +0100
+++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml.cs Sun Oct 25 19:26:16 2009 +0100
@@ -31,12 +31,17 @@
public event EventHandler PlayerOpened;
public event EventHandler PlayerStopOrPause;
+ #region constructors
public UserControlPlayer()
{
this.InitializeComponent();
MediaElementVideo.LoadedBehavior = MediaState.Manual;
MediaElementVideo.UnloadedBehavior = MediaState.Manual;
+ usercontrolInfoUser.LabelSession.Content = "Seance Test";
+ usercontrolInfoUser.LabelUser.Content = "User Test";
}
+ #endregion
+
#region Properties
public double TotalMilliseconds
--- a/src/FingersDance/MainSurfaceWindow.xaml Sun Oct 25 12:55:07 2009 +0100
+++ b/src/FingersDance/MainSurfaceWindow.xaml Sun Oct 25 19:26:16 2009 +0100
@@ -129,14 +129,7 @@
<EventTrigger RoutedEvent="FrameworkElement.Loaded"/>
</s:SurfaceWindow.Triggers>
- <Grid x:Name="MainGrid" Width="1024" Height="768" >
- <Grid.Background>
- <LinearGradientBrush EndPoint="0.505,0.985" StartPoint="0.505,-0.015">
- <GradientStop Color="#FF000000" Offset="0"/>
- <GradientStop Color="#FF2A2A2A" Offset="0.544"/>
- <GradientStop Color="#FF000000" Offset="1"/>
- </LinearGradientBrush>
- </Grid.Background>
+ <Grid x:Name="MainGrid" Width="1024" Height="768" Background="#FF000000" >
<Grid HorizontalAlignment="Left" x:Name="Grid1" VerticalAlignment="Top" Width="100" Height="100" Background="{x:Null}" RenderTransformOrigin="0.5,0.5">
<Grid.RenderTransform>