Skip to content

Commit

Permalink
wip background transitions continuation
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Nov 13, 2023
1 parent e7c42b1 commit 8a3683b
Show file tree
Hide file tree
Showing 37 changed files with 207 additions and 118 deletions.
4 changes: 2 additions & 2 deletions 16x9/AddonBrowser.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
<views>50,502,504,505</views>
<controls>
<include content="AddonBrowser_Controls" />
<include content="addonbrowser_Controls" />
<include content="MyViews_Common_Controls" />
<include content="MyViews_Addons" />
<include content="addonbrowser_Views" />
<include content="MyViews_Menu_and_Scrollbars" />
</controls>
</window>
22 changes: 15 additions & 7 deletions 16x9/Animations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="false">WindowClose</animation>
</include>
<include name="WindowOpenClose_Fade_Delayed_Animation">
<animation effect="fade" start="0" end="100" time="360" delay="540" tween="sine" easing="inout" reversible="false">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="false">WindowClose</animation>
</include>
<param name="fadein_condition" default="true" />
<param name="fadeout_condition" default="true" />
<definition>
<animation effect="fade" start="0" end="100" time="360" delay="540" tween="sine" easing="inout" reversible="false" condition="$PARAM[fadein_condition]">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="false" condition="$PARAM[fadeout_condition]">WindowClose</animation>
</definition>
</include>
<include name="WindowOpenClose_Fade_Delayed_Long_Animation">
<animation effect="fade" start="0" end="100" time="360" delay="1080" tween="sine" easing="inout" reversible="false">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="false">WindowClose</animation>
Expand Down Expand Up @@ -60,6 +64,10 @@
<animation effect="fade" start="0" end="100" time="360" delay="1080" tween="sine" easing="inout" reversible="false">Visible</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="false">Hidden</animation>
</include>
<include name="VisibleHidden_Background_Fade_Delayed_Animation">
<animation effect="fade" start="0" end="100" time="360" delay="90" tween="sine" easing="inout" reversible="false">Visible</animation>
<animation effect="fade" start="100" end="0" time="360" delay="90" tween="sine" easing="inout" reversible="false">Hidden</animation>
</include>

<!-- Conditionals/scenarios -->
<include name="Focus_Zoom_Animation" reversible="true">
Expand Down Expand Up @@ -102,12 +110,12 @@
<animation effect="fade" start="100" end="0" delay="360" time="30" reversible="false" tween="sine" easing="inout" condition="Control.HasFocus(3100)">Conditional</animation>
</include>
<include name="Settings_WindowOpenClose_Fade_Delayed_Animation">
<animation effect="fade" start="0" end="100" time="360" delay="360" tween="sine" easing="inout" reversible="true" condition="!Window.Previous(skinsettings) + !Window.Previous(interfacesettings) + !Window.Previous(mediasettings) + !Window.Previous(playersettings) + !Window.Previous(systemsettings) + !Window.Previous(servicesettings) + !Window.Previous(gamesettings) + !Window.Previous(pvrsettings) + !Window.Previous(profiles) + !Window.Previous(systeminfo) + !Window.Previous(filemanager)">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!Window.Next(skinsettings) + !Window.Next(interfacesettings) + !Window.Next(mediasettings) + !Window.Next(playersettings) + !Window.Next(systemsettings) + !Window.Next(servicesettings) + !Window.Next(gamesettings) + !Window.Next(pvrsettings) + Window.Next(profiles) + Window.Next(systeminfo)">WindowClose</animation>
<animation effect="fade" start="0" end="100" time="360" delay="360" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Previous]">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Next]">WindowClose</animation>
</include>
<include name="Settings_WindowOpenClose_Fade_Delayed_Long_Animation">
<animation effect="fade" start="0" end="100" time="360" delay="1260" tween="sine" easing="inout" reversible="true" condition="!Window.Previous(skinsettings) + !Window.Previous(interfacesettings) + !Window.Previous(mediasettings) + !Window.Previous(playersettings) + !Window.Previous(systemsettings) + !Window.Previous(servicesettings) + !Window.Previous(gamesettings) + !Window.Previous(pvrsettings) + !Window.Previous(profiles) + !Window.Previous(systeminfo) + !Window.Previous(filemanager)">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!Window.Next(skinsettings) + !Window.Next(interfacesettings) + !Window.Next(mediasettings) + !Window.Next(playersettings) + !Window.Next(systemsettings) + !Window.Next(servicesettings) + !Window.Next(gamesettings) + !Window.Next(pvrsettings) + Window.Next(profiles) + Window.Next(systeminfo)">WindowClose</animation>
<animation effect="fade" start="0" end="100" time="360" delay="1260" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Previous]">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Next]">WindowClose</animation>
</include>
<include name="Trailer_Autoplay_Fade_Animation">
<animation effect="fade" start="100" end="0" time="360" delay="1080" tween="sine" easing="inout" reversible="false" condition="$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
</variable>
<!-- Alpha overlay masks -->
<variable name="Panel_Mask">
<value condition="Window.IsVisible(songinformation) | [Window.IsVisible(musicinformation) + String.IsEqual(Window(musicinformation).Property(Info_Type),album)] | Window.IsVisible(addoninformation)">$VAR[Dark_Grey_Color]</value>
<value condition="Window.Is(songinformation) | [Window.Is(musicinformation) + String.IsEqual(Window(musicinformation).Property(Info_Type),album)] | Window.Is(addoninformation)">$VAR[Dark_Grey_Color]</value>
<value condition="Window.IsVisible(pictureinfo)">$VAR[Alpha_90]$VAR[Dark_Grey_Hex]</value>
<value condition="Window.Is(addonbrowser) + Window.Is(filebrowser)">$VAR[Alpha_75]$VAR[Dark_Grey_Hex]</value>
<value condition="Window.Is(addonbrowser) + !Container.Content(addons)">$VAR[Dark_Grey_Color]</value>
Expand Down
40 changes: 24 additions & 16 deletions 16x9/Components.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,15 @@
</include> -->

<include name="Background_Multiart">
<param name="animate_slideshow" default="false" />
<param name="time" default="10000" />
<param name="fadein_animation_condition" default="true" />
<param name="fadeout_animation_condition" default="true" />
<definition>
<control type="multiimage">
<include content="WindowOpenClose_Fade_Delayed_Animation" condition="!$EXP[Window_IsSettings]" />
<include content="Ken_Burns_Effect_Animation" condition="$PARAM[animate_slideshow]" />
<include content="WindowOpenClose_Fade_Delayed_Animation" condition="!$EXP[Window_IsSettings]">
<param name="fadein_condition" value="$PARAM[fadein_animation_condition]" />
<param name="fadeout_condition" value="$PARAM[fadeout_animation_condition]" />
</include>
<imagepath>$PARAM[texture_path]</imagepath>
<colordiffuse>$PARAM[colordiffuse]</colordiffuse>
<aspectratio>scale</aspectratio>
Expand All @@ -135,7 +138,8 @@

<include name="Background_Multiart_Home">
<include content="Background_Multiart">
<param name="animate_slideshow" value="Skin.HasSetting(Home_Ken_Burns_Effect)" />
<param name="fadein_animation_condition" value="!Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
<param name="fadeout_animation_condition" value="!Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
<param name="texture_path" value="$VAR[Background_Home_Texture]" />
<param name="fadetime" value="360" />
Expand Down Expand Up @@ -188,38 +192,42 @@

<include name="Background_Global">
<param name="visible" default="true" />
<param name="content_source" default="Global" />
<param name="texture_path" default="$VAR[Background_Global_Texture]" />
<param name="animate_slideshow" default="Skin.HasSetting(Global_Ken_Burns_Effect)" />
<param name="fadein_animation_condition" default="true" />
<param name="fadeout_animation_condition" default="true" />
<definition>
<control type="group">
<visible>!VideoPlayer.IsFullscreen + $PARAM[visible]</visible>
<include content="VisibleHidden_Fade_Animation" />
<include content="VisibleHidden_Background_Fade_Delayed_Animation" />
<control type="videowindow">
<include content="Hidden_Control" />
</control>
<include content="Background_Multiart" condition="$EXP[Settings_IsVisible]">
<param name="colordiffuse" value="$VAR[Dialogs_Artwork_Diffuse]" />
<include content="Background_Multiart">
<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
<param name="texture_path" value="$PARAM[texture_path]" />
<param name="fadetime" value="0" />
<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
</include>
<include content="Background_Multiart">
<param name="colordiffuse" value="$VAR[Dialogs_Artwork_Diffuse]" />
<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
<param name="texture_path" value="$PARAM[texture_path]" />
<param name="fadetime" value="360" />
<param name="animate_slideshow" value="$PARAM[animate_slideshow]" />
<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
</include>
<nested />
</control>
</definition>
</include>

<include name="Background_Media">
<include content="Background_Global">
<param name="visible" value="[$EXP[Containers_Background] | Container.Content()] + !$EXP[ListView_Display_IsThumbnails] + !$EXP[GridView_IsVisible]" />
<param name="local_list_content" value="true" />
<param name="content_source" value="Media" />
</include>
<param name="visible" default="[$EXP[Containers_Background] | Container.Content()] + !$EXP[ListView_Display_IsThumbnails] + !$EXP[GridView_IsVisible]" />
<definition>
<include content="Background_Global">
<param name="visible" value="$PARAM[visible]" />
</include>
</definition>
</include>

<include name="Home_Clearlogo">
Expand Down
6 changes: 3 additions & 3 deletions 16x9/Components_Viewtypes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@
<param name="title_label" default="$VAR[Title_Breadcrumb_Label]" />
<param name="maxtitlelabelwidth" default="900" />
<param name="haspath" default="false" />
<param name="label_color" default="$VAR[Light_Color]" />
<param name="textcolor" default="$VAR[Light_Color]" />
<param name="info_label" default="$VAR[Info_Breadcrumb_Label]" />
<param name="info_label_visible" default="false" />
<param name="maxinfolabelwidth" default="900" />
Expand Down Expand Up @@ -772,7 +772,7 @@
<width max="$PARAM[maxtitlelabelwidth]">auto</width>
<label>$PARAM[title_label]</label>
<font>Title_Breadcrumb_Label</font>
<textcolor>$PARAM[label_color]</textcolor>
<textcolor>$PARAM[textcolor]</textcolor>
<haspath>$PARAM[haspath]</haspath>
</control>
<control type="label">
Expand All @@ -781,7 +781,7 @@
<top>16</top>
<label>$PARAM[info_label]</label>
<font>Info_Breadcrumb_Label</font>
<textcolor>$PARAM[label_color]</textcolor>
<textcolor>$PARAM[textcolor]</textcolor>
<visible>$PARAM[info_label_visible]</visible>
<visible>!String.IsEmpty(Control.GetLabel($PARAM[title_label_id]))</visible>
</control>
Expand Down
8 changes: 8 additions & 0 deletions 16x9/Content_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,14 @@
<selected>Skin.HasSetting(Disable_Hidden_Menu)</selected>
<include content="skinsettings_Default_Label" />
</control>
<control type="radiobutton" id="1340">
<description>Add shutdown menu shortcut to hidden menu</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
<label>$LOCALIZE[31488]</label>
<onclick>Skin.ToggleSetting(shutdownmenu_Shortcut)</onclick>
<selected>Skin.HasSetting(shutdownmenu_Shortcut)</selected>
<include content="skinsettings_Default_Label" />
</control>
<control type="label" id="1340">
<description>List</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
Expand Down
43 changes: 27 additions & 16 deletions 16x9/Content_Viewtype_Options.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,33 @@
</item>
</include>

<include name="shutdownmenu_Shortcut">
<item>
<description>Shutdown menu shortcut</description>
<onclick>ActivateWindow(shutdownmenu)</onclick>
<label>$LOCALIZE[10111]</label>
<label2>$LOCALIZE[10111]</label2>
</item>
</include>

<include name="tvsearch_Menu_Options">
<item>
<description>Channel Groups</description>
<label>$INFO[Control.GetLabel(28)]</label>
<label2>$INFO[Control.GetLabel(28)]</label2>
<onclick>SendClick(28)</onclick>
</item>
</include>

<include name="tvguide_Menu_Options">
<item>
<description>Channel Groups</description>
<label>$INFO[Container(11).ListItem.Label]</label>
<label2>$LOCALIZE[19146] $VAR[Copacetic_Divider_Bold] $INFO[Container(11).ListItem.Label]</label2>
<onclick>SendClick(28)</onclick>
</item>
</include>

<include name="Video_Menu_Options">
<!-- Show only unwatched or all videos -->
<item id="2">
Expand Down Expand Up @@ -304,22 +331,6 @@
</item>
</include>

<include name="tvsearch_Menu_Options">
<item>
<description>Channel Groups</description>
<label>$INFO[Control.GetLabel(28)]</label>
<label2>$INFO[Control.GetLabel(28)]</label2>
<onclick>SendClick(28)</onclick>
</item>
</include>

<include name="tvguide_Menu_Options">
<item>
<description>Channel Groups</description>
<label>$INFO[Container(11).ListItem.Label]</label>
<label2>$LOCALIZE[19146] $VAR[Copacetic_Divider_Bold] $INFO[Container(11).ListItem.Label]</label2>
<onclick>SendClick(28)</onclick>
</item>
</include>

</includes>
2 changes: 1 addition & 1 deletion 16x9/Custom_1104_Dialog_IsInfoscreen.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1104">
<visible>!Window.IsVisible(movieinformation) + !Window.IsVisible(musicinformation) + !Window.IsVisible(songinformation) + !Window.IsVisible(addoninformation) + !Window.IsVisible(pvrguideinfo)</visible>
<visible>!Window.IsVisible(movieinformation) + !Window.IsVisible(musicinformation) + !Window.IsVisible(songinformation) + !Window.IsVisible(addoninformation) + !Window.IsVisible(pvrguideinfo) + !Window.IsVisible(pvrrecordinginfo)</visible>
<animation effect="fade" start="100" end="0" time="720">WindowClose</animation>
<zorder>0</zorder>
<controls/>
Expand Down
5 changes: 3 additions & 2 deletions 16x9/DialogAddonInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<onload condition="!String.Contains(Control.GetLabel(13),*)">Skin.SetString(AutoUpdate,off)</onload>
<onunload>ClearProperty(Focused_Button,addoninformation)</onunload>
<onunload>ClearProperty(AddonDetails,home)</onunload>
<defaultcontrol always="true">12</defaultcontrol>
<defaultcontrol always="true">3000</defaultcontrol>
<controls>
<control type="radiobutton" id="13">
<visible allowhiddenfocus="true">false</visible>
</control>
<include content="Infoscreen_Header_Template">
<param name="windowname" value="addoninformation" />
<param name="visible" value="!Window.IsVisible(1104) + !$EXP[Infoscreen_Widget_HasFocus] + !Window.IsVisible(selectdialog) + !Window.IsVisible(addonsettings)" />
<param name="background_visible" value="[Window.IsVisible(addonsettings) | Window.IsVisible(selectdialog)]" />
<param name="content_visible" value="!Window.IsVisible(addonsettings) + !Window.IsVisible(selectdialog)" />
<include content="Infoscreen_Header">
<param name="visible" value="!ControlGroup(3000).HasFocus(99)" />
<param name="left" value="780" />
Expand Down
1 change: 0 additions & 1 deletion 16x9/DialogAddonSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<window>
<!-- addonsettings -->
<defaultcontrol always="true">3</defaultcontrol>
<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
<controls>
<include content="Default_Settings_Controls">
<param name="include_togglebutton" value="true" />
Expand Down
3 changes: 2 additions & 1 deletion 16x9/DialogMusicInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<controls>
<include content="Infoscreen_Header_Template">
<param name="windowname" value="musicinformation" />
<param name="visible" value="!Window.IsVisible(1104) + !$EXP[Infoscreen_Widget_HasFocus] + ![Window.Is(songinformation) + Window.IsActive(musicinformation)]" />
<param name="background_visible" value="![String.IsEqual(ListItem.DBType,album) + !ControlGroup(3000).HasFocus(12)]" />
<param name="content_visible" value="![Window.Is(songinformation) + Window.IsActive(musicinformation)]" />
<include content="Infoscreen_Header" condition="String.IsEqual(ListItem.DBType,artist)">
<param name="visible" value="ControlGroup(3000).HasFocus(97) | ControlGroup(3000).HasFocus(6)" />
<param name="left" value="120" />
Expand Down
2 changes: 1 addition & 1 deletion 16x9/DialogPVRInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<controls>
<include content="Infoscreen_Header_Template">
<param name="windowname" value="pvrguideinfo" />
<param name="visible" value="!Window.IsVisible(pvrtimersetting) + !Window.IsVisible(shutdownmenu)" />
<param name="content_visible" value="!Window.IsVisible(pvrtimersetting) + !Window.IsVisible(shutdownmenu)" />
<include content="Fullscreen_Info">
<param name="show_logo" value="false" />
<param name="info_label" value="$VAR[Info_PVR_Label]" />
Expand Down
1 change: 0 additions & 1 deletion 16x9/DialogVideoInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</include>
<include content="Infoscreen_Header_Template">
<param name="windowname" value="movieinformation" />
<param name="visible" value="!Window.IsVisible(1104) + !$EXP[Infoscreen_Widget_HasFocus]" />
<include content="Infoscreen_Header">
<param name="visible" value="ControlGroup(3000).HasFocus(8) | ControlGroup(3000).HasFocus(6)" />
<param name="left" value="120" />
Expand Down
Loading

0 comments on commit 8a3683b

Please sign in to comment.