# HG changeset patch # User riley # Date 1253798512 -7200 # Node ID 9dfc0ee0ab177c5bc61f395b4209ecec77078bee # Parent 13930076a06c4366d55c2d457cd0b43405b2daaa Update Pivot(disbled effects) add Session input design diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj --- a/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj Thu Sep 24 10:42:34 2009 +0200 +++ b/src/FingersDance.Control.SessionInput/FingersDance.Control.SessionInput.csproj Thu Sep 24 15:21:52 2009 +0200 @@ -25,6 +25,7 @@ OnBuildSuccess + 3.0.1927.0 true @@ -58,6 +59,10 @@ + + MSBuild:Compile + Designer + MSBuild:Compile Designer @@ -99,6 +104,7 @@ + diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml --- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Sep 24 10:42:34 2009 +0200 +++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -4,30 +4,340 @@ 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.SessionInput.UserControlSessionInput" x:Name="UserControl" - Background="#FFA09E9E" Width="256" Height="192" xmlns:Custom="http://schemas.microsoft.com/surface/2008"> + Background="#FFA09E9E" Width="256" Height="192"> - - - \ No newline at end of file diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/ConfirmationTick.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/ConfirmationTick.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/ConfirmationTick_files/image1.png Binary file src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/ConfirmationTick_files/image1.png has changed diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/SessionInput_Background.xaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/FingersDance.Control.SessionInput/fingersDance.Control.SessionInput.ressources_files/SessionInput_Background.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance/App.xaml --- a/src/FingersDance/App.xaml Thu Sep 24 10:42:34 2009 +0200 +++ b/src/FingersDance/App.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -9,6 +9,7 @@ + diff -r 13930076a06c -r 9dfc0ee0ab17 src/FingersDance/MainSurfaceWindow.xaml --- a/src/FingersDance/MainSurfaceWindow.xaml Thu Sep 24 10:42:34 2009 +0200 +++ b/src/FingersDance/MainSurfaceWindow.xaml Thu Sep 24 15:21:52 2009 +0200 @@ -7,16 +7,123 @@ xmlns:FingersDance_Control_Pivot="clr-namespace:FingersDance.Control.Pivot;assembly=FingersDance.Control.Pivot" + xmlns:FingersDance_Control_SessionInput1="clr-namespace:FingersDance.Control.SessionInput;assembly=FingersDance.Control.SaisieSeance" + + + xmlns:Microsoft_Surface_Presentation_Generic="clr-namespace:Microsoft.Surface.Presentation.Generic;assembly=Microsoft.Surface.Presentation.Generic" + + x:Class="FingersDance.SurfaceWindow1" Title="FingersDance" Width="1024" Height="768" x:Name="mainSurfaceWindow" Background="{x:Null}" - xmlns:FingersDance_Control_SessionInput1="clr-namespace:FingersDance.Control.SessionInput;assembly=FingersDance.Control.SaisieSeance" > + @@ -69,7 +176,7 @@ - +