From 472f81c8c9e0e93a5844010bf4076749d07039c9 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Thu, 29 Mar 2018 16:45:19 +0100
Subject: [PATCH] various

---
 1080i/DialogVolumeBar.xml              |   7 +-
 1080i/Includes.xml                     |  10 +-
 1080i/View_ArtistAlbums.xml            |   2 +-
 1080i/View_Games.xml                   | 142 +++++++++++--------------
 1080i/custom_musicPlayerFullscreen.xml |  24 ++---
 changelog.txt                          |   3 +-
 colors/orange.xml                      |  14 +++
 7 files changed, 96 insertions(+), 106 deletions(-)
 create mode 100644 colors/orange.xml

diff --git a/1080i/DialogVolumeBar.xml b/1080i/DialogVolumeBar.xml
index c329c3f..4ef4349 100644
--- a/1080i/DialogVolumeBar.xml
+++ b/1080i/DialogVolumeBar.xml
@@ -55,8 +55,13 @@
                 <width>468</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
-                <label>$INFO[player.volume]</label>
+                <label>$INFO[Control.GetLabel(20),, %]</label>
             </control>
+        </control>
+		<!--provide % vals for volume-->
+		<control type="progress" id="20">
+		    <visible>false</visible>
+            <info>Player.Volume</info>
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 8ade38a..5dd0e14 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -148,16 +148,16 @@
     </include>
     <!--Global background-->
     <include name="globalBackground">
-        <control type="image">
+		<control type="image">
             <include>dimensionsFullscreen</include>
-            <texture>backgroundImage.jpg</texture>
-            <colordiffuse>ffFFFFFF</colordiffuse>
+            <texture>colors/white.png</texture>
+            <colordiffuse>background</colordiffuse>
             <aspectratio>stretch</aspectratio>
         </control>
         <control type="image">
             <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <colordiffuse>CCFFFFFF</colordiffuse>
+            <texture>backgroundImage.jpg</texture>
+            <colordiffuse>ff333333</colordiffuse>
             <aspectratio>stretch</aspectratio>
         </control>
     </include>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 62804aa..6a4b577 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -8,7 +8,7 @@
 			<control type="image">
 				<include>dimensionsFullscreen</include>
 				<aspectratio scalediffuse="false">stretch</aspectratio>
-				<texture border="0">$INFO[Container.Art(fanart)]</texture>
+				<texture border="0">$INFO[Container.Art(artist.fanart)]</texture>
 				<fadetime>0</fadetime>
 				<colordiffuse>66ffffff</colordiffuse>
 			</control>
diff --git a/1080i/View_Games.xml b/1080i/View_Games.xml
index 8a4a636..157e4e4 100644
--- a/1080i/View_Games.xml
+++ b/1080i/View_Games.xml
@@ -4,101 +4,83 @@
         <control type="panel" id="50">
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
-            <width>24-col</width>
-            <height>23-row</height>
+            <width>1800</width>
+            <height>24-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>50</ondown>
-            <onup>50</onup>
+            <onup>9998</onup>
+            <onback>9998</onback>
             <pagecontrol>60</pagecontrol>
-            <itemlayout width="24-col" height="2-row">
+            <scrolltime tween="cubic" easing="out">600</scrolltime>
+            <itemlayout width="293" height="348">
                 <control type="image">
                     <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                </control>
-                <control type="image">
-                    <posx>1-col</posx>
                     <posy>0</posy>
-                    <width>23-col</width>
-                    <height>69</height>
+                    <width>4-col-gutter</width>
+                    <height>4-col-gutter</height>
                     <aspectratio>stretch</aspectratio>
-                    <texture border="0">colors/black.png</texture>
-                    <colordiffuse>textboxInactive</colordiffuse>
+                    <texture>colors/black.png</texture>
+                    <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>overlay</colordiffuse>
                 </control>
-                <control type="label">
-                    <posx>1-col-indent</posx>
+				<control type="image">
+                    <posx>0</posx>
                     <posy>0</posy>
-                    <width>22-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.Label]</label>
+                    <width>4-col-gutter</width>
+                    <height>4-col-gutter</height>
+                    <aspectratio>scale</aspectratio>
+                    <texture>$INFO[ListItem.Art(thumb)]</texture>
+                    <bordersize>6</bordersize>
+                    <colordiffuse>77ffffff</colordiffuse>
                 </control>
-                <control type="label">
-                    <visible>!String.IsEmpty(ListItem.playcount)</visible>
-                    <posx>23-col-gutter</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>2-row</height>
+                <control type="textbox">
+                    <visible>!controlgroup(9000).hasfocus</visible>
+                    <posx>12</posx>
+                    <posy>258</posy>
+                    <width>240</width>
+                    <height>60</height>
                     <aligny>center</aligny>
-                    <align>right</align>
-                    <font>symbolLarge</font>
+                    <font>thumbTitle</font>
                     <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label></label>
+                    <label>[B]$INFO[ListItem.label][/B]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="24-col" height="2-row">
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    <animation type="focus" loop="false" reversible="false">
-                        <effect type="fade" time="500"/>
-                        <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
-                    </animation>
-                </control>
-                <control type="image">
-                    <posx>1-col</posx>
-                    <posy>0</posy>
-                    <width>23-col</width>
-                    <height>2-row</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture border="0">colors/white.png</texture>
-                    <colordiffuse>highlight</colordiffuse>
-                </control>
-                <control type="label">
-                    <posx>1-col-indent</posx>
-                    <posy>0</posy>
-                    <width>22-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.Label]</label>
-                </control>
-                <control type="label">
-                    <visible>!String.IsEmpty(ListItem.playcount)</visible>
-                    <posx>23-col-gutter</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>right</align>
-                    <font>symbolLarge</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label></label>
+            <focusedlayout width="4-col" height="348">
+                <control type="group">
+                    <include>focusThumb</include>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                        <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>FF000000</colordiffuse>
+                    </control>
+					<control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>scale</aspectratio>
+                        <texture>$INFO[ListItem.Art(thumb)]</texture>
+                        <bordersize>6</bordersize>
+                    </control>
+                    <control type="textbox">
+                        <visible>!controlgroup(9000).hasfocus</visible>
+                        <posx>12</posx>
+                        <posy>258</posy>
+                        <width>240</width>
+                        <height>60</height>
+                        <aligny>center</aligny>
+                        <font>thumbTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>[B]$INFO[ListItem.label][/B]</label>
+                    </control>
                 </control>
             </focusedlayout>
         </control>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 006d22f..0764f39 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1103">
 	<defaultcontrol always="true">9876</defaultcontrol>
-	<onload condition="System.HasAddon(script.artistslideshow)">RunScript(script.artistslideshow)</onload>
 	<onunload>control.setfocus(9999)</onunload>
 	<controls>
-		<include>globalBackground</include>
+		<control type="image">
+            <include>dimensionsFullscreen</include>
+            <texture>colors/black.png</texture>
+            <aspectratio>stretch</aspectratio>
+        </control>
 		<control type="group">
 			<include>fadeInOut</include>
 			<control type="group">
 				<!--fanart-->
 				<control type="image">
-					<visible>String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow))</visible>
+					<visible>!Visualisation.Enabled</visible>
 					<posx>0</posx>
 					<posy>0</posy>
 					<include>dimensionsFullscreen</include>
@@ -19,22 +22,9 @@
 					<include>kenBurnsey</include>
 					<colordiffuse>44ffffff</colordiffuse>
 				</control>
-				<!--artist slideshow (if active)-->
-				<control type="multiimage">
-					<visible>!String.IsEmpty(Window(Visualisation).Property(ArtistSlideshow))</visible>
-					<include>dimensionsFullscreen</include>
-					<aspectratio>scale</aspectratio>
-					<timeperimage>15000</timeperimage>
-					<randomize>true</randomize>
-					<fadetime>1000</fadetime>
-					<loop>yes</loop>
-					<imagepath>$INFO[Window(Visualisation).Property(ArtistSlideshow)]</imagepath>
-					<include>kenBurnsey</include>
-					<colordiffuse>88ffffff</colordiffuse>
-				</control>
 				<!--visualisation-->
 				<control type="visualisation" id="2">
-					<visible>!SlideShow.IsActive</visible>
+					<visible>Visualisation.Enabled</visible>
 					<description>visualisation</description>
 					<posx>0</posx>
 					<posy>0</posy>
diff --git a/changelog.txt b/changelog.txt
index e29c759..0310884 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -30,9 +30,8 @@
 - [COMPLETE] global search addon skinned
 - [COMPLETE] GameOSD.xml
 
-- ensure texture background doesn't appear behind ken burns effect 
-
 - restore player controls video
+- Add volume passthrough / % volume control (see https://github.com/xperience1080/skin.xperience1080/blob/master/1080i/DialogVolumeBar.xml)
 
 - check controls for new window: MyGames.xml
 - Screenshots etc need updating
diff --git a/colors/orange.xml b/colors/orange.xml
new file mode 100644
index 0000000..da721a3
--- /dev/null
+++ b/colors/orange.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<colors>
+    <color name="black">ff111111</color>
+    <color name="background">ff151515</color>
+    <color name="highlight">aace5621</color>
+    <color name="overlay">44ffffff</color>
+    <color name="textActive">fff0f0f0</color>
+    <color name="textDisabled">ff757575</color>
+    <color name="menuDisabled">aaf0f0f0</color>
+    <color name="menuUnselected">ff919191</color>
+    <color name="textboxInactive">99FFFFFF</color>
+    <color name="keyboardInactive">aa212121</color>
+    <color name="keyboardAccent">ffBDBDBD</color>
+</colors>
\ No newline at end of file