Skip to content

Commit

Permalink
Created new branch with features from "FEAT_Recordings" and "FEAT_Pow…
Browse files Browse the repository at this point in the history 
…erModel" based on new weekly
  • Loading branch information
@ge2301
ge2301 committed Feb 7, 2016
1 parent 1d34f86 commit faa8721
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 16 deletions.
3 changes: 1 addition & 2 deletions ...anium Extended/Skin/BlueVision/themes/Titanium Extended/backgrounds/image-background.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<Image.Source>
<ImagePlayerImageSource Stream="0"
Transition="transitions\granular_dissolve;transitions\fade;transitions\dissolve;transitions\wipe_right;transitions\wipe_down;transitions\wipe_down-right;transitions\wipe_up-left"
TransitionDuration="{Binding Source={Model Id=4E2301B4-3C17-4a1d-8DE5-2CEA169A0256},Path=PlayerUIContributor.TransitionDuration,Mode=OneWay}"
TransitionInOut="False" />
</Image.Source>
</Image>
Expand All @@ -39,4 +38,4 @@
<Control x:Name="BackgroundPiP" Grid.Column="1" Grid.Row="1" Style="{ThemeResource PipControlStyle}"/>
</Grid>
</Grid>
</Screen>
</Screen>
Binary file modified ...Vision/themes/Titanium Extended/images/A298DFBE-9DA8-4C16-A3EA-A9B354F3910C.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ... Extended/Skin/BlueVision/themes/Titanium Extended/images/ShutdownIcon_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions ...ium Extended/Skin/BlueVision/themes/Titanium Extended/screens/FullscreenContentImage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<Image.Source>
<ImagePlayerImageSource Stream="0"
Transition="transitions\granular_dissolve;transitions\fade;transitions\dissolve;transitions\wipe_right;transitions\wipe_down;transitions\wipe_down-right;transitions\wipe_up-left"
TransitionDuration="{Binding Source={Model Id=4E2301B4-3C17-4a1d-8DE5-2CEA169A0256},Path=PlayerUIContributor.TransitionDuration,Mode=OneWay}"
TransitionInOut="False" />
</Image.Source>
</Image>
Expand Down Expand Up @@ -56,4 +55,4 @@

<KeyBinding Key="Info" Command="{Command ShowVideoInfo}"/>
</Grid>
</Screen>
</Screen>
100 changes: 94 additions & 6 deletions ...s/Titanium Extended/Skin/BlueVision/themes/Titanium Extended/screens/master_homemenu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,20 +399,108 @@ Parameters which have to be accessible by a DynamicResource lookup:
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.Resources>
<Model x:Key="PowerMenuModel" Id="54F798AF-03E1-4A82-938E-D0D0DC608B1A"/>
</Grid.Resources>
<!-- Navigates to ShutdownManager.ShutdownDialog, defined by its DialogState ID -->
<Button Style="{ThemeResource ButtonWideStyle_GrowOnly}" Opacity="0.1"
Command="{Command Source={Service WorkflowManager},Path=NavigatePush,Parameters=BBFA7DB7-5055-48D5-A904-0F0C79849369}"
IsVisible="{Binding Source={StaticResource MenuModel},Path=!IsHome}">
<Image Source="ShutdownIcon.png" />
<Image Source="ShutdownIcon_dark.png" Stretch="Uniform" Height="45" Margin="0,80,0,-82"
IsVisible="{Binding Source={StaticResource PowerMenuModel},Path=!IsMenuOpen}"/>

<!--Button Style="{ThemeResource ButtonWideStyle_GrowOnly}" Opacity="0.5" Margin="0,82,0,-80"
Command="{Command Source={StaticResource PowerMenuModel}, Path=ToggleMenu}"
IsVisible="{Binding Source={StaticResource PowerMenuModel},Path=!IsMenuOpen}">
<Image Source="ShutdownIcon.png" Stretch="Uniform" Height="40"/>
<Button.Triggers>
<Trigger Property="HasFocus" Value="True">
<Setter Property="Opacity" Value="1.0" />
</Trigger>
</Button.Triggers>
</Button>
</Button-->
</Grid>
</Grid>

<Grid x:Name="PowerBottomPanel" Margin="30,5,-30,-600" VerticalAlignment="Bottom" Grid.Column="0" Grid.Row="2"
Width="550" HorizontalAlignment="Center">
<Grid.Resources>
<Model x:Key="PowerMenuModel" Id="54F798AF-03E1-4A82-938E-D0D0DC608B1A"/>
<Storyboard x:Key="SlideUpStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="PowerBottomPanel" Storyboard.TargetProperty="RenderTransform.Y">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="0"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="-600"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
<Storyboard x:Key="SlideDownStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="PowerBottomPanel" Storyboard.TargetProperty="RenderTransform.Y">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="-600"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="0"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
</Grid.Resources>
<Grid.Triggers>
<Trigger Property="IsKeyboardFocusWithin" Value="True">
<Trigger.EnterActions>
<TriggerCommand Command="{Command Source={StaticResource PowerMenuModel}, Path=OpenMenu}"/>
</Trigger.EnterActions>
<Trigger.ExitActions>
<TriggerCommand Command="{Command Source={StaticResource PowerMenuModel}, Path=CloseMenu}"/>
</Trigger.ExitActions>
</Trigger>
<!-- Setting default state of menu to hidden -->
<EventTrigger RoutedEvent="Screen.Show">
<TriggerCommand Command="{Command Source={StaticResource PowerMenuModel}, Path=CloseMenu}"/>
</EventTrigger>
<!-- Slide-In animation when the MenuModel.ShowMenu gets true -->
<DataTrigger Binding="{Binding Source={StaticResource PowerMenuModel},Path=IsMenuOpen}" Value="True">
<DataTrigger.EnterActions>
<BeginStoryboard x:Name="SlideUp_BeginStoryboard" Storyboard="{ThemeResource SlideUpStoryboard}"/>
</DataTrigger.EnterActions>
<DataTrigger.ExitActions>
<BeginStoryboard x:Name="SlideDown_BeginStoryboard" Storyboard="{ThemeResource SlideDownStoryboard}"/>
<StopStoryboard BeginStoryboardName="SlideUp_BeginStoryboard"/>
<!--StopStoryboard BeginStoryboardName="SlideDown_BeginStoryboard"/-->
</DataTrigger.ExitActions>
<Setter TargetName="PowerMenu" Property="SetFocusPrio" Value="Highest" />
<Setter TargetName="PowerMenu" Property="SetFocus" Value="True" />
</DataTrigger>
</Grid.Triggers>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="650"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="500"/>
</Grid.RowDefinitions>
<Grid.RenderTransform>
<TranslateTransform Y="0"/>
</Grid.RenderTransform>
<!--Image Source="menu_fade.png" Stretch="Fill" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="-65,-168,-50,-50">
</Image-->
<Rectangle RadiusX="{ThemeResource DialogBorderCornerRadius}" RadiusY="{ThemeResource DialogBorderCornerRadius}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,30,67,0">
<Rectangle.Fill>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="{ThemeResource DialogBackgroundGradient1Color}"/>
<GradientStop Color="{ThemeResource DialogBackgroundGradient2Color}" Offset="1"/>
</LinearGradientBrush>
</Rectangle.Fill>
</Rectangle>
<Image Source="ShutdownIcon_dark.png" Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Center"
Margin="-60,45,0,0" Height="45" Opacity="0.8"/>
<ListView x:Name="PowerMenu" Style="{ThemeResource HiddenMenuListViewStyle}" Margin="20,100,80,10"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SetFocusPrio="Default"
ItemsSource="{Binding Source={StaticResource PowerMenuModel},Path=MenuItems,Mode=OneTime}"
IsEnabled="{Binding Source={StaticResource PowerMenuModel},Path=IsMenuOpen}">
<ListView.Resources>
<CommandBridge x:Key="Menu_Command" Command="{Binding Path=Command,Mode=OneTime}"/>
</ListView.Resources>
</ListView>
<Button x:Name="PowerButton" Content=" " Style="{ThemeResource ButtonWideStyle_GrowOnly}"
Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" HorizontalAlignment="Center" Height="45" Margin="0,-45,0,60"
IsEnabled="{Binding Source={StaticResource PowerMenuModel},Path=!IsMenuOpen}"
IsVisible="{Binding Source={StaticResource PowerMenuModel},Path=!IsMenuOpen}"
Command="{Command Source={StaticResource PowerMenuModel}, Path=ToggleMenu}">
<!--Image Source="ShutdownIcon.png" Stretch="Uniform" Height="45" Margin="-40,0,0,0"/-->
</Button>
</Grid>
</Grid>
</DockPanel>
</ControlTemplate>

Expand Down
21 changes: 18 additions & 3 deletions ...Skins/Titanium Extended/Skin/BlueVision/themes/Titanium Extended/screens/master_menu.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ Parameters which have to be accessible by a DynamicResource lookup:
>
<Include.Resources>
<Model x:Key="MenuModel" Id="9E9D0CD9-4FDB-4c0f-A0C4-F356E151BDE0"/>

<Model x:Key="PowerMenuModel" Id="54F798AF-03E1-4A82-938E-D0D0DC608B1A"/>

<!-- Defines the default margins for the content area -->
<ResourceWrapper x:Key="DefaultContentMargin" Resource="0,210,-4,-35" />

Expand Down Expand Up @@ -87,7 +88,13 @@ Parameters which have to be accessible by a DynamicResource lookup:
<Storyboard x:Key="SlideInStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="LeftPanel" Storyboard.TargetProperty="RenderTransform.X">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="0"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.20" Value="550"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="550"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
<Storyboard x:Key="SlideOutStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="LeftPanel" Storyboard.TargetProperty="RenderTransform.X">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="550"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="0"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
</Grid.Resources>
Expand All @@ -110,6 +117,7 @@ Parameters which have to be accessible by a DynamicResource lookup:
<BeginStoryboard x:Name="SlideIn_BeginStoryboard" Storyboard="{ThemeResource SlideInStoryboard}"/>
</DataTrigger.EnterActions>
<DataTrigger.ExitActions>
<BeginStoryboard x:Name="SlideOut_BeginStoryboard" Storyboard="{ThemeResource SlideOutStoryboard}"/>
<StopStoryboard BeginStoryboardName="SlideIn_BeginStoryboard"/>
</DataTrigger.ExitActions>
<Setter TargetName="MainMenu" Property="SetFocusPrio" Value="Highest" />
Expand Down Expand Up @@ -164,7 +172,13 @@ Parameters which have to be accessible by a DynamicResource lookup:
<Storyboard x:Key="SlideDownStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="TopPanel" Storyboard.TargetProperty="RenderTransform.Y">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="0"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.20" Value="850"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="850"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
<Storyboard x:Key="SlideUpStoryboard" FillBehavior="HoldEnd">
<DoubleAnimationUsingKeyFrames BeginTime="00:00:00" FillBehavior="HoldEnd" Storyboard.TargetName="TopPanel" Storyboard.TargetProperty="RenderTransform.Y">
<SplineDoubleKeyFrame KeyTime="00:00:00" Value="850"/>
<SplineDoubleKeyFrame KeyTime="00:00:00.25" Value="0"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
</Grid.Resources>
Expand All @@ -187,6 +201,7 @@ Parameters which have to be accessible by a DynamicResource lookup:
<BeginStoryboard x:Name="SlideDown_BeginStoryboard" Storyboard="{ThemeResource SlideDownStoryboard}"/>
</DataTrigger.EnterActions>
<DataTrigger.ExitActions>
<BeginStoryboard x:Name="SlideUp_BeginStoryboard" Storyboard="{ThemeResource SlideUpStoryboard}"/>
<StopStoryboard BeginStoryboardName="SlideDown_BeginStoryboard"/>
</DataTrigger.ExitActions>
<Setter TargetName="TopMenu" Property="SetFocusPrio" Value="Highest" />
Expand Down
4 changes: 2 additions & 2 deletions .../Skins/Titanium Extended/Skin/BlueVision/themes/Titanium Extended/styles/MediaStyles.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</Grid>
</DockPanel>
<!--Rectangle Grid.Column="2" Grid.Row="0" Grid.RowSpan="2" RadiusX="20" RadiusY="20" Fill="#80000000" /-->
<Label x:Name="TimeLabel" Color="{ThemeResource EmphasisTextColor}" FontSize="{ThemeResource BigFontSize}"
<Label x:Name="TimeLabel" Color="#FF66b1d8" FontSize="{ThemeResource BigFontSize}"
HorizontalAlignment="Right" VerticalAlignment="Center" Grid.Column="2" Grid.Row="0" Grid.RowSpan="2"
Content="{Binding Source={StaticResource TimeModel}, Path=CurrentTime}" />
</Grid>
Expand Down Expand Up @@ -252,7 +252,7 @@

<Rectangle Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" RadiusX="20" RadiusY="20" Fill="#80000000" />

<Label x:Name="TimeLabel" Color="{ThemeResource EmphasisTextColor}" FontSize="{ThemeResource BigFontSize}"
<Label x:Name="TimeLabel" Color="#FF66b1d8" FontSize="{ThemeResource BigFontSize}"
HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2"
Content="{Binding Source={StaticResource TimeModel}, Path=CurrentTime}" />

Expand Down
2 changes: 1 addition & 1 deletion ...urce/UI/TV/SlimTvClient/Skin/BlueVision/themes/Titanium Extended/styles/SlimTvColors.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
>

<ResourceWrapper x:Key="NextProgramLabelColor" Resource="#FF9CB9D5"/>
<ResourceWrapper x:Key="NextProgramLabelColor" Resource="#FF66b1d8"/>

<!-- Program guide colors -->
<ResourceWrapper x:Key="ProgramBaseFill">
Expand Down

0 comments on commit faa8721

Please sign in to comment.