Skip to content

Commit

Permalink
backgrounds and seek labels
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Oct 7, 2024
1 parent 16f5f26 commit ecf8045
Show file tree
Hide file tree
Showing 13 changed files with 465 additions and 70 deletions.
19 changes: 14 additions & 5 deletions 16x9/Animations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,6 @@
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="!$EXP[TransparentDialog_IsVisible] | [$EXP[Container_HasBackground] + $EXP[PanelDialog_IsVisible]]">Hidden</animation>
</include>

<include name="PlayerSeekLabel_Fade_Delayed_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1.5x" tween="sine" easing="inout" reversible="false">Visible</animation>
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="0" tween="sine" easing="inout" reversible="false">Hidden</animation>
</include>

<include name="Scrollbar_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="!Container.Scrolling">Visible</animation>
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="Container.Scrolling">Visible</animation>
Expand All @@ -382,6 +377,20 @@
</definition>
</include>

<include name="seekbar_Fade_Animation">
<include name="VisibleHidden_Fade_Animation">
<include content="fade_animation">
<param name="type" value="Visible" />
<param name="time" value="1x" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
</include>
</include>
</include>

<include name="Trailer_Autoplay_Fade_Animation">
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false" condition="$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_3x" tween="sine" easing="inout" reversible="false" condition="!$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
Expand Down
9 changes: 9 additions & 0 deletions 16x9/Colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,14 @@
<value condition="Control.HasFocus(16010) | Control.HasFocus(16011)">$VAR[Light_Color]</value>
<value>$VAR[Unfocused_Color]</value>
</variable>
<variable name="skinsettings_Background_Slideshow2_Button_Textcolor">
<value condition="Control.HasFocus(16100) | Control.HasFocus(16101)">$VAR[Light_Color]</value>
<value>$VAR[Unfocused_Color]</value>
</variable>
<variable name="skinsettings_Background_Slideshow_Timer_Button_Textcolor">
<value condition="Control.HasFocus(16130) | Control.HasFocus(16131) | Control.HasFocus(16132)">$VAR[Light_Color]</value>
<value>$VAR[Unfocused_Color]</value>
</variable>
<variable name="skinsettings_GridView_Size_Button_Textcolor">
<value condition="Control.HasFocus(13400) | Control.HasFocus(13401)">$VAR[Light_Color]</value>
<value>$VAR[Unfocused_Color]</value>
Expand Down Expand Up @@ -952,6 +960,7 @@
</variable>
<variable name="Seekbar_Focused_Color">
<value condition="Control.HasFocus(60) + !VideoPlayer.Content(livetv)">$VAR[Accent_Color]</value>
<value condition="Player.Seeking">$VAR[Accent_Color]</value>
<value condition="Skin.String(Theme,Light) + $EXP[visualisation_Background_IsEmpty] + Skin.String(visualisation_Layout,Large)">$VAR[Dark_Color]</value>
<value>$VAR[Light_Color]</value>
</variable>
Expand Down
20 changes: 20 additions & 0 deletions 16x9/Components.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,26 @@
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="30000" />
</include>
<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,60)">
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="60000" />
</include>
<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,300)">
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="300000" />
</include>
<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,600)">
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="600000" />
</include>
<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,900)">
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="900000" />
</include>
<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,1800)">
<param name="visible" value="$PARAM[visible]" />
<param name="time" value="1800000" />
</include>
</definition>
</include>

Expand Down
33 changes: 17 additions & 16 deletions 16x9/Components_OSD.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,6 @@
<texturebg colordiffuse="$VAR[Cachebar_Background_Color]">views/white_100.png</texturebg>
<midtexture colordiffuse="$VAR[Seekbar_Background_Color]">views/white_100.png</midtexture>
</control>
<!-- Seek bar -->
<control type="progress">
<visible>Player.HasPerformedSeek(2)</visible>
<centertop>50%</centertop>
<left>$PARAM[progress_bar_padding]</left>
<right>$PARAM[progress_bar_padding]</right>
<height>6</height>
<info>Player.SeekBar</info>
<texturebg colordiffuse="$VAR[Blank_Color]">views/white_100.png</texturebg>
<midtexture colordiffuse="$VAR[Accent_Color]">views/white_100.png</midtexture>
</control>
<!-- Ranges -->
<include content="Player_Ranges" condition="$PARAM[include_ranges]">
<param name="left" value="$PARAM[progress_bar_padding]" />
Expand All @@ -46,10 +35,22 @@
<left>$PARAM[progress_bar_padding]</left>
<right>$PARAM[progress_bar_padding]</right>
<height>6</height>
<info>Player.Progress</info>
<!--<info>Player.Progress</info>-->
<info>Player.SeekBar</info>
<texturebg colordiffuse="$VAR[Blank_Color]">views/white_100.png</texturebg>
<midtexture colordiffuse="$VAR[Seekbar_Focused_Color]">views/white_100.png</midtexture>
</control>
<!-- Seek bar -->
<!--<control type="progress">
<visible>Player.Seeking</visible>
<centertop>50%</centertop>
<left>$PARAM[progress_bar_padding]</left>
<right>$PARAM[progress_bar_padding]</right>
<height>6</height>
<info>Player.SeekBar</info>
<texturebg colordiffuse="$VAR[Blank_Color]">views/white_100.png</texturebg>
<midtexture colordiffuse="$VAR[Accent_Color]">views/white_100.png</midtexture>
</control>-->
</include>

<include name="PVR_Progress_Bars">
Expand Down Expand Up @@ -138,7 +139,7 @@
<param name="action" default="seek" />
<definition>
<control type="slider" id="60">
<visible allowhiddenfocus="true">Control.HasFocus(60)</visible>
<visible allowhiddenfocus="true">[Window.IsVisible(videoosd) + !System.IdleTime(3)]</visible>
<animation effect="slide" end="0,-18" time="0" condition="VideoPlayer.Content(livetv)">Conditional</animation>
<bottom>20</bottom>
<left>$PARAM[left]</left>
Expand Down Expand Up @@ -301,8 +302,8 @@
<include name="Player_Status_Icons_Label">
<definition>
<control type="label">
<visible>Player.Rewinding | Player.Forwarding | Player.HasPerformedSeek(2) | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)]</visible>
<include content="PlayerSeekLabel_Fade_Delayed_Animation" />
<visible>Player.Rewinding | Player.Forwarding | !String.IsEmpty(Player.SeekStepSize) | [!String.IsEmpty(Player.SeekOffset) + Player.HasPerformedSeek(3)] | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<width>360</width>
<centerleft>50%</centerleft>
<align>center</align>
Expand Down Expand Up @@ -399,7 +400,7 @@
<include content="Player_Status_Icons_Label" condition="$PARAM[large_label]">
<param name="color" value="$PARAM[color]" />
<param name="font" value="Player_Status" />
<animation effect="slide" end="0,60" condition="true">Conditional</animation>
<animation effect="slide" end="0,90" condition="true">Conditional</animation>
</include>
<include content="Player_Status_Icons_Label" condition="$PARAM[small_label]">
<param name="color" value="$PARAM[color]" />
Expand Down
35 changes: 34 additions & 1 deletion 16x9/Content_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,45 @@
<onclick>RunScript(script.skinshortcuts,type=shortcuts&amp;custom=True&amp;showNone=False&amp;skinList=Background_Slideshow_Custom_Path)</onclick>
<visible>ControlGroup(9).HasFocus(16) + [Skin.String(Background_Slideshow,Custom) | !$EXP[Library_Has_Content]]</visible>
</control>
<control type="radiobutton" id="1609">
<description>Enable second background slideshow</description>
<visible>ControlGroup(9).HasFocus(16)</visible>
<label>$LOCALIZE[31729]</label>
<onclick>Skin.ToggleSetting(Background_Slideshow2)</onclick>
<selected>Skin.HasSetting(Background_Slideshow2)</selected>
</control>
<include content="skinsettings_Slider_Button">
<param name="visible" value="ControlGroup(9).HasFocus(16) + Skin.HasSetting(Background_Slideshow2)" />
<param name="info" value="Background_Slideshow2" />
<param name="label" value="- $LOCALIZE[31730]" />
<param name="label2" value="$VAR[skinsettings_Background_Slideshow2_Label]" />
<param name="previous" value="1609" />
<param name="id" value="1610" />
<param name="next" value="1611" />
</include>
<control type="button" id="1611">
<description>- Choose a custom path</description>
<label>$VAR[skinsettings_Background_Slideshow2_Custom_Path_Label, - ]</label>
<onclick>RunScript(script.skinshortcuts,type=shortcuts&amp;custom=True&amp;showNone=False&amp;skinList=Background_Slideshow2_Custom_Path)</onclick>
<visible>ControlGroup(9).HasFocus(16) + Skin.HasSetting(Background_Slideshow2) + [Skin.String(Background_Slideshow2,Custom) | !$EXP[Library_Has_Content]]</visible>
</control>
<include content="skinsettings_Double_Slider_Button">
<param name="visible" value="ControlGroup(9).HasFocus(16) + Skin.HasSetting(Background_Slideshow2)" />
<param name="info" value="Background_Slideshow_Timer" />
<param name="info2" value="Background_Slideshow2_Timer" />
<param name="label" value=" - $LOCALIZE[31731]" />
<param name="label2" value="Slideshow 1 ($VAR[skinsettings_Background_Slideshow_Timer_Label]) / Slideshow 2 ($VAR[skinsettings_Background_Slideshow2_Timer_Label])" />
<param name="category" value="16" />
<param name="previous" value="1611" />
<param name="id" value="1613" />
<param name="next" value="1603" />
</include>
<include content="skinsettings_Slider_Button">
<param name="visible" value="ControlGroup(9).HasFocus(16)" />
<param name="info" value="Background_Interval" />
<param name="label" value="$LOCALIZE[31427]" />
<param name="label2" value="$VAR[skinsettings_Background_Interval_Label]" />
<param name="previous" value="1602" />
<param name="previous" value="1613" />
<param name="id" value="1603" />
<param name="next" value="1605" />
</include>
Expand Down
Loading

0 comments on commit ecf8045

Please sign in to comment.