Skip to content

Commit

Permalink
BV + win10: Overwork of SlimTV footer (some screens with old style, n…
Browse files Browse the repository at this point in the history
…ew TimeConverterStyle)
  • Loading branch information
ge2301 committed May 15, 2017
1 parent ac8fbf0 commit 56554a2
Show file tree
Hide file tree
Showing 14 changed files with 74 additions and 117 deletions.
Expand Up @@ -15,13 +15,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2">
<StackPanel Orientation="Horizontal">
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/-->
</StackPanel>
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}" Margin="0,10,0,0"
Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" >
Expand All @@ -45,7 +40,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Opacity="0.6"
Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,10,5"/>
</Grid>
Expand Down
Expand Up @@ -42,7 +42,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6" Content="{Binding Path=CurrentProgram.Description}"
Wrap="True" Scroll="Auto" ScrollDelay="5" Opacity="0.6" Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,10,5"/>
</Grid>
</DockPanel>
Expand Up @@ -82,34 +82,27 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="320"/>
<ColumnDefinition Width="420"/>
<ColumnDefinition Width="1500"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" HorizontalAlignment="Right" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<Label Margin="5,0,5,0" Content="" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/>
</StackPanel>
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"
HorizontalAlignment="Right"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Stretch="Uniform" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,0,0">
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0">
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}" HorizontalAlignment="Left"
Stretch="Uniform" VerticalAlignment="Top" Margin="0,10,0,0">
<Image.Source>
<fanart:FanArtImageSource fanart:FanArtMediaType="ChannelTv" fanart:FanArtType="Banner"
fanart:FanArtName="{Binding ChannelName}" fanart:MaxWidth="0" fanart:MaxHeight="0"/>
</Image.Source>
</Image>
</StackPanel>
<Label x:Name="Program" Grid.Row="0" Grid.Column="0" Scroll="Auto" FontFamily="DefaultBold"
Content="{Binding Path=CurrentProgram.Title}" Margin="0,0,0,0"
Color="{ThemeResource TextColor}"/>
<Label x:Name="Program" Grid.Row="0" Grid.Column="1" Scroll="Auto" FontFamily="DefaultBold"
Content="{Binding Path=CurrentProgram.Title}" Margin="0,0,0,0"
Color="{ThemeResource TextColor}"/>

<Label Grid.Row="1" Grid.Column="0" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto"
Content="{Binding Path=CurrentProgram.Description}"
<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,5" />
</Grid>
</Grid>
Expand Down
Expand Up @@ -83,13 +83,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2">
<StackPanel Orientation="Horizontal">
<Label x:Name="ProgramStart" Color="{ThemeResource TextColor}"
Content="{Binding Path=SelectedCurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=SelectedCurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/-->
</StackPanel>
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding SelectedChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Stretch="Uniform" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10,0,0">
Expand Down Expand Up @@ -117,7 +112,7 @@
</Grid>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Opacity="0.6"
Content="{Binding Path=SelectedCurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,5" />
</Grid>
Expand Down
Expand Up @@ -127,7 +127,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto" Color="{ThemeResource TextColor}" Margin="0,0,10,5"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Color="{ThemeResource TextColor}" Margin="0,0,10,5"
Content="{Binding Path=SelectedCurrentProgram.Description}"/>

</Grid>
Expand Down
Expand Up @@ -56,15 +56,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2" >

<StackPanel Orientation="Horizontal">
<Label x:Name="ProgramStart" Color="{ThemeResource TextColor}"
Content="{Binding Path=StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/-->
</StackPanel>

<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Stretch="Uniform" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10,0,0">
Expand Down Expand Up @@ -92,7 +85,7 @@
</Grid>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Opacity="0.6"
Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,5" />
</Grid>
Expand Down
Expand Up @@ -15,13 +15,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2">
<StackPanel Orientation="Horizontal">
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/-->
</StackPanel>
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}" Margin="0,10,0,0"
Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" >
Expand All @@ -45,8 +40,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Content="{Binding Path=CurrentProgram.Description}"
Wrap="True" Scroll="Auto" ScrollDelay="5" Opacity="0.6" Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,10,25"/>
</Grid>
</DockPanel>
Expand Up @@ -16,13 +16,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" >
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}" Scroll="Auto"
Color="{ThemeResource TextColor}"/-->
</StackPanel>
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"
HorizontalAlignment="Left" Grid.Row="1" Grid.Column="0" />
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}" Grid.Row="2" Grid.Column="0" Margin="0,10,0,0"
Expand All @@ -47,8 +42,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,10,25"/>
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Opacity="0.6"
Content="{Binding Path=CurrentProgram.Description}" Color="{ThemeResource TextColor}" Margin="0,0,10,25"/>
</Grid>
</DockPanel>
Expand Up @@ -91,34 +91,27 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="320"/>
<ColumnDefinition Width="420"/>
<ColumnDefinition Width="1500"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" HorizontalAlignment="Right" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<Label Margin="5,0,5,0" Content="" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/>
</StackPanel>
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"
HorizontalAlignment="Right"/>
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0">
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Stretch="Uniform" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,10,0,0">
Stretch="Uniform" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10,0,0">
<Image.Source>
<fanart:FanArtImageSource fanart:FanArtMediaType="ChannelTv" fanart:FanArtType="Banner"
fanart:FanArtName="{Binding ChannelName}" fanart:MaxWidth="0" fanart:MaxHeight="0"/>
</Image.Source>
</Image>
</StackPanel>
<Label x:Name="Program" Grid.Row="0" Grid.Column="0" Scroll="Auto" FontFamily="DefaultBold"
Content="{Binding Path=CurrentProgram.Title}" Margin="0,0,0,0"
Color="{ThemeResource TextColor}"/>
<Label x:Name="Program" Grid.Row="0" Grid.Column="1" Scroll="Auto" FontFamily="DefaultBold"
Content="{Binding Path=CurrentProgram.Title}" Margin="0,0,0,0"
Color="{ThemeResource TextColor}"/>

<Label Grid.Row="1" Grid.Column="0" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto"
Content="{Binding Path=CurrentProgram.Description}"
<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Content="{Binding Path=CurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,5" />
</Grid>
</Grid>
Expand Down
Expand Up @@ -89,13 +89,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" Grid.RowSpan="2">
<StackPanel Orientation="Horizontal">
<Label x:Name="ProgramStart" Color="{ThemeResource TextColor}"
Content="{Binding Path=SelectedCurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<!--Label Margin="5,0,5,0" Content="—" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=SelectedCurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/-->
</StackPanel>
<!-- Common control for program duration formatting -->
<Control Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding SelectedChannelName}" Color="{ThemeResource TextColor}"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Stretch="Uniform" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,10,0,0">
Expand Down Expand Up @@ -123,9 +118,8 @@
</Grid>

<Label Grid.Row="1" Grid.Column="1" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" TextTrimming="WordEllipsis" Opacity="0.6"
Content="{Binding Path=SelectedCurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,-15" />
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Opacity="0.6"
Content="{Binding Path=SelectedCurrentProgram.Description}" Color="{ThemeResource TextColor}" Margin="0,0,0,-15" />
</Grid>
</Grid>
</ControlTemplate>
Expand Down
Expand Up @@ -96,13 +96,8 @@
</Grid.ColumnDefinitions>

<StackPanel Orientation="Vertical" HorizontalAlignment="Right" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
<Label x:Name="ProgramStart" Margin="0,0,0,0" Color="{ThemeResource TextColor}"
Content="{Binding Path=SelectedCurrentProgram.StartTime, Converter={StaticResource SlimTvDateFormatConverter}}"/>
<Label Margin="5,0,5,0" Content="" Color="{ThemeResource TextColor}"/>
<Label x:Name="ProgramEnd" Content="{Binding Path=SelectedCurrentProgram.EndTime, Converter={StaticResource SlimTvDateFormatConverter}}"
Color="{ThemeResource TextColor}"/>
</StackPanel>
<!-- Common control for program duration formatting -->
<Control HorizontalAlignment="Right" Style="{StaticResource ProgramDurationControlStyle}" DataContext="{Binding Path=CurrentProgram}" />
<Label x:Name="Channel" Scroll="Auto" Content="{Binding SelectedChannelName}" Color="{ThemeResource TextColor}"
HorizontalAlignment="Right"/>
<Image x:Name="ChannelLogo" Width="{ThemeResource ChannelLogoLarge}"
Expand All @@ -127,8 +122,7 @@
</StackPanel>

<Label Grid.Row="1" Grid.Column="0" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Wrap="True" Scroll="Auto"
Content="{Binding Path=SelectedCurrentProgram.Description}"
Wrap="True" Scroll="Auto" ScrollDelay="5" ScrollSpeed="10" Content="{Binding Path=SelectedCurrentProgram.Description}"
Color="{ThemeResource TextColor}" Margin="0,0,0,5" />

</Grid>
Expand Down

0 comments on commit 56554a2

Please sign in to comment.