Mercurial Mercurial > fingersdance / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pivot
authorPAMPHILE Jonathan <pamphile@efrei.fr>
Tue, 13 Oct 2009 19:09:46 +0200
changeset 142 3d66ca73df55
parent 124 14b058fc64fc
child 143 9f157d9c725b
Pivot
src/FingersDance.Control.Pivot/UserControlPivot.xaml file | annotate | diff | comparison | revisions
src/FingersDance.Data/FingersDance.Data.csproj file | annotate | diff | comparison | revisions
src/FingersDance/FingersDance.csproj file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Fri Sep 25 18:28:58 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Tue Oct 13 19:09:46 2009 +0200
@@ -137,9 +137,9 @@
 			<ColumnDefinition Width="0.506*"/>
 			<ColumnDefinition Width="0.494*"/>
 		</Grid.ColumnDefinitions>
-		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Fill="#FF706868" Margin="0.462,0,-0.462,0"/>
-		<Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource Color_7_#5A0FC8_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="2.303,1.451,2.236,0.639" Width="41" Height="43" Style="{DynamicResource FingersDance.Pivot.Button}"/>
-		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_6_#C80FA0_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="2.501,1.451,1.248,0.439" Width="41" Height="43" Style="{DynamicResource FingersDance.Pivot.Button}">
+		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Fill="#FF615E5E" Margin="0.462,0,-0.462,0"/>
+		<Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource Color_7_#5A0FC8_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="0.47,-5.377,-0.681,-5.83" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}"/>
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_6_#C80FA0_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="-0.875,-4.844,-0.416,-5.441" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="1"/>
@@ -149,7 +149,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_1_#FFFF00_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="2.303,0.593,2.167,1.317" Width="41" Height="43" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_1_#FFFF00_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="0.178,-4.737,-0.388,-4.103" Width="45.75" Style="{DynamicResource FingersDance.Pivot.Button}" Foreground="{x:Null}" >
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="1" ScaleY="-1"/>
@@ -159,7 +159,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_9_#0096FF__xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="2.212,0.809,1.248,1.317" Style="{DynamicResource FingersDance.Pivot.Button}" Width="41" Height="43">
+		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_9_#0096FF__xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="-0.788,-5.521,-0.502,-4.569" Style="{DynamicResource FingersDance.Pivot.Button}" Width="45.75">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="-1"/>
@@ -169,6 +169,6 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Ellipse Margin="0,0,-19,-19" StrokeThickness="0.5" Fill="#FF706868" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="40.655" Height="40.335"/>
+		<Ellipse Margin="-20.319,0,0,-19" StrokeThickness="0.5" Fill="Black" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="40.655" Height="40.335" Grid.Column="1"/>
 	</Grid>
 </UserControl>
\ No newline at end of file
--- a/src/FingersDance.Data/FingersDance.Data.csproj	Fri Sep 25 18:28:58 2009 +0200
+++ b/src/FingersDance.Data/FingersDance.Data.csproj	Tue Oct 13 19:09:46 2009 +0200
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EAF384DB-2AE4-4132-839D-60F9DAFDEAD8}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -71,6 +71,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="User.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/src/FingersDance/FingersDance.csproj	Fri Sep 25 18:28:58 2009 +0200
+++ b/src/FingersDance/FingersDance.csproj	Tue Oct 13 19:09:46 2009 +0200
@@ -136,9 +136,6 @@
     </Content>
     <Resource Include="Resources\oneflat.png" />
     <Content Include="Resources\oneflat.wmv" />
-    <Content Include="Resources\videos.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Resource Include="FingersDance.xml" />
   </ItemGroup>
   <ItemGroup>
fingersdance