From 74048c5bdcf5de5c3a32e17d950baa830733b6eb Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sun, 29 May 2016 18:38:50 +0100
Subject: [PATCH] Bits and bobs

---
 1080i/DialogFullScreenInfo.xml         |  17 ++-
 1080i/View_MusicRecentItems.xml        |   8 +-
 1080i/View_Photos.xml                  | 142 +++++--------------------
 1080i/View_TVShows.xml                 |   1 -
 1080i/View_VideoRecentItems.xml        |   8 +-
 1080i/custom_musicPlayerFullscreen.xml |   2 +-
 changelog.txt                          |   4 +-
 language/English/strings.po            |   4 +
 8 files changed, 63 insertions(+), 123 deletions(-)

diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml
index 1d1f0b8..45eedec 100644
--- a/1080i/DialogFullScreenInfo.xml
+++ b/1080i/DialogFullScreenInfo.xml
@@ -72,10 +72,25 @@
                     <font>textbox</font>
                     <width>24-col</width>
                     <textcolor>textActive</textcolor>
-                    <height>114</height>
+                    <height>84</height>
                     <label fallback="31205">$INFO[videoplayer.plot]</label>
                     <autoscroll delay="10000" time="1000" repeat="10000"/>
                 </control>
+                <control type="group">
+                    <visible>Pvr.IsPlayingTv | Pvr.IsPlayingRadio</visible>
+                    <posx>0</posx>
+                    <posy>5-row</posy>
+                    <control type="label">
+                        <posx>96r</posx>
+                        <posy>6</posy>
+                        <font>buttonTitle</font>
+                        <align>right</align>
+                        <width>fullscreenWidth</width>
+                        <textcolor>textActive</textcolor>
+                        <height>1-row</height>
+                        <label>[B][COLOR highlight]$LOCALIZE[31047] $INFO[VideoPlayer.TimeRemaining][/COLOR] - $INFO[VideoPlayer.NextTitle][/B]</label>
+                    </control>
+                </control>
             </control>
         </control>
         <!--debugging-->
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index e41b45e..1909cd3 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -179,7 +179,7 @@
                 <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
                     <effect type="fade" start="100" end="0" time="200"/>
                 </animation>
-                <posx>72</posx>
+                <posx>60</posx>
                 <posy>672</posy>
                 <width>24-col</width>
                 <height>78</height>
@@ -189,11 +189,12 @@
                 <orientation>horizontal</orientation>
                 <itemlayout width="4-col" height="2-row">
                     <control type="label">
-                        <posx>12</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>4-col</width>
                         <height>2-row</height>
                         <font>buttonTitle</font>
+                        <align>center</align>
                         <aligny>center</aligny>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -212,12 +213,13 @@
                         <animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
                     </control>
                     <control type="label">
-                        <posx>12</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>4-col</width>
                         <height>2-row</height>
                         <font>buttonTitle</font>
                         <aligny>center</aligny>
+                        <align>center</align>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>[B]$INFO[ListItem.property(textTitle)][/B]</label>
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 396a967..1eb72a0 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -5,148 +5,64 @@
         <control type="panel" id="52">
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
-            <width>24-col</width>
-            <height>24-row</height>
+            <width>1800</width>
+            <height>25-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
-            <ondown>52</ondown>
-            <onup>52</onup>
-            <onback>9000</onback>
-            <pagecontrol>60</pagecontrol>
+            <ondown>50</ondown>
+            <onup>50</onup>
             <scrolltime tween="cubic" easing="out">600</scrolltime>
-            <itemlayout width="6-col" height="294">
+            <pagecontrol>60</pagecontrol>
+            <itemlayout width="444" height="336">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>396</width>
-                    <height>264</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture border="6">DefaultAlbumCover.png</texture>
-                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
-                    <colordiffuse>textboxInactive</colordiffuse>
+                    <width>6-col-gutter</width>
+                    <height>4-col-gutter</height>
+                    <aspectratio>scale</aspectratio>
+                    <texture fallback="DefaultPoster.png" border="6">$INFO[Listitem.thumb]</texture>
+                    <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <colordiffuse>ffffffff</colordiffuse>
                 </control>
                 <control type="label">
-                    <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
-                    <posy>2-row</posy>
-                    <width>372</width>
-                    <height>2-row</height>
+                    <posy>268</posy>
+                    <width>384</width>
+                    <height>1-row</height>
                     <align>center</align>
                     <aligny>center</aligny>
-                    <font>regularStrong</font>
+                    <font>thumbTitle</font>
                     <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.label]</label>
+                    <shadowcolor>ff333333</shadowcolor>
                 </control>
-                <control type="label">
-                    <visible>!controlgroup(9000).hasfocus</visible>
-                    <posx>12</posx>
-                    <posy>3-row</posy>
-                    <width>372</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>buttonTitle</font>
-                    <textcolor>textDisabled</textcolor>
-                    <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>396</width>
-                    <height>264</height>
-                    <aspectratio>scale</aspectratio>
-                    <texture border="6">$INFO[Listitem.thumb]</texture>
-                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
-                    <bordersize>6</bordersize>
-                    <colordiffuse>ffFFFFFF</colordiffuse>
-                </control>
-              </itemlayout>
-            <focusedlayout width="6-col" height="294">
+            </itemlayout>
+            <focusedlayout width="444" height="336">
                 <control type="group">
                     <include>focusThumb</include>
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>396</width>
-                        <height>264</height>
+                        <width>6-col-gutter</width>
+                        <height>4-col-gutter</height>
                         <aspectratio>scale</aspectratio>
-                        <texture border="6">DefaultAlbumCover.png</texture>
+                        <texture fallback="DefaultPoster.png" border="6">$INFO[Listitem.thumb]</texture>
                         <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                         <bordersize>6</bordersize>
-                        <colordiffuse>ff666666</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>396</width>
-                        <height>264</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture border="6">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-                        <bordersize>6</bordersize>
-                        <colordiffuse>ff666666</colordiffuse>
+                        <colordiffuse>ffffffff</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>12</posx>
-                        <posy>2-row</posy>
-                        <width>372</width>
-                        <height>2-row</height>
+                        <posy>268</posy>
+                        <width>384</width>
+                        <height>1-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
+                        <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <posy>3-row</posy>
-                        <width>372</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.Property(Addon.Summary)]</label>
-                    </control>
-                    <control type="grouplist">
-                        <posx>114</posx>
-                        <posy>row-5-begin</posy>
-                        <width>6-col</width>
-                        <orientation>horizontal</orientation>
-                        <visible>!isempty(ListItem.PicturePath)</visible>
-                        <control type="label">
-                            <width>24</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>symbol</font>
-                            <textcolor>textActive</textcolor>
-                            <label></label>
-                        </control>
-                        <control type="label">
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>smallStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$LOCALIZE[31186]</label>
-                        </control>
-                        <control type="label">
-                            <width>24</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>symbol</font>
-                            <textcolor>textActive</textcolor>
-                            <label></label>
-                        </control>
-                        <control type="label">
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>smallStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$LOCALIZE[31184]</label>
-                        </control>
+                        <shadowcolor>ff333333</shadowcolor>
                     </control>
                 </control>
             </focusedlayout>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 648fc89..0298467 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -30,7 +30,6 @@
                 <onright>60</onright>
                 <ondown>50</ondown>
                 <onup>50</onup>
-                <onback>9000</onback>
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
                 <onback>9000</onback>
                 <pagecontrol>60</pagecontrol>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index 9082166..2206c37 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -318,7 +318,7 @@
             <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
                 <effect type="fade" start="100" end="0" time="200"/>
             </animation>
-            <posx>72</posx>
+            <posx>60</posx>
             <posy>636</posy>
             <width>24-col</width>
             <height>84</height>
@@ -328,12 +328,13 @@
             <orientation>horizontal</orientation>
             <itemlayout width="4-col" height="2-row">
                 <control type="label">
-                    <posx>12</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
                     <width>4-col</width>
                     <height>2-row</height>
                     <font>buttonTitle</font>
                     <aligny>center</aligny>
+                    <align>center</align>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>[B]$INFO[ListItem.property(textTitle)][/B]</label>
@@ -351,12 +352,13 @@
                     <animation effect="fade" start="100" end="20" time="750" condition="Control.HasFocus(9123)" pulse="true">Conditional</animation>
                 </control>
                 <control type="label">
-                    <posx>12</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
                     <width>4-col</width>
                     <height>2-row</height>
                     <font>buttonTitle</font>
                     <aligny>center</aligny>
+                    <align>center</align>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                     <label>[B]$INFO[ListItem.property(textTitle)][/B]</label>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 9a02c81..16eafd1 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -117,7 +117,7 @@
                        <width>9-col</width>
                        <height>2-row</height>
                        <texture>colors/black.png</texture>
-                       <colordiffuse>overlay</colordiffuse>
+                       <colordiffuse>99000000</colordiffuse>
                    </control>
                    <control type="progress">
                          <description>Duration</description>
diff --git a/changelog.txt b/changelog.txt
index d91ce5d..b0b8f55 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -44,7 +44,9 @@
 
 ***To do (Skinners Notes)***
 
-Extend sort menus to include music / games etc shortcuts
+Update music library not working
+
+Photo section needs revision (incl. Onback)
 
 PVR item info rework
 
diff --git a/language/English/strings.po b/language/English/strings.po
index 13138a0..4844c37 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -213,6 +213,10 @@ msgctxt "#31046"
 msgid "Field:"
 msgstr ""
 
+msgctxt "#31047"
+msgid "Starting in"
+msgstr ""
+
 msgctxt "#31048"
 msgid "Create Folder"
 msgstr ""