From 493c069f1a7404b6aa87e804a235f51e40a263bb Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sun, 21 Oct 2018 20:30:39 +0100
Subject: [PATCH] tweaks

---
 1080i/AddonBrowser.xml                 |  4 ++--
 1080i/DialogAudioDSPManager.xml        |  2 +-
 1080i/FileManager.xml                  |  4 ++--
 1080i/Home.xml                         |  1 -
 1080i/Includes.xml                     | 16 ++++------------
 1080i/Includes_animations.xml          |  4 ++--
 1080i/Includes_hubOptionsItems.xml     |  2 +-
 1080i/MyMusicPlaylistEditor.xml        |  2 +-
 1080i/MyPrograms.xml                   |  4 ++--
 1080i/Pointer.xml                      |  2 +-
 1080i/View_Episodes.xml                | 13 +++++++++----
 1080i/View_Seasons.xml                 | 12 ++++++------
 1080i/custom_musicPlayerFullscreen.xml |  2 +-
 1080i/custom_musicPlayerOptions.xml    | 18 ------------------
 addon.xml                              |  1 -
 language/English/strings.po            |  4 ++++
 16 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index ced7467..9737a69 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -183,8 +183,8 @@
                     <height>19-row</height>
                     <onleft>activateWindow(1104)</onleft>
                     <onright>60</onright>
-                    <ondown>50</ondown>
-                    <onup>50</onup>
+                    <ondown>51</ondown>
+                    <onup>51</onup>
                     <pagecontrol>60</pagecontrol>
                     <itemlayout width="10-col" height="2-row">
                         <control type="label">
diff --git a/1080i/DialogAudioDSPManager.xml b/1080i/DialogAudioDSPManager.xml
index b4ea8ff..2ff399c 100644
--- a/1080i/DialogAudioDSPManager.xml
+++ b/1080i/DialogAudioDSPManager.xml
@@ -230,7 +230,7 @@
                 <onleft>control.setfocus(20)</onleft>
                 <control type="radiobutton" id="22">
                     <description>Default RadioButton</description>
-                    <label>15064</label>
+                    <label>$LOCALIZE[15064]</label>
                     <width>5-col</width>
                 </control>
                 <control type="button" id="23">
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index d3bb10f..c1a2c67 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -62,7 +62,7 @@
                     <height>2-row</height>
                     <width>8-col-gutter</width>
                     <label></label>
-                    <font>itemSubtitle</font>
+                    <font>itemSubTitle</font>
                     <textcolor>highlight</textcolor>
                     <shadowcolor></shadowcolor>
                 </control>
@@ -146,7 +146,7 @@
                     <width>9-col-gutter</width>
                     <height>2-row</height>
                     <label></label>
-                    <font>itemSubtitle</font>
+                    <font>itemSubTitle</font>
                     <textcolor>highlight</textcolor>
                 </control>
                 <control type="list" id="21">
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 36e6da6..f3943f6 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -266,7 +266,6 @@
 					<height>2-row</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<height>2-row</height>
 					<label>$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
 					<scroll>true</scroll>
 					<textcolor>textActive</textcolor>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 00125e0..868e7de 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -29,25 +29,15 @@
     <include file="Includes_mediaShowcase.xml"/>
 
     <!--view type conditions-->
-    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos) | container.content(episodes)</expression>
+    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos)</expression>
     <expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
-    <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons)]</expression>
+    <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows) | container.content(seasons) | container.content(episodes)]</expression>
 
     <expression name="isTVShow">container.content(tvshows) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
     <expression name="isSeason">container.content(seasons) + String.Contains(container.folderpath,videodb://)</expression>
     <expression name="isEpisode">container.content(episodes) + !String.Contains(Container.folderpath,plugin)</expression>
     <expression name="isMusicVideo">container.content(musicvideos) + !String.Contains(Container.folderpath,plugin)</expression>
 
-    <!--
-	<expression name="isMusicList">!String.Contains(container.folderpath,musicdb://) | String.Contains(container.foldername,Files) | container.content(files) | container.content(addons) | [container.content(playlists) + !String.Contains(Container.folderpath,special://profile/playlists)] | String.Contains(Container.folderpath,plugin://)</expression>
-    <expression name="isMusicArtist">container.content(artists) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)]</expression>
-    <expression name="isMusicArtistCatalogue">container.content(albums) + String.Contains(container.folderpath,albumartistsonly)</expression>
-    <expression name="isMusicAlbum">container.content(albums) + [String.Contains(container.folderpath,musicdb://) | String.Contains(Container.folderpath,special://profile/playlists)]</expression>
-    <expression name="isMusicGenre">container.content(genres) + String.Contains(container.folderpath,musicdb://)</expression>
-    <expression name="isMusicSong">container.content(songs) + String.Contains(Container.folderpath,musicdb://)</expression>
-    <expression name="isMusicPlaylist">container.content(songs) + [String.Contains(Container.folderpath,.xsp) | String.Contains(Container.foldername,PartyMode) | String.Contains(Container.folderpath,playlistmusic://)]</expression>
--->
-
 	<expression name="isMusicSpotifyArtist">container.content(artists) + String.Contains(container.folderpath,spotify)</expression>
 	<expression name="isMusicSpotifyAlbum">container.content(albums) + String.Contains(container.folderpath,spotify)</expression>
 
@@ -96,6 +86,7 @@
             <colordiffuse>66ffffff</colordiffuse>
             <fadetime>500</fadetime>
             <aspectratio>stretch</aspectratio>
+			<include>kenBurnsey</include>
         </control>
         <control type="image">
             <visible>!Integer.IsGreater(container(99999).numitems,0) | Skin.HasSetting(disableExtendedFanart) | ListItem.IsParentFolder</visible>
@@ -105,6 +96,7 @@
             <texture>$INFO[container.Art(fanart)]</texture>
             <colordiffuse>66ffffff</colordiffuse>
             <aspectratio>stretch</aspectratio>
+			<include>kenBurnsey</include>
         </control>
     </include>
 
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index b179b48..6b76250 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -26,8 +26,8 @@
     <include name="kenBurnsey">
         <animation type="conditional" condition="!Skin.HasSetting(lowPowerMode)" loop="true">
             <effect type="fade" start="0" end="100" time="2000"/>
-            <effect type="zoom" center="auto" start="130" end="100" time="15000"/>
-            <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
+			<effect type="zoom" center="auto" start="120" end="100" time="15000"/>
+			<effect type="fade" start="100" end="0" time="1000" delay="14000"/>
         </animation>
     </include>
     <!--focus item spinner-->
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 42ab259..1b03111 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -153,7 +153,7 @@
             <width>6-col</width>
             <focusedcolor>textActive</focusedcolor>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <label>Shuffle</label>
+            <label>31241</label>
             <onclick condition="!Playlist.IsRandom">PlayerControl(randomOn)</onclick>
             <onclick condition="Playlist.IsRandom">PlayerControl(randomOff)</onclick>
         </control>
diff --git a/1080i/MyMusicPlaylistEditor.xml b/1080i/MyMusicPlaylistEditor.xml
index 6038bd5..83be6ca 100644
--- a/1080i/MyMusicPlaylistEditor.xml
+++ b/1080i/MyMusicPlaylistEditor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol allways="true">50</defaultcontrol>
+    <defaultcontrol always="true">50</defaultcontrol>
 	<views>50</views>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 6f02edb..9bebab2 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -62,7 +62,7 @@
 			                    <height>2-row</height>
 			                    <aligny>center</aligny>
 			                    <align>right</align>
-			                    <font>itemSubtitle</font>
+			                    <font>itemSubTitle</font>
 			                    <textcolor>textActive</textcolor>
 			                    <shadowcolor></shadowcolor>
 			                    <label>$INFO[ListItem.AddonSummary]</label>
@@ -108,7 +108,7 @@
 			                    <height>2-row</height>
 			                    <aligny>center</aligny>
 			                    <align>right</align>
-			                    <font>itemSubtitle</font>
+			                    <font>itemSubTitle</font>
 			                    <textcolor>textActive</textcolor>
 			                    <shadowcolor></shadowcolor>
 			                    <label>$INFO[ListItem.AddonSummary]</label>
diff --git a/1080i/Pointer.xml b/1080i/Pointer.xml
index 40177af..7a7bf44 100644
--- a/1080i/Pointer.xml
+++ b/1080i/Pointer.xml
@@ -17,7 +17,7 @@
             <description>Pointer Focus</description>
             <width>45</width>
             <height>45</height>
-            <texture>UIControls/PointerFo.png</texture>
+            <texture>UIControls/PointerFO.png</texture>
         </control>
         <control type="image" id="3">
             <description>Pointer Drag</description>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 17516dc..f204a7e 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -15,6 +15,11 @@
                 <aspectratio scalediffuse="false">stretch</aspectratio>
                 <texture background="true" border="0">$INFO[container.art(season.poster)]</texture>
                 <colordiffuse>ccffffff</colordiffuse>
+				<animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
+				    <effect type="fade" start="0" end="100" time="2000"/>
+                    <effect type="slide" start="0,0" end="0,-280" time="15000"/>
+                    <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
+                </animation>
             </control>
             <control type="image">
                 <visible>String.IsEmpty(container.art(season.poster))</visible>
@@ -25,9 +30,9 @@
                 <aspectratio scalediffuse="false">stretch</aspectratio>
                 <texture background="true" fallback="colors/black.png" border="0">$INFO[container.art(fanart)]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
-                <animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
+                <animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="false" reversible="false">
                     <effect type="fade" start="0" end="100" time="2000"/>
-                    <effect type="zoom" center="auto" start="130" end="100" time="15000"/>
+                    <effect type="zoom" center="auto" start="120" end="100" time="15000"/>
                     <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
                 </animation>
             </control>
@@ -90,7 +95,7 @@
         <control type="group">
             <!--tvhsow library-sourced episode list-->
             <control type="panel" id="53">
-                <visible>$EXP[isEpisode]</visible>
+                <visible>$EXP[isEpisode] + !String.Contains(container.folderpath,smb://) + String.Contains(container.folderpath,videodb://)</visible>
                 <posx>978</posx>
                 <posy>row-9-begin</posy>
                 <width>12-col</width>
@@ -98,7 +103,7 @@
                 <onleft>9000</onleft>
 				<onright>60</onright>
 				<pagecontrol>60</pagecontrol>
-				<ondown>53></ondown>
+				<ondown>53</ondown>
 				<onup>53</onup>
 				<movement>4</movement>
                 <itemlayout width="12-col" height="2-row">
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 0f40228..b1c690a 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -2,7 +2,7 @@
 <includes>
     <include name="seasons">
         <control type="group">
-            <visible>!String.IsEmpty(container.folderpath) + container.content(seasons) + !container.content(episodes)</visible>
+            <visible>!String.IsEmpty(container.folderpath) + container.content(seasons) + !container.content(episodes) + !String.Contains(container.folderpath,smb://) + String.Contains(container.folderpath,videodb://)</visible>
             <!--fanart-->
             <control type="group">
                 <visible>!String.Contains(Container.folderpath,plugin)</visible>
@@ -49,7 +49,7 @@
                 </control>
                 <!--content-->
                 <control type="panel" id="58">
-                    <visible>$EXP[isSeason]</visible>
+                    <visible>$EXP[isSeason] + !String.Contains(container.folderpath,smb://)</visible>
                     <posx>84</posx>
                     <posy>row-16-begin</posy>
                     <width>1860</width>
@@ -92,9 +92,9 @@
                         </control>
 						<control type="textbox">
                             <visible>String.StartsWith(ListItem.label,*)</visible>
-                            <posx>12</posx>
+                            <posx>24</posx>
                             <posy>4-row</posy>
-                            <width>228</width>
+                            <width>216</width>
                             <height>4-row</height>
                             <align>left</align>
                             <aligny>center</aligny>
@@ -175,9 +175,9 @@
 	                        </control>
 							<control type="textbox">
 	                            <visible>String.StartsWith(ListItem.label,*)</visible>
-	                            <posx>12</posx>
+	                            <posx>24</posx>
 	                            <posy>4-row</posy>
-	                            <width>228</width>
+	                            <width>216</width>
 	                            <height>4-row</height>
 	                            <align>left</align>
 	                            <aligny>center</aligny>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 1304e80..adc47f5 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -15,7 +15,7 @@
 				<control type="image">
 					<visible>!Visualisation.Enabled</visible>
 		            <include>dimensionsFullscreen</include>
-		            <texture>colors/white.jpg</texture>
+		            <texture>colors/white.png</texture>
 		            <colordiffuse>background</colordiffuse>
 		            <aspectratio>stretch</aspectratio>
 		        </control>
diff --git a/1080i/custom_musicPlayerOptions.xml b/1080i/custom_musicPlayerOptions.xml
index d2ef33e..6debb30 100644
--- a/1080i/custom_musicPlayerOptions.xml
+++ b/1080i/custom_musicPlayerOptions.xml
@@ -227,24 +227,6 @@
 	                    </control>
 	                </focusedlayout>
 	                <content>
-	                    <item>
-	                        <description>go to artist</description>
-	                        <label>31155</label>
-	                        <label2></label2>
-	                        <thumb></thumb>
-	                        <onclick condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
-	                        <onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
-	                        <onclick condition="System.hasAddon(script.musicfinder)">Runscript(script.musicfinder,action=artist,title=$INFO[musicplayer.artist],listid=50)</onclick>
-	                    </item>
-	                    <item>
-	                        <description>go to album</description>
-	                        <label>31158</label>
-	                        <label2></label2>
-	                        <thumb></thumb>
-	                        <onclick condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
-	                        <onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
-	                        <onclick condition="System.hasAddon(script.musicfinder)">Runscript(script.musicfinder,action=album,title=$INFO[musicplayer.album],listid=50)</onclick>
-	                    </item>
 	                    <item>
 	                        <description>Playlist</description>
 	                        <label>31123</label>
diff --git a/addon.xml b/addon.xml
index 00d7860..df8bfdd 100644
--- a/addon.xml
+++ b/addon.xml
@@ -5,7 +5,6 @@
         <import addon="script.skinshortcuts" version="1.0.13"/>
         <import addon="resource.images.weathericons.outline" version="0.0.5"/>
         <import addon="resource.images.weatherfanart.single" version="0.0.6"/>
-        <import addon="script.musicfinder" version="1.0.0"/>
     </requires>
     <extension point="xbmc.gui.skin" debugging="false">
         <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
diff --git a/language/English/strings.po b/language/English/strings.po
index dd586bf..66ff375 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -988,3 +988,7 @@ msgstr ""
 msgctxt "#31240"
 msgid "Disable recently added section for Albums"
 msgstr ""
+
+msgctxt "#31241"
+msgid "Shuffle"
+msgstr ""