Changed TVGuide style, using master_menu as base and defining smaller…

… margins
MediaPortal · Jan 3, 2013 · 46a127a · 46a127a
1 parent 7242c7c
commit 46a127a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/MediaPortal/Incubator/SlimTvClient/Skin/Titanium/themes/default/styles/SlimTvConsts.xaml b/MediaPortal/Incubator/SlimTvClient/Skin/Titanium/themes/default/styles/SlimTvConsts.xaml
@@ -20,16 +20,16 @@
   <!-- Hours to be shown in EPG screen -->
   <ResourceWrapper x:Key="MultiGuideVisibleHours" Resource="2.5"/>
   <!-- The left offset for positioning the current time indicator -->
-  <ResourceWrapper x:Key="MultiGuideProgramLeftOffset" Resource="370"/>
+  <ResourceWrapper x:Key="MultiGuideProgramLeftOffset" Resource="350"/>
   <!-- This factor is used to calculate the progam's width in guide, Width = [number of minutes] * MultiGuideProgramTimeFactor -->
-  <ResourceWrapper x:Key="MultiGuideProgramTimeFactor" Resource="10.2"/>
+  <ResourceWrapper x:Key="MultiGuideProgramTimeFactor" Resource="9.0"/>
 
-  <ResourceWrapper x:Key="MultiGuideHeaderWidth" Resource="400"/>
-  <ResourceWrapper x:Key="MultiGuideProgramHeight" Resource="70"/>
-  <ResourceWrapper x:Key="MultiGuideProgramPreviewHeight" Resource="330"/>
+  <ResourceWrapper x:Key="MultiGuideHeaderWidth" Resource="350"/>
+  <ResourceWrapper x:Key="MultiGuideProgramHeight" Resource="68"/>
+  <ResourceWrapper x:Key="MultiGuideProgramPreviewHeight" Resource="250"/>
 
   <ResourceWrapper x:Key="SingleGuideProgramWidth" Resource="350"/>
 
-  <ResourceWrapper x:Key="ProgramInfoHeaderWidth" Resource="200"/>
+  <ResourceWrapper x:Key="ProgramInfoHeaderWidth" Resource="140"/>
 
 </ResourceDictionary>
diff --git a/MediaPortal/Incubator/Titanium/Skin/Titanium/screens/ProgramInfoSlim.inc b/MediaPortal/Incubator/Titanium/Skin/Titanium/screens/ProgramInfoSlim.inc
@@ -13,23 +13,24 @@
       <ColumnDefinition Width="100"/>
       <ColumnDefinition Width="*"/>
     </Grid.ColumnDefinitions>
-    <Label x:Name="Channel" Grid.Row="0" Grid.Column="0" Scroll="Auto" FontSize="{ThemeResource SmallFontSize}"
-        Content="{Binding ChannelName}" Color="{ThemeResource TextColor}"/>
-
-    <Label x:Name="ProgramStart" Grid.Row="0" Grid.Column="1" Scroll="Auto" Margin="5,0,0,0" FontSize="{ThemeResource SmallFontSize}"
+
+    <Label x:Name="Program" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="4" Scroll="Auto" Margin="5,0,0,0" FontSize="{ThemeResource BigFontSize}"
+        Content="{Binding CurrentProgram.Title}"
+        Color="{ThemeResource TextColor}"/>
+
+    <Label x:Name="ProgramStart" Grid.Row="1" Grid.Column="0" Scroll="Auto" Margin="5,0,0,0" FontSize="{ThemeResource SmallFontSize}"
         Content="{Binding Path=CurrentProgram.StartTime, Converter={StaticResource DateFormatConverter}}"
         Color="{ThemeResource TextColor}"/>
 
-    <Label x:Name="ProgramEnd" Grid.Row="0" Grid.Column="2" Scroll="Auto" Margin="5,0,0,0" FontSize="{ThemeResource SmallFontSize}"
+    <Label x:Name="ProgramEnd" Grid.Row="1" Grid.Column="1" Scroll="Auto" Margin="5,0,0,0" FontSize="{ThemeResource SmallFontSize}"
         Content="{Binding Path=CurrentProgram.EndTime, Converter={StaticResource DateFormatConverter}}"
         Color="{ThemeResource TextColor}"/>
 
-    <Label x:Name="Program" Grid.Row="0" Grid.Column="3" Scroll="Auto" Margin="5,0,0,0"  FontSize="{ThemeResource SmallFontSize}"
-        Content="{Binding CurrentProgram.Title}"
-        Color="{ThemeResource TextColor}"/>
+    <Label x:Name="Channel" Grid.Row="1" Grid.Column="2" Scroll="Auto" FontSize="{ThemeResource SmallFontSize}"
+        Content="{Binding Path=Channel.Name}" Color="{ThemeResource TextColor}"/>
 
-    <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-           Wrap="True" Scroll="Auto" FontSize="{ThemeResource BigFontSize}"
+    <Label Grid.Row="1" Grid.Column="4" x:Name="Description" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+           Wrap="True" Scroll="Auto" ScrollSpeed="5" ScrollDelay="10"
            Content="{Binding Path=CurrentProgram.Description}"
            Color="{ThemeResource TextColor}"/>
   </Grid>

diff --git a/MediaPortal/Incubator/Titanium/Skin/Titanium/screens/SlimTvClient-fullguide.xaml b/MediaPortal/Incubator/Titanium/Skin/Titanium/screens/SlimTvClient-fullguide.xaml
@@ -2,43 +2,45 @@
 <Include
     xmlns="www.team-mediaportal.com/2008/mpf/directx"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Source="screens\master_bare.xaml"
+    Source="screens\master_menu.xaml"
     xmlns:mp_special_controls="clr-namespace:MediaPortal.UI.SkinEngine.SpecialElements.Controls"
     >
   <Include.Resources>
 
+    <!-- Custom margin that will be applied to the content area -->
+    <ResourceWrapper x:Key="CustomContentMargin" Resource="40,120,36,40" />
+
     <!-- Header -->
     <ResourceWrapper x:Key="Header_Text" Resource="[SlimTvClient.Guide]"/>
 
     <!-- SlimTvClient model -->
     <Model x:Key="SlimTvMultiChannelGuide" Id="5054408D-C2A9-451f-A702-E84AFCD29C10"/>
 
     <!-- Contents -->
-    <ControlTemplate x:Key="Client_Template">
+    <ControlTemplate x:Key="Contents_Template">
       <Grid x:Name="MainGrid" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
-              DataContext="{Binding Source={StaticResource SlimTvMultiChannelGuide}}"
-              Margin="0,10,0,0">
+              DataContext="{Binding Source={StaticResource SlimTvMultiChannelGuide}}">
 
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="{ThemeResource MultiGuideHeaderWidth}"/>
           <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
+          <RowDefinition Height="{ThemeResource MultiGuideProgramPreviewHeight}"/>
           <RowDefinition Height="Auto"/>
           <RowDefinition Height="*"/>
-          <RowDefinition Height="{ThemeResource MultiGuideProgramPreviewHeight}"/>
         </Grid.RowDefinitions>
 
-        <StackPanel x:Name="Groups" Margin="20,0,20,0" Grid.Column="0" Grid.Row="0"
+        <StackPanel x:Name="Groups" Margin="0,20,0,0" Grid.Column="0" Grid.Row="1"
               HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Horizontal">
           <Button x:Name="PrevGroupButton" Style="{StaticResource SmallButtonStyle}" Content=" &lt; "
               Command="{Command PrevGroup}"/>
           <Button x:Name="NextGroupButton" Style="{StaticResource SmallButtonStyle}" Content=" &gt; "
               Command="{Command NextGroup}"/>
           <Label x:Name="GroupNameLabel" Color="{ThemeResource TextColor}" FontSize="{ThemeResource SmallFontSize}" Content="{Binding GroupName}"/>
         </StackPanel>
-        <StackPanel x:Name="TimeControls" Margin="20,0,20,0" Grid.Column="1" Grid.Row="0"
+        <StackPanel x:Name="TimeControls" Margin="0,20,0,0" Grid.Column="1" Grid.Row="1"
                      HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Horizontal">
           <Button x:Name="ScrollBackwardButton" Style="{StaticResource SmallButtonStyle}" Content=" - "
               Command="{Command ScrollBackward}"/>
@@ -48,7 +50,7 @@
               Color="{ThemeResource TextColor}" FontSize="{ThemeResource SmallFontSize}"/>
         </StackPanel>
 
-        <ListView  Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"
+        <ListView  Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2"
               Margin="10" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
               Style="{ThemeResource MultiProgramGuideContainerStyle}"
               ItemsSource="{Binding Path=ChannelList}"
@@ -58,7 +60,7 @@
           </ListView.Resources>
         </ListView>
 
-        <Rectangle x:Name="TimeIndicator" Grid.Row="1" Grid.ColumnSpan="2" Width="8" HorizontalAlignment="Left" VerticalAlignment="Stretch"
+        <Rectangle x:Name="TimeIndicator" Grid.Row="2" Grid.ColumnSpan="2" Width="8" HorizontalAlignment="Left" VerticalAlignment="Stretch"
                    IsVisible="{Binding CurrentTimeVisible}">
           <Rectangle.Fill>
             <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
@@ -76,14 +78,11 @@
           </Rectangle.Margin>
         </Rectangle>
 
-        <GroupBox  Grid.Column="0" Grid.Row="2"  Grid.ColumnSpan="2" Header="[SlimTvClient.CurrentlyPlayingInformationHeader]" 
-                   Style="{ThemeResource ContentGroupBoxStyle}" FontSize="{ThemeResource SmallFontSize}" Margin="10,0,10,15">
-          <Control VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-            <Control.TemplateControl>
-              <Include Source="screens\ProgramInfoSlim.inc"/>
-            </Control.TemplateControl>
-          </Control>
-        </GroupBox>
+        <Control Grid.Column="0" Grid.Row="0"  Grid.ColumnSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+          <Control.TemplateControl>
+            <Include Source="screens\ProgramInfoSlim.inc"/>
+          </Control.TemplateControl>
+        </Control>
       </Grid>
     </ControlTemplate>
   </Include.Resources>