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.
Design update (Controle Close, pivot)
authorriley
Thu, 24 Sep 2009 17:48:07 +0200
changeset 114 8262d9756231
parent 113 3c9ebcf59e64
child 115 1e87bcfec117
Design update (Controle Close, pivot)
src/FingersDance.Control.Close/UserControlClose.xaml file | annotate | diff | comparison | revisions
src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj file | annotate | diff | comparison | revisions
src/FingersDance.Control.Pivot/UserControlPivot.xaml file | annotate | diff | comparison | revisions 
--- a/src/FingersDance.Control.Close/UserControlClose.xaml	Thu Sep 24 17:39:19 2009 +0200
+++ b/src/FingersDance.Control.Close/UserControlClose.xaml	Thu Sep 24 17:48:07 2009 +0200
@@ -6,11 +6,11 @@
 	mc:Ignorable="d"
 	x:Class="FingersDance.Control.Close.UserControlClose"
 	x:Name="UserControl"
-	Width="383.284" Height="288.955" xmlns:Custom="http://schemas.microsoft.com/surface/2008">
+	Width="359.284" Height="210.955" xmlns:Custom="http://schemas.microsoft.com/surface/2008" BorderBrush="White">
 
-	<Grid x:Name="LayoutRoot" Background="#FFFFFFFF">
-		<Label Margin="88.06,56.717,131.858,0" VerticalAlignment="Top" Content="Label" Height="45.363" x:Name="LabelAlert"/>
-		<Custom:SurfaceButton VerticalAlignment="Bottom" Content="OK" Margin="191.045,0,100.029,105.224" d:LayoutOverrides="Width, Height" x:Name="SurfaceButtonOK"/>
-		<Custom:SurfaceButton HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="No" Margin="56.717,0,0,105.224" d:LayoutOverrides="Height" Width="85.754" x:Name="SurfaceButtonNO"/>
+	<Grid x:Name="LayoutRoot" Background="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}">
+		<Label Margin="88.06,56.717,76.029,0" VerticalAlignment="Top" Content="Estes-vous sure de vouloir quitter ?" Height="42.363" x:Name="LabelAlert" Foreground="White"/>
+		<Custom:SurfaceButton VerticalAlignment="Bottom" Content="Oui" Margin="81.604,0,0,27.224" x:Name="SurfaceButtonOK" HorizontalAlignment="Left" Width="85.754"/>
+		<Custom:SurfaceButton HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Non" Margin="0,0,76.029,27.224" Width="85.754" x:Name="SurfaceButtonNO"/>
 	</Grid>
 </UserControl>
\ No newline at end of file
--- a/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj	Thu Sep 24 17:39:19 2009 +0200
+++ b/src/FingersDance.Control.Pivot/FingersDance.Control.Pivot.csproj	Thu Sep 24 17:48:07 2009 +0200
@@ -123,5 +123,11 @@
     <Resource Include="FingersDance.Control.Pivot.Ressource_Files\**\*.jpg;FingersDance.Control.Pivot.Ressource_Files\**\*.jpeg;FingersDance.Control.Pivot.Ressource_Files\**\*.png;FingersDance.Control.Pivot.Ressource_Files\**\*.bmp;FingersDance.Control.Pivot.Ressource_Files\**\*.gif;FingersDance.Control.Pivot.Ressource_Files\**\*.tif;FingersDance.Control.Pivot.Ressource_Files\**\*.tiff" />
     <Resource Include="Resources\WindowBackground.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FingersDance.Control.Menu\FingersDance.Control.Menu.csproj">
+      <Project>{6960F7ED-3D82-4BCE-AB88-D31D6C72F2B6}</Project>
+      <Name>FingersDance.Control.Menu</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Thu Sep 24 17:39:19 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Thu Sep 24 17:48:07 2009 +0200
@@ -138,8 +138,8 @@
 			<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_9_#0096FF__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_4_#FF0000_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}">
+		<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}">
 			<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_12_#00C800_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="2.303,0.593,2.167,1.317" Width="41" Height="43" 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_2_#FFC800_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="2.212,0.809,1.248,1.317" Style="{DynamicResource FingersDance.Pivot.Button}" Width="41" Height="43">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="-1"/>
fingersdance