Changeset 30123 for other-projects


Ignore:
Timestamp:
2015-08-23T17:56:17+12:00 (9 years ago)
Author:
davidb
Message:

Refactoring to use better playing-in-the-street (PITS) 'branding'

Location:
other-projects/playing-in-the-street/summer-2013/trunk/Playing-in-the-Street-WPF
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • other-projects/playing-in-the-street/summer-2013/trunk/Playing-in-the-Street-WPF/MainWindow.xaml

    r28897 r30123  
    44        xmlns:tk="clr-namespace:Microsoft.Kinect.Toolkit;assembly=Microsoft.Kinect.Toolkit"
    55        xmlns:local="clr-namespace:Microsoft.Samples.Kinect.WebserverBasics"
    6         Title="Webserver Basics" SizeToContent="Height" Width="800" FontSize="16"
     6        Title="Playing in the Street" SizeToContent="Height" Width="800" FontSize="16"
    77        Loaded="WindowLoaded"  Closing="WindowClosing">
    8    
     8
    99    <Window.Resources>
    1010        <local:InverseBooleanConverter x:Key="inverseBooleanConverter"/>
    1111    </Window.Resources>
    12    
     12
    1313    <Grid>
    1414        <Grid.ColumnDefinitions>
    1515            <ColumnDefinition Width="Auto"/>
    1616            <ColumnDefinition Width="Auto"/>
    17             <ColumnDefinition Width="*"/>
     17            <ColumnDefinition Width="33*"/>
     18            <ColumnDefinition Width="284*"/>
    1819        </Grid.ColumnDefinitions>
    1920        <Grid.RowDefinitions>
    … …  
    2122            <RowDefinition Height="*"/>
    2223        </Grid.RowDefinitions>
    23         <tk:KinectSensorChooserUI Grid.Row="0" Grid.Column="0" KinectSensorChooser="{Binding KinectSensorChooser}" HorizontalAlignment="Left" IsListening="False" Margin="5"/>
    24         <DockPanel Grid.Row="0" Grid.Column="1" Margin="5">
     24        <tk:KinectSensorChooserUI Grid.Row="0" Grid.Column="0" KinectSensorChooser="{Binding KinectSensorChooser}" HorizontalAlignment="Left" IsListening="False" Margin="5,5,0,241.6"/>
     25        <DockPanel Grid.Row="0" Grid.Column="1" Margin="5.4,5,5,241.6">
    2526            <Button DockPanel.Dock="Top" Height="50" Width="100" Content="Start"
    2627                    IsEnabled="{Binding Path=IsStarted, Converter={StaticResource inverseBooleanConverter}}" Click="StartButtonOnClick"/>
    … …  
    2829                    IsEnabled="{Binding Path=IsStarted}" Click="StopButtonOnClick"/>
    2930        </DockPanel>
    30         <StackPanel Grid.Row="0" Grid.Column="2" Margin="10 0">
     31        <StackPanel Grid.Row="0" Grid.Column="2" Margin="10,0,9.6,236.6" Grid.ColumnSpan="2">
    3132            <TextBlock x:Name="OpenBrowserText" Margin="0 5">
    32                 <Hyperlink FontSize="16" x:Name="UriLink" Click="UriLinkOnClick">Open sample page in default browser</Hyperlink>
     33                <Hyperlink FontSize="16" x:Name="UriLink" Click="UriLinkOnClick">Click to launch Playing in the Street in your default browser</Hyperlink>
    3334                <LineBreak/>
     35                <!--
    3436                <Run FontSize="11">See documentation for list of supported browsers</Run>
     37                -->
    3538            </TextBlock>
    36             <TextBlock x:Name="ServingFilesText" Margin="0 5" FontSize="11" TextWrapping="WrapWithOverflow">
     39            <TextBlock Visibility="Collapsed" x:Name="ServingFilesText" Margin="0 5" FontSize="11" TextWrapping="WrapWithOverflow">
    3740                <Run FontSize="14" FontWeight="Bold">Serving files from:</Run>
    3841                <Run x:Name="RootDirectoryTextRun"/>
    … …  
    4447            </TextBlock>
    4548        </StackPanel>
    46         <Expander Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="5 0 5 5"
     49        <Expander Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="5,109,4.6,11.6"
    4750                  ExpandDirection="Down" IsExpanded="True"
    4851                  Header="Errors:" FontWeight="Black">

  • other-projects/playing-in-the-street/summer-2013/trunk/Playing-in-the-Street-WPF/MainWindow.xaml.cs

    r28897 r30123  
    3535        /// Name of main page for web sample.
    3636        /// </summary>
    37         private const string SamplePageName = "SamplePage.html";
     37        private const string SamplePageName = "playing-in-the-street.html";
    3838
    3939        /// <summary>

  • other-projects/playing-in-the-street/summer-2013/trunk/Playing-in-the-Street-WPF/Playing-in-the-Street-WPF.csproj

    r28897 r30123  
    3232  </PropertyGroup>
    3333  <PropertyGroup>
    34     <ApplicationIcon>Images\Kinect.ico</ApplicationIcon>
     34    <ApplicationIcon>PITS--Kinect.ico</ApplicationIcon>
    3535  </PropertyGroup>
    3636  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
    … …  
    146146      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    147147    </Content>
     148    <Content Include="Content\Web\playing-in-the-street.html">
     149      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     150    </Content>
    148151    <Content Include="Content\Web\SamplePage.html">
    149152      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    150153    </Content>
    151154    <Resource Include="Images\Kinect.ico" />
     155    <Resource Include="PITS--Kinect.ico" />
     156    <Resource Include="Kinect.ico" />
     157    <Resource Include="Images\PITS--Kinect.ico" />
    152158    <Content Include="WebserverBasic-WPF.exe.config">
    153159      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Note: See TracChangeset for help on using the changeset viewer.