From 0f590757df0c8f1efab8fce44444e0820728636e Mon Sep 17 00:00:00 2001
From: chrisbevan <chrisbevan@Chriss-iMac.local>
Date: Tue, 1 Nov 2016 14:59:28 +0000
Subject: [PATCH] various

---
 1080i/Font.xml            |  3 +--
 1080i/Home.xml            |  1 -
 1080i/Includes.xml        | 25 --------------------
 1080i/MyMusicNav.xml      |  1 -
 1080i/MyPVRChannels.xml   |  1 -
 1080i/MyPVRGuide.xml      |  1 -
 1080i/MyPVRRecordings.xml | 13 +++++-----
 1080i/MyPics.xml          |  1 -
 1080i/MyPlaylist.xml      |  1 -
 1080i/MyPrograms.xml      | 16 +++++--------
 1080i/MyVideoNav.xml      |  1 -
 1080i/View_Albums.xml     | 50 ++++++++++++++++++---------------------
 changelog.txt             |  7 +++---
 13 files changed, 40 insertions(+), 81 deletions(-)

diff --git a/1080i/Font.xml b/1080i/Font.xml
index 5778392..479a1c5 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -133,7 +133,6 @@
         </font>
         <font>
             <name>largeTitle</name>
-            <!--prev dialogTitle-->
             <filename>roboto/black.ttf</filename>
             <size>60</size>
             <linespacing>1.0</linespacing>
@@ -179,7 +178,7 @@
         <font>
             <name>thumbTitle</name>
             <filename>roboto/regular.ttf</filename>
-            <size>24</size>
+            <size>20</size>
             <linespacing>1.0</linespacing>
         </font>
         <font>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 7f6217f..9fb7748 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -214,7 +214,6 @@
                 <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
             </control>
         </control>
-		<include>miniVideoPlayer</include>
 		<!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 3795711..ae29b30 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -121,31 +121,6 @@
 			</control>
 		</control>
     </include>
-	<include name="miniVideoPlayer">
-		<!--mini player window-->
-		<control type="group">
-			<visible>Player.HasVideo</visible>
-			<posx>col-21-begin</posx>
-			<posy>0</posy>
-			<control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>300</width>
-                <height>174</height>
-                <aspectratio>stretch</aspectratio>
-                <texture>colors/black.png</texture>
-				<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                <bordersize>6</bordersize>
-                <colordiffuse>overlay</colordiffuse>
-            </control>
-			<control type="videowindow">
-				<posx>6</posx>
-				<posy>6</posy>
-				<width>4-col</width>
-				<height>162</height>
-			</control>
-		</control>
-	</include>
      <!--conditional positioning for progress dialogs (avoid overlaps)-->
     <include name="progressPosition1"><posy>row-2-begin</posy></include>
     <include name="progressPosition2"><posy>row-6-begin</posy></include>
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 68951fe..6bb4ed3 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -78,7 +78,6 @@
                 <include>dateTime</include>
             </control>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index dd70c53..fc22021 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -74,7 +74,6 @@
             <!--dateTime-->
             <include>dateTime</include>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 248a088..1fc833c 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -173,7 +173,6 @@
             <!--dateTime-->
             <include>dateTime</include>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 4da87f5..f2d6af5 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -79,7 +79,7 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,$LOCALIZE[31192]: ,   ]$INFO[ListItem.Duration,(,)]</label>
+                            <label>$INFO[ListItem.Date,,   ]$INFO[ListItem.Duration,(,)]</label>
                         </control>
                     </itemlayout>
                     <focusedlayout width="24-col" height="2-row">
@@ -139,28 +139,28 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,$LOCALIZE[31192]: ,   ]$INFO[ListItem.Duration,(,)]</label>
+                            <label>$INFO[ListItem.Date,,   ]$INFO[ListItem.Duration,(,)]</label>
                         </control>
                     </focusedlayout>
                 </control>
                 <!--Additional info-->
                 <control type="group">
-                    <posx>0</posx>
+                    <posx>16-col</posx>
                     <posy>22-row</posy>
                     <control type="progress">
                         <description>Disk usage bar</description>
                         <left>0</left>
                         <top>1</top>
-                        <width>24-col</width>
+                        <width>8-col</width>
                         <height>1-row</height>
-                        <texturebg colordiffuse="overlay">colors/black.png</texturebg>
+                        <texturebg colordiffuse="textboxInactive">colors/black.png</texturebg>
                         <midtexture colordiffuse="highlight">colors/white.png</midtexture>
                         <info>PVR.backenddiskspaceprogr</info><visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible>
                     </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>24-col</width>
+                        <width>8-col</width>
                         <font>itemSubTitle</font>
                         <align>center</align>
                         <textcolor>background</textcolor>
@@ -207,7 +207,6 @@
             <!--dateTime-->
             <include>dateTime</include>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index b68cd8d..7bee5da 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -67,7 +67,6 @@
             <!--dateTime-->
             <include>dateTime</include>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index d97f8d5..de80fb4 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -87,7 +87,6 @@
             <!--dateTime-->
             <include>dateTime</include>
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 8e24b6d..65ed091 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -29,7 +29,7 @@
 			            <onback>9000</onback>
 			            <pagecontrol>60</pagecontrol>
 			            <scrolltime tween="cubic" easing="out">600</scrolltime>
-			            <itemlayout width="300" height="348">
+			            <itemlayout width="4-col" height="348">
 			                <control type="image">
 			                    <posx>0</posx>
 			                    <posy>0</posy>
@@ -44,22 +44,20 @@
 			                <control type="label">
 			                    <visible>!controlgroup(9000).hasfocus</visible>
 			                    <posx>12</posx>
-			                    <posy>264</posy>
+			                    <posy>262</posy>
 			                    <width>240</width>
 			                    <height>1-row</height>
-			                    <align>center</align>
 			                    <aligny>center</aligny>
 			                    <font>thumbtitle</font>
-			                    <textcolor>textDisabled</textcolor>
+			                    <textcolor>textActive</textcolor>
 			                    <label>[B]$INFO[ListItem.label][/B]</label>
 			                </control>
 			                <control type="label">
 			                    <visible>!controlgroup(9000).hasfocus</visible>
 			                    <posx>12</posx>
-			                    <posy>292</posy>
+			                    <posy>286</posy>
 			                    <width>240</width>
 			                    <height>1-row</height>
-			                    <align>center</align>
 			                    <aligny>center</aligny>
 			                    <font>thumbTitle</font>
 			                    <textcolor>textDisabled</textcolor>
@@ -103,10 +101,9 @@
 			                    </control>
 			                    <control type="label">
 			                        <posx>12</posx>
-			                        <posy>264</posy>
+			                        <posy>262</posy>
 			                        <width>240</width>
 			                        <height>1-row</height>
-			                        <align>center</align>
 			                        <aligny>center</aligny>
 			                        <font>thumbtitle</font>
 			                        <textcolor>textActive</textcolor>
@@ -114,10 +111,9 @@
 			                    </control>
 			                    <control type="label">
 			                        <posx>12</posx>
-			                        <posy>292</posy>
+			                        <posy>286</posy>
 			                        <width>240</width>
 			                        <height>1-row</height>
-			                        <align>center</align>
 			                        <aligny>center</aligny>
 			                        <font>thumbTitle</font>
 			                        <textcolor>textActive</textcolor>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 03dcf7b..ef3f637 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -81,7 +81,6 @@
                 <include>dateTime</include>
             </control>			
         </control>
-		<include>miniVideoPlayer</include>
         <!--hub menu-->
         <include>hubMenu</include>
         <include>hubOptions</include>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 8665168..95402ee 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -58,22 +58,20 @@
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>264</posy>
+                    <posy>262</posy>
                     <width>240</width>
                     <height>1-row</height>
-                    <align>center</align>
                     <aligny>center</aligny>
                     <font>thumbtitle</font>
-                    <textcolor>textDisabled</textcolor>
+                    <textcolor>textActive</textcolor>
                     <label>[B]$INFO[ListItem.Title][/B]</label>
                 </control>
                 <control type="label">
                     <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>292</posy>
+                    <posy>286</posy>
                     <width>240</width>
                     <height>1-row</height>
-                    <align>center</align>
                     <aligny>center</aligny>
                     <font>thumbTitle</font>
                     <textcolor>textDisabled</textcolor>
@@ -127,28 +125,26 @@
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <posy>264</posy>
-                        <width>240</width>
-                        <height>1-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>thumbtitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>[B]$INFO[ListItem.Title][/B]</label>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <posy>292</posy>
-                        <width>240</width>
-                        <height>1-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>thumbTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.artist]</label>
-                    </control>
+					<control type="label">
+	                    <posx>12</posx>
+	                    <posy>262</posy>
+	                    <width>240</width>
+	                    <height>1-row</height>
+	                    <aligny>center</aligny>
+	                    <font>thumbtitle</font>
+	                    <textcolor>textActive</textcolor>
+	                    <label>[B]$INFO[ListItem.Title][/B]</label>
+	                </control>
+	                <control type="label">
+	                    <posx>12</posx>
+	                    <posy>286</posy>
+	                    <width>240</width>
+	                    <height>1-row</height>
+	                    <aligny>center</aligny>
+	                    <font>thumbTitle</font>
+	                    <textcolor>textActive</textcolor>
+	                    <label>$INFO[ListItem.artist]</label>
+	                </control>
                 </control>
             </focusedlayout>
         </control>
diff --git a/changelog.txt b/changelog.txt
index 9be4491..625fdab 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,6 +19,8 @@
 
 [TODO]
 
+event log screen (in settings)
+
 Home Backgrounds (esp. non library)
 
 Fix stop from fullscreen music view
@@ -28,17 +30,16 @@ Skin shortcuts for all sub menus
 
 Check yes / no progress bar works ok
 
-and recordings storage indicator
-
 Add user option Revise player stop on return
 
 DialogAudioDSPManager.xml
 
+Gamepad setup
+
 DialogPlayerProcessInfo.xml
 
 Check RCB (e.g. busy spinner and menu width)
 
-Check screenshots work in dialogAddonSettings
 
 check all active strings
 MyPVRTimers needs creating and testing