2.4.3

realcopacetic · Jun 11, 2024 · 1f3da4c · 1f3da4c
1 parent 9125d53
commit 1f3da4c
Show file tree

Hide file tree

Showing 81 changed files with 1,606 additions and 927 deletions.
diff --git a/16x9/Actions.xml b/16x9/Actions.xml
@@ -18,7 +18,7 @@
 		</definition>
 	</include>
 
-	<include name="Default_Transition">
+	<include name="Default_Transition_1x">
 		<definition>
 			<onclick condition="!String.IsEqual(Container($PARAM[id]).ListItem.DBID,Window.Property(SelectedItem))">SetProperty(Breadcrumb_GoToNext,true)</onclick>
 			<onclick condition="!String.IsEqual(Container($PARAM[id]).ListItem.DBID,Window.Property(SelectedItem))">SetProperty(Infoscreen_Transition,true,home)</onclick>
@@ -52,7 +52,7 @@
 	</include>
 
 	<include name="Default_Infoscreen_Widget_Open">
-		<include content="Default_Transition">
+		<include content="Default_Transition_1x">
 			<param name="id" value="$PARAM[id]" />
 		</include>
 		<include content="TMDb_Helper_Transition">
@@ -96,13 +96,13 @@
 	</include>
 
 	<include name="ClickAction_Open_Similar_Artists">
-		<include content="Default_Transition">
+		<include content="Default_Transition_1x">
 			<param name="id" value="3207" />
 		</include>
 	</include>
 
 	<include name="ClickAction_Open_Similar_Albums">
-		<include content="Default_Transition">
+		<include content="Default_Transition_1x">
 			<param name="id" value="3207" />
 		</include>
 	</include>

diff --git a/16x9/Animations.xml b/16x9/Animations.xml
diff --git a/16x9/Colors.xml b/16x9/Colors.xml
@@ -265,6 +265,7 @@
 	<variable name="Plot_Color">
 		<value condition="$EXP[Container_HasBackground]">$VAR[Light_Color]</value>
 		<value condition="Skin.String(Theme,Light)">$VAR[Dark_Grey_Color]</value>
+		<value condition="Skin.HasSetting(Prefer_White_Plot_Color)">$VAR[Light_Color]</value>
 		<value>$VAR[Light_Grey_Color]</value>
 	</variable>
 	<variable name="Privacy_Policy_Color">
@@ -410,6 +411,10 @@
 		<value condition="Control.HasFocus(16010) | Control.HasFocus(16011)">$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>
+	</variable>
 	<variable name="skinsettings_Multiart_Interval_Button_Textcolor">
 		<value condition="Control.HasFocus(15240) | Control.HasFocus(15241)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
@@ -426,8 +431,7 @@
 		<value condition="Control.HasFocus(14130) | Control.HasFocus(14131)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
 	</variable>
-
-
+
 	<variable name="skinsettings_Widget1_View_Button_Textcolor">
 		<value condition="Control.HasFocus(1020) | Control.HasFocus(1021)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
@@ -914,6 +918,9 @@
 		<value condition="VideoPlayer.IsFullscreen + Integer.IsGreater(VideoPlayer.UserRating,1.5)">$VAR[User_Rating_Color]</value>
 		<value condition="VideoPlayer.IsFullscreen + Integer.IsGreater(VideoPlayer.UserRating,0.5) + !String.IsEqual(Window.(videoosd).Property(VideoPlayer_Rating_Fix),true)">$VAR[User_Rating_Color]</value>
 		<value condition="!String.IsEmpty(ListItem.UserRating)">$VAR[User_Rating_Color]</value>
+		<value condition="$EXP[Dominant_Color_View_Conditions] + Skin.String(Theme,Light) + !String.IsEmpty(Window(home).Property(clearlogo-alt_cropped-color)) + !String.IsEqual(Window(home).Property(clearlogo-alt_cropped-color),ff000000) + Integer.IsLessOrEqual(Window(home).Property(clearlogo-alt_cropped-luminosity),Skin.String(Background_High_Threshold))">$INFO[Window(home).Property(clearlogo-alt_cropped-color)]</value>
+		<value condition="$EXP[Dominant_Color_View_Conditions] + Skin.String(Theme,Light) + !String.IsEmpty(Window(home).Property(clearlogo_cropped-color)) + !String.IsEqual(Window(home).Property(clearlogo_cropped-color),ff000000) + Integer.IsLessOrEqual(Window(home).Property(clearlogo_cropped-luminosity),Skin.String(Background_High_Threshold))">$INFO[Window(home).Property(clearlogo_cropped-color)]</value>
+		<value condition="$EXP[Dominant_Color_View_Conditions] + !Skin.String(Theme,Light) + !String.IsEmpty(Window(home).Property(clearlogo_cropped-color)) + !String.IsEqual(Window(home).Property(clearlogo_cropped-color),ffffffff) + Integer.IsGreaterOrEqual(Window(home).Property(clearlogo_cropped-luminosity),Skin.String(Background_Low_Threshold))">$INFO[Window(home).Property(clearlogo_cropped-color)]</value>
 		<value>$VAR[Accent_Color]</value>
 	</variable>
 

diff --git a/16x9/Components.xml b/16x9/Components.xml
@@ -33,7 +33,7 @@
 				<width>$PARAM[size]</width>
 				<height>$PARAM[size]</height>
 				<texture colordiffuse="$PARAM[color]">dialogs/busy.png</texture>
-				<animation effect="rotate" start="0" end="-360" center="auto" time="1800" loop="true" tween="cubic" easing="out" condition="true">Conditional</animation>
+				<animation effect="rotate" start="0" end="-360" center="auto" time="Default_Transition_5x" loop="true" tween="cubic" easing="out" condition="true">Conditional</animation>
 				<nested />
 			</control>
 		</definition>
@@ -191,7 +191,7 @@
 
 	<include name="Background_Home">
 		<control type="image">
-			<animation effect="fade" start="0" end="100" time="360" delay="1800" tween="sine" easing="inout" reversible="true">Visible</animation>
+			<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_5x" tween="sine" easing="inout" reversible="true">Visible</animation>
 			<texture colordiffuse="$VAR[Dark_Color]">views/white_100.png</texture>
 		</control>
 		<include content="Background_Multiart_Home" condition="Skin.String(Background_Interval,5)">

diff --git a/16x9/Components_DialogKeyboard.xml b/16x9/Components_DialogKeyboard.xml
@@ -504,7 +504,7 @@
 			<include content="Visible_Fade_Animation" />
 		</include>
 		<control type="panel" id="3100">
-			<animation effect="fade" start="0" end="100" time="360" delay="360" tween="sine" easing="inout" condition="Integer.IsGreater(Container(3100).NumItems,0) | Container(3100).IsUpdating">Conditional</animation>
+			<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" condition="Integer.IsGreater(Container(3100).NumItems,0) | Container(3100).IsUpdating">Conditional</animation>
 			<visible allowhiddenfocus="true">!Control.IsVisible(313)</visible>
 			<centerleft>50%</centerleft>
 			<width>1620</width>

diff --git a/16x9/Components_Dialogs.xml b/16x9/Components_Dialogs.xml
@@ -94,7 +94,7 @@
 
 	<include name="ContextMenuLabelUnfocused">
 		<definition>
-			<height>55</height>
+			<height>60</height>
 			<font>Main_Menu_Unfocused</font>
 			<textcolor>$VAR[Light_Color]</textcolor>
 		</definition>

diff --git a/16x9/Components_Home.xml b/16x9/Components_Home.xml
@@ -134,8 +134,8 @@
 				<itemgap>$PARAM[itemgap]</itemgap>
 				<usecontrolcoords>true</usecontrolcoords>
 				<scrolltime tween="sine" easing="inout">360</scrolltime>
-				<animation effect="slide" start="0" end="-120" condition="!Container($PARAM[hidden_id]).OnScrollNext" reversible="false" time="180" tween="sine" easing="inout">Conditional</animation>
-				<animation effect="slide" start="0" end="120" condition="!Container($PARAM[hidden_id]).OnScrollPrevious" reversible="false" time="180" tween="sine" easing="inout">Conditional</animation>
+				<animation effect="slide" start="0" end="-120" condition="!Container($PARAM[hidden_id]).OnScrollNext" reversible="false" time="Default_Transition_0.5x" tween="sine" easing="inout">Conditional</animation>
+				<animation effect="slide" start="0" end="120" condition="!Container($PARAM[hidden_id]).OnScrollPrevious" reversible="false" time="Default_Transition_0.5x" tween="sine" easing="inout">Conditional</animation>
 				<!-- Previous -->
 				<control type="label">
 					<visible>Container($PARAM[hidden_id]).HasPrevious</visible>

diff --git a/16x9/Components_Infoscreens.xml b/16x9/Components_Infoscreens.xml
@@ -103,7 +103,7 @@
 			<textcolor>$VAR[Light_Color]</textcolor>
 			<label>$INFO[ListItem.AddonDescription]</label>
 			<align>left</align>
-			<autoscroll delay="5000" time="1500" repeat="2000">true</autoscroll>
+			<autoscroll>true</autoscroll>
 		</control>
 	</include>
 
@@ -254,8 +254,8 @@
 				<itemgap>$PARAM[itemgap]</itemgap>
 				<usecontrolcoords>true</usecontrolcoords>
 				<control type="image">
-					<animation effect="zoom" center="auto" start="130" end="100" time="360" tween="back" easing="out" condition="!Control.HasFocus(4021)" reversible="false">Conditional</animation>
-					<animation effect="slide" end="0,7" time="360" tween="back" easing="out" condition="!Control.HasFocus(4021)" reversible="false">Conditional</animation>
+					<animation effect="zoom" center="auto" start="130" end="100" time="Default_Transition_1x" tween="back" easing="out" condition="!Control.HasFocus(4021)" reversible="false">Conditional</animation>
+					<animation effect="slide" end="0,7" time="Default_Transition_1x" tween="back" easing="out" condition="!Control.HasFocus(4021)" reversible="false">Conditional</animation>
 					<width>60</width>
 					<centerleft>50%</centerleft>
 					<height>60</height>
@@ -270,8 +270,8 @@
 				<control type="image">
 					<visible>!String.IsEmpty($PARAM[type].UserRating)</visible>
 					<animation effect="rotate" center="auto" end="180" time="0" condition="true" reversible="false">Conditional</animation>
-					<animation effect="zoom" center="auto" start="130" end="100" time="360" tween="back" easing="out" condition="!Control.HasFocus(4022)" reversible="false">Conditional</animation>
-					<animation effect="slide" end="0,7" time="360" tween="back" easing="out" condition="!Control.HasFocus(4022)" reversible="false">Conditional</animation>
+					<animation effect="zoom" center="auto" start="130" end="100" time="Default_Transition_1x" tween="back" easing="out" condition="!Control.HasFocus(4022)" reversible="false">Conditional</animation>
+					<animation effect="slide" end="0,7" time="Default_Transition_1x" tween="back" easing="out" condition="!Control.HasFocus(4022)" reversible="false">Conditional</animation>
 					<width>60</width>
 					<centerleft>50%</centerleft>
 					<height>60</height>

diff --git a/16x9/Components_OSD.xml b/16x9/Components_OSD.xml
@@ -156,23 +156,23 @@
 					<visible>[MusicPlayer.Offset(0).Exists | Player.HasVideo] + !Player.Paused + !Player.Forwarding + !Player.Rewinding</visible>
 					<include content="Visible_Fade_Delayed_Animation" />
 					<control type="image">
-						<animation effect="zoom" end="100, $PARAM[maxbarheight1]" center="0,$PARAM[width]" time="240" delay="111" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
+						<animation effect="zoom" end="100, $PARAM[maxbarheight1]" center="0,$PARAM[width]" time="NowPlaying_Bar_1" delay="NowPlaying_Bar_1_Delay" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
 						<left>$$PARAM[baredge]</left>
 						<bottom>0</bottom>
 						<width>$PARAM[barwidth]</width>
 						<height>$PARAM[barwidth]</height>
 						<texture colordiffuse="$PARAM[color]">views/white_100.png</texture>
 					</control>
 					<control type="image">
-						<animation effect="zoom" end="100, $PARAM[maxbarheight2]" center="0,$PARAM[width]" time="240" delay="0" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
+						<animation effect="zoom" end="100, $PARAM[maxbarheight2]" center="0,$PARAM[width]" time="NowPlaying_Bar_2" delay="0" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
 						<centerleft>50%</centerleft>
 						<bottom>0</bottom>
 						<width>$PARAM[barwidth]</width>
 						<height>$PARAM[barwidth]</height>
 						<texture colordiffuse="$PARAM[color]">views/white_100.png</texture>
 					</control>
 					<control type="image">
-						<animation effect="zoom" end="100, $PARAM[maxbarheight3]" center="0,$PARAM[width]" time="190" delay="0" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
+						<animation effect="zoom" end="100, $PARAM[maxbarheight3]" center="0,$PARAM[width]" time="NowPlaying_Bar_3" delay="0" tween="sine" easing="inout" pulse="true" condition="true">Conditional</animation>
 						<right>$$PARAM[baredge]</right>
 						<bottom>0</bottom>
 						<width>$PARAM[barwidth]</width>
@@ -333,7 +333,7 @@
 					<control type="group">
 						<visible>$PARAM[playicon]</visible>
 						<visible>Player.Paused</visible>
-						<animation effect="fade" start="100" end="0" time="360" delay="540" tween="sine" easing="inout">Hidden</animation>
+						<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="Default_Transition_1.5x" tween="sine" easing="inout">Hidden</animation>
 						<control type="image">
 							<visible>Player.Playing</visible>
 							<texture colordiffuse="$PARAM[color]">icons/icon_Player.Playing_$PARAM[icon_type].png</texture>

diff --git a/16x9/Components_Settings.xml b/16x9/Components_Settings.xml
@@ -372,7 +372,7 @@
 			</include>
 			<!-- Arrows when focused -->
 			<control type="group">
-				<animation effect="zoom" center="auto" start="112" end="100" time="135" tween="back" easing="in" condition="ControlGroup(3000).HasFocus">Conditional</animation>
+				<animation effect="zoom" center="auto" start="112" end="100" time="Default_Transition_0.5x" tween="back" easing="in" condition="ControlGroup(3000).HasFocus">Conditional</animation>
 				<visible>ControlGroup(3000).HasFocus</visible>
 				<left>30</left>
 				<width>60</width>
@@ -416,47 +416,47 @@
 				<itemgap>0</itemgap>
 				<scrolltime>0</scrolltime>
 				<control type="button" id="3001">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(skinsettings)">ReplaceWindowAndFocus(skinsettings,3001)</onfocus>
 				</control>
 				<control type="button" id="3002">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(interfacesettings)">ReplaceWindowAndFocus(interfacesettings,3002)</onfocus>
 				</control>
 				<control type="button" id="3003">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(mediasettings)">ReplaceWindowAndFocus(mediasettings,3003)</onfocus>
 				</control>
 				<control type="button" id="3004">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(playersettings)">ReplaceWindowAndFocus(playersettings,3004)</onfocus>
 				</control>
 				<control type="button" id="3005">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(systemsettings)">ReplaceWindowAndFocus(systemsettings,3005)</onfocus>
 				</control>
 				<control type="button" id="3006">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(servicesettings)">ReplaceWindowAndFocus(servicesettings,3006)</onfocus>
 				</control>
 				<control type="button" id="3007">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(gamesettings)">ReplaceWindowAndFocus(gamesettings,3007)</onfocus>
 				</control>
 				<control type="button" id="3008">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(pvrsettings)">ReplaceWindowAndFocus(pvrsettings,3008)</onfocus>
 				</control>
 				<control type="button" id="3009">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(profiles)">ReplaceWindowAndFocus(profiles,3009)</onfocus>
 				</control>
 				<control type="button" id="3010">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(systeminfo)">ReplaceWindowAndFocus(systeminfo,3010)</onfocus>
 				</control>
 				<control type="button" id="3011">
-					<animation effect="slide" start="0" end="0" time="90">Hidden</animation>
+					<animation effect="slide" start="0" end="0" time="Default_Transition_0.5x">Hidden</animation>
 					<onfocus condition="!Window.Is(filemanager)">ReplaceWindowAndFocus(filemanager,3011)</onfocus>
 				</control>
 			</control>