--- a/src/FingersDance.Control.SessionInput/UserControlListProject.xaml.cs Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance.Control.SessionInput/UserControlListProject.xaml.cs Thu Oct 15 16:25:38 2009 +0200
@@ -37,8 +37,7 @@
{
CustomListBoxItem Contener = new CustomListBoxItem();
Contener.Name = "New Project";
- Label l = new Label();
- l.Content = "New Project";
+ UserControlCustomLabel l = new UserControlCustomLabel("New Project");
Contener.Content = l;
stackPanel.Children.Add(Contener);
Contener.ContactTapGesture += Item_ContactTapGesture;
@@ -46,8 +45,7 @@
{
Contener = new CustomListBoxItem();
Contener.Name = elt.Key;
- l = new Label();
- l.Content = elt.Key;
+ l = new UserControlCustomLabel(elt.Key);
Contener.Content = l;
stackPanel.Children.Add(Contener);
Contener.ContactTapGesture += Item_ContactTapGesture;
--- a/src/FingersDance.Control.SessionInput/UserControlListSession.xaml.cs Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance.Control.SessionInput/UserControlListSession.xaml.cs Thu Oct 15 16:25:38 2009 +0200
@@ -35,8 +35,7 @@
{
CustomListBoxItem Contener = new CustomListBoxItem();
Contener.Name = "New Session";
- Label l = new Label();
- l.Content = "New Session";
+ UserControlCustomLabel l = new UserControlCustomLabel("New Session");
Contener.Content = l;
stackPanel.Children.Add(Contener);
Contener.ContactTapGesture += Item_ContactTapGesture;
@@ -44,8 +43,7 @@
{
Contener = new CustomListBoxItem();
Contener.Name = elt.Name;
- l = new Label();
- l.Content = elt.Name;
+ l = new UserControlCustomLabel(elt.Name);
Contener.Content = l;
stackPanel.Children.Add(Contener);
Contener.ContactTapGesture += Item_ContactTapGesture;
--- a/src/FingersDance.Control.SessionInput/UserControlNewProject.xaml Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance.Control.SessionInput/UserControlNewProject.xaml Thu Oct 15 16:25:38 2009 +0200
@@ -321,11 +321,11 @@
</UserControl.Resources>
<Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,17.818,8,0" x:Name="ST_ProjectName" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,17.818,8,0" x:Name="ST_ProjectName" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" Foreground="#FF000000"/>
<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Project Name:" Margin="14.367,9.818,0,0" x:Name="LProjectName" Foreground="#FFBCB3B3"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
<Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
<Custom:SurfaceRadioButton.RenderTransform>
--- a/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance.Control.SessionInput/UserControlSessionInput.xaml Thu Oct 15 16:25:38 2009 +0200
@@ -322,15 +322,15 @@
</UserControl.Resources>
<Grid x:Name="LayoutRoot" Background="{DynamicResource SessionInput__Background_xaml}">
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,17.818,8,0" x:Name="ST_Name" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,17.818,8,0" x:Name="ST_Name" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Foreground="#FF000000" Background="#7FFFFFFF"/>
<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Name:" Margin="14.367,9.818,0,0" x:Name="LName" Foreground="#FFBCB3B3"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="112,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment, VerticalAlignment" Margin="92.688,50.626,8,0" x:Name="ST_Date" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label HorizontalAlignment="Left" VerticalAlignment="Top" Content="Date:" Margin="14.367,42.626,0,0" x:Name="LDate" Foreground="#FFBCB3B3"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,82.586,8,0" x:Name="ST_Alias" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,82.586,8,0" x:Name="ST_Alias" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7EFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label HorizontalAlignment="Left" Content="Alias:" Margin="14.367,74.586,0,91.454" x:Name="LAlias" Foreground="#FFBCB3B3" d:LayoutOverrides="Height"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,113.677,8,0" x:Name="ST_Email" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,113.677,8,0" x:Name="ST_Email" VerticalAlignment="Top" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label HorizontalAlignment="Left" Content="Email:" Margin="14.367,0,0,59.494" x:Name="LEmail" VerticalAlignment="Bottom" Foreground="#FFBCB3B3"/>
- <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="112,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White"/>
+ <Custom:SurfaceTextBox d:LayoutOverrides="HorizontalAlignment" Margin="92.688,0,8,30.403" x:Name="ST_Desc" VerticalAlignment="Bottom" Text="" TextWrapping="Wrap" Background="#7FFFFFFF" BorderBrush="{x:Null}" Foreground="#FF000000"/>
<Label x:Name="LDescription" HorizontalAlignment="Left" VerticalAlignment="Bottom" Content="Description:" Margin="14.367,0,0,30.403" Width="74.321" Foreground="#FFBCB3B3"/>
<Custom:SurfaceRadioButton RenderTransformOrigin="0.46,0.243" Margin="70.688,0,0,3" VerticalAlignment="Bottom" Content="" Height="30.403" x:Name="SurfaceButtonSubmit" ContactDown="SurfaceButtonSubmit_ContactDown" Click="SurfaceButtonSubmit_Click" HorizontalAlignment="Left" Style="{DynamicResource FingersDance.Control.SurfaceRadioButton}" Width="33.312" Background="{DynamicResource ConfirmationTick_xaml}" BorderBrush="{x:Null}">
<Custom:SurfaceRadioButton.RenderTransform>
--- a/src/FingersDance.Control/FingersDance.Control.csproj Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance.Control/FingersDance.Control.csproj Thu Oct 15 16:25:38 2009 +0200
@@ -75,6 +75,13 @@
<Reference Include="Microsoft.Surface" />
<Reference Include="Microsoft.Surface.Presentation" />
<Reference Include="Microsoft.Surface.Presentation.Generic" />
+ <Page Include="UserControlCustomLabel.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Compile Include="UserControlCustomLabel.xaml.cs">
+ <DependentUpon>UserControlCustomLabel.xaml</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="CustomListBoxItem.cs" />
--- a/src/FingersDance/Resources/videos.xml Thu Oct 15 02:29:22 2009 +0200
+++ b/src/FingersDance/Resources/videos.xml Thu Oct 15 16:25:38 2009 +0200
@@ -2,17 +2,17 @@
<ArrayOfListVideoItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<ListVideoItem>
<Name>Butterfly</Name>
- <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Butterfly.wmv</Path>
- <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Butterfly.jpg</Preview>
+ <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Butterfly.wmv</Path>
+ <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Butterfly.jpg</Preview>
</ListVideoItem>
<ListVideoItem>
<Name>Lake</Name>
- <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Lake.wmv</Path>
- <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\Lake.jpg</Preview>
+ <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Lake.wmv</Path>
+ <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\Lake.jpg</Preview>
</ListVideoItem>
<ListVideoItem>
<Name>One Flat Thing</Name>
- <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\oneflat.wmv</Path>
- <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingerDance\src\FingersDance\bin\Debug\Resources\oneflat.png</Preview>
+ <Path>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\oneflat.wmv</Path>
+ <Preview>C:\Users\santiago\Desktop\MercurialSurfaceFingersDance\src\FingersDance\bin\Debug\Resources\oneflat.png</Preview>
</ListVideoItem>
</ArrayOfListVideoItem>
\ No newline at end of file