From 8bb1a0baec7ee5c5928a463497abd45bf7dd2c4c Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Wed, 25 Nov 2015 16:55:01 +0000
Subject: [PATCH] various

---
 1080i/DialogExtendedProgressBar.xml | 18 ++++++++++++++++++
 1080i/Includes_variables.xml        |  3 +--
 1080i/SmartPlaylistRule.xml         |  2 +-
 1080i/View_MusicRecentItems.xml     |  6 ++----
 changelog.txt                       |  4 +---
 extras/playlists/randomAlbums.xsp   |  7 +++++++
 extras/playlists/topAlbums.xsp      |  7 +++++++
 7 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 extras/playlists/randomAlbums.xsp
 create mode 100644 extras/playlists/topAlbums.xsp

diff --git a/1080i/DialogExtendedProgressBar.xml b/1080i/DialogExtendedProgressBar.xml
index 273da53..be5daa8 100644
--- a/1080i/DialogExtendedProgressBar.xml
+++ b/1080i/DialogExtendedProgressBar.xml
@@ -27,6 +27,7 @@
                 </control>
             </control>
             <control type="label" id="30">
+                <visible>!StringCompare(control.getlabel(30),control.getlabel(31))</visible>
                 <description>heading</description>
                 <posx>24</posx>
                 <posy>0</posy>
@@ -42,6 +43,23 @@
                     <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
                 </animation>
             </control>
+            <control type="label">
+                <visible>StringCompare(control.getlabel(30),control.getlabel(31))</visible>
+                <description>heading</description>
+                <posx>24</posx>
+                <posy>0</posy>
+                <font>itemSubTitle</font>
+                <width>468</width>
+                <height>60</height>
+                <aligny>center</aligny>
+                <label>31023</label>
+                <textcolor>black</textcolor>
+                <shadowcolor>-</shadowcolor>
+                <!--animations-->
+                <animation type="Windowopen">
+                    <effect type="fade" start="0" end="100" delay="400" time="400" tween="sine"/>
+                </animation>
+            </control>
             <control type="label" id="31">
                 <description>message</description>
                 <posx>24</posx>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index a43e1ba..d60f248 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -20,7 +20,7 @@
         <value condition="Window.IsActive(videolibrary) + Container.Content(movies)">$LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
         <value condition="Window.IsActive(videolibrary) + [Container.Content(seasons) | Container.Content(tvshows) | Container.Content(episodes)]">$LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR]</value>
         <value condition="Window.IsActive(videolibrary) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
-		<value condition="Window.IsActive(videolibrary) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
+        <value condition="Window.IsActive(videolibrary) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
 
         <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$LOCALIZE[31053]</value>
         <value condition="Window.IsActive(musiclibrary) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
@@ -29,7 +29,6 @@
         <value condition="Window.IsActive(musiclibrary) + Container.Content(songs)">$LOCALIZE[31182]</value>
         <value condition="Window.IsActive(musiclibrary) + !container.content(genres) + SubString(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
 
-
         <value condition="Window.IsActive(musiclibrary) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value condition="Window.IsActive(musiclibrary) + isEmpty(container.foldername)">$LOCALIZE[31053]</value>
 
diff --git a/1080i/SmartPlaylistRule.xml b/1080i/SmartPlaylistRule.xml
index 8935626..e5e1536 100644
--- a/1080i/SmartPlaylistRule.xml
+++ b/1080i/SmartPlaylistRule.xml
@@ -192,7 +192,7 @@
                         <item id="2">
                             <description>Cancel</description>
                             <label>222</label>
-                            <label2></label2>
+                            <label2></label2>
                             <thumb>-</thumb>
                             <onclick>SendClick(129,19)</onclick>
                         </item>
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 373bd93..2a07b0e 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -38,12 +38,10 @@
                     <texture border="0">colors/black.png</texture>
                     <colordiffuse>ccffffff</colordiffuse>
                 </control>
-
                 <!--titles-->
                 <control type="group">
                     <posx>col-1-begin</posx>
                     <posy>row-6-begin</posy>
-
                     <control type="label">
                         <posx>24-col</posx>
                         <posy>0</posy>
@@ -236,12 +234,12 @@
                         <onclick>noop</onclick>
                     </item>
                     <item id="2">
-                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
+                        <label>special://skin/extras/playlists/topAlbums.xsp</label>
                         <property name="textTitle">31187</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="3">
-                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
+                        <label>special://skin/extras/playlists/randomAlbums.xsp</label>
                         <property name="textTitle">31181</property>
                         <onclick>noop</onclick>
                     </item>
diff --git a/changelog.txt b/changelog.txt
index a6d7e0b..a8748cb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -34,11 +34,9 @@
 
 ***To do***
 
-Finish Info screen rework for the OSD (match movie info style instead)
+Finish Info screen rework for the OSD (match movie info style instead - use a fillbar for duration)
 Check extra button to dialogAddonInfo.xml (auto update)
 
-Music smartplaylists
-
 Touch support for file seeking etc
 
 on startup: add check for parent folder items and warn user to turn off: system.getbool(showparentdiritems)
diff --git a/extras/playlists/randomAlbums.xsp b/extras/playlists/randomAlbums.xsp
new file mode 100644
index 0000000..9a3c1e1
--- /dev/null
+++ b/extras/playlists/randomAlbums.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="albums">
+    <name>randomAlbums</name>
+    <match>all</match>
+    <limit>10</limit>
+    <order direction="ascending">random</order>
+</smartplaylist>
diff --git a/extras/playlists/topAlbums.xsp b/extras/playlists/topAlbums.xsp
new file mode 100644
index 0000000..839429a
--- /dev/null
+++ b/extras/playlists/topAlbums.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="albums">
+    <name>topAlbums</name>
+    <match>all</match>
+    <limit>10</limit>
+    <order direction="descending">playcount</order>
+</smartplaylist>