# HG changeset patch # User PAMPHILE Jonathan # Date 1253737499 -7200 # Node ID 890824195ceb552aebdd75780fd53c85935ce6e1 # Parent 07972aa3f2e077e4780362bf7e0a30d254767235# Parent 5d6ebbd6557f9aeee5c34482331bc07a9c300878 ListVideo - Pivot - TimeLine diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.Ressource.xaml --- a/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.Ressource.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.Ressource.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -200,4 +200,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.Pivot/UserControlPivot.xaml --- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -6,7 +6,7 @@ mc:Ignorable="d" 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.Pivot.UserControlPivot" - x:Name="UserControl" Width="90" Height="90"> + x:Name="UserControl" Width="90" Height="90" Foreground="{x:Null}"> diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.Player/UserControlPlayer.xaml --- a/src/FingersDance.Control.Player/UserControlPlayer.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.Player/UserControlPlayer.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -4,21 +4,134 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" + 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" - Width="560" Height="400" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> + Width="560" Height="400"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - - - + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.Screen/UserControlScreen.xaml --- a/src/FingersDance.Control.Screen/UserControlScreen.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.Screen/UserControlScreen.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -8,7 +8,7 @@ xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel;assembly=FingersDance.Control.UserPanel" x:Class="FingersDance.Control.Screen.UserControlScreen" x:Name="UserControl" - d:DesignWidth="640" d:DesignHeight="480" Width="Auto" Height="Auto" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Background="#FF54FF00"> + d:DesignWidth="640" d:DesignHeight="480" Width="Auto" Height="Auto" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Background="{x:Null}"> diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/FForward.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/FForward.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/Pause.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/Pause.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/Play.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/Play.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/SliderPause.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/SliderPause.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/SliderPlay.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/SliderPlay.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/TimeLine.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.Ressources_files/TimeLine.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj --- a/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.TimeLine/FingersDance.Control.TimeLine.csproj Wed Sep 23 22:24:59 2009 +0200 @@ -25,6 +25,7 @@ OnBuildSuccess + 3.0.1927.0 true @@ -75,6 +76,10 @@ + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -116,6 +121,7 @@ + diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml --- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -4,15 +4,773 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" + xmlns:vw="clr-namespace:FingersDance.Views;assembly=FingersDance.Views" + 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.TimeLine.UserControlTimeLine" - xmlns:vw="clr-namespace:FingersDance.Views;assembly=FingersDance.Views" x:Name="UserControl" - d:DesignWidth="383" xmlns:Custom="http://schemas.microsoft.com/surface/2008" Background="{x:Null}" d:DesignHeight="33"> + d:DesignWidth="383" Background="{x:Null}" d:DesignHeight="33"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" /> \ No newline at end of file diff -r 07972aa3f2e0 -r 890824195ceb src/FingersDance/App.xaml --- a/src/FingersDance/App.xaml Wed Sep 23 22:22:52 2009 +0200 +++ b/src/FingersDance/App.xaml Wed Sep 23 22:24:59 2009 +0200 @@ -8,6 +8,7 @@ +