various

2015-11-09 21:07:33 +00:00 · 2015-11-09 21:07:33 +00:00 · a55f5cd9c8
parent 34a54a8491
commit a55f5cd9c8
26 changed files with 111 additions and 233 deletions
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@ -2,7 +2,7 @@
 <window>
    <defaultcontrol always="true">901</defaultcontrol>

-    <visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
+    <visible>!window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding]</visible>
    <controls>
        <control type="image">
            <include>dimensionsFullscreen</include>
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@ -115,8 +115,9 @@
                        <label>31001</label>
                        <label2></label2>
                        <thumb>-</thumb>
-                        <onclick>ActivateWindow(musiclibrary)</onclick>
+                        <onclick condition="!Library.HasContent(Music)">ActivateWindow(Music,files)</onclick>
                        <onclick condition="!Library.HasContent(Music)">Skin.SetString(showRecentMusicItems,false)</onclick>
+                        <onclick condition="Library.HasContent(Music)">ActivateWindow(Music,musicdb://)</onclick>
                        <onclick condition="Library.HasContent(Music)">Skin.SetString(showRecentMusicItems,true)</onclick>
                    </item>
                    <item id="3">
@ -144,7 +145,10 @@
                        <label>137</label>
                        <label2></label2>
                        <thumb>-</thumb>
-                        <onclick>RunScript(script.globalsearch)</onclick>
+
+                        <onclick condition="!System.HasAddon(script.globalsearch)">RunPlugin(plugin://script.globalsearch)</onclick>
+
+                        <!--<onclick>RunScript(script.globalsearch)</onclick>-->
                        <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                        <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
                    </item>
@ -176,7 +180,7 @@
            <control type="label">
                <posx>8-col</posx>
                <posy>12</posy>
-                <width>8-col</width>
+                <width>24-col</width>
                <height>4-row</height>
                <align>right</align>
                <font>veryLarge</font>
@ -186,7 +190,7 @@
            <control type="label">
                <posx>8-col</posx>
                <posy>3-row</posy>
-                <width>12-col</width>
+                <width>24-col</width>
                <height>4-row</height>
                <align>right</align>
                <font>Large</font>
@ -196,7 +200,7 @@
            <control type="label">
                <posx>8-col</posx>
                <posy>182</posy>
-                <width>12-col</width>
+                <width>24-col</width>
                <height>3-row</height>
                <align>right</align>
                <font>regular</font>
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@ -33,7 +33,6 @@
                <colordiffuse>33ffffff</colordiffuse>
                <aspectratio>stretch</aspectratio>
            </control>
-
            <!--section logo-->
            <control type="group">
                <!--videos-->
@ -76,7 +75,6 @@
                    <label></label>
                </control>
            </control>
-
            <control type="list" id="9001">
                <posx>0</posx>
                <posy>row-4-begin</posy>
@ -84,7 +82,8 @@
                <height>24-row</height>
                <orientation>vertical</orientation>
                <onleft>9002</onleft>
-                <onright>9999</onright>
+                <onright condition="SubString(skin.string(showRecentVideoItems),false) | SubString(skin.string(showRecentMusicItems),false)">9999</onright>
+                <onright condition="SubString(skin.string(showRecentVideoItems),true) | SubString(skin.string(showRecentMusicItems),true)">9998</onright>
                <onback>activateWindow(home)</onback>
                <itemlayout width="col-7-begin" height="2-row">
                    <control type="label">
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@ -172,7 +172,7 @@
                <visible>Player.HasAudio</visible>
                <label>31136</label>
                <label2/>
-                <onclick>activateWindow(5001)</onclick>
+                <onclick>activateWindow(1103)</onclick>
            </item>
            <item>
                <visible>MusicPlayer.Offset(0).Exists</visible>
@ -209,7 +209,7 @@
                <label2/>
                <onclick>ActivateWindow(MusicLibrary)</onclick>
                <onclick>Skin.SetString(showRecentMusicItems,true)</onclick>
-                <onclick>Control.SetFocus(9123)</onclick>
+                <onclick>Control.SetFocus(9998)</onclick>
            </item>
            <!--music-->
            <item>
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@ -45,7 +45,7 @@
            <textoffsetx>col-1-begin</textoffsetx>
            <label>31041</label>
            <onclick>Skin.SetString(menuItemTypeFilter,video)</onclick>
-            <onclick>ActivateWindow(5000)</onclick>
+            <onclick>ActivateWindow(1100)</onclick>
        </control>
        <control type="button" id="507">
            <visible/>
@ -142,7 +142,7 @@
            <textoffsetx>col-1-begin</textoffsetx>
            <label>31041</label>
            <onclick>Skin.SetString(menuItemTypeFilter,audio)</onclick>
-            <onclick>ActivateWindow(5000)</onclick>
+            <onclick>ActivateWindow(1100)</onclick>
        </control>
        <control type="button" id="504">
            <height>2-row</height>
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@ -40,7 +40,7 @@
    <variable name="listSubTitle">
        <value condition="Window.IsActive(videolibrary) + SubString(skin.string(showRecentVideoItems),false)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
        <value condition="Window.IsActive(videolibrary) + SubString(skin.string(showRecentVideoItems),true)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
-        <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31037]</value>
+        <value condition="Window.IsActive(musiclibrary) + SubString(skin.string(showRecentMusicItems),true)">$INFO[Window(Home).Property(Music.AlbumsCount)] $LOCALIZE[31038]</value>
        <value condition="Window.IsActive(musiclibrary)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
    </variable>
    <!--list view item detail / subheader-->
--- a/1080i/MusicOSD.xml
+++ b/1080i/MusicOSD.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
    <!--content moved to custom_musicPlayerFullscreen.xml-->
-    <onload condition="!window.isactive(5001)">back</onload>
+    <onload condition="!window.isactive(1103)">back</onload>
    <onload>sendclick(10120,500)</onload>
    <onload>back</onload>
    <controls>
--- a/1080i/MusicVisualisation.xml
+++ b/1080i/MusicVisualisation.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
    <!--content moved to custom_musicPlayerFullscreen.xml-->
-    <onload>activateWindow(5001)</onload>
+    <onload>activateWindow(1103)</onload>
    <controls/>
 </window>
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
    <defaultcontrol always="false">9000</defaultcontrol>
-
    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
    <onload condition="window.previous(0)">setfocus(9000)</onload>
    <previouswindow>home</previouswindow>
@ -35,10 +34,10 @@
                    <visible>[SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems)]</visible>
                    <include>movies</include>
                    <include>tvshows</include>
+                    <include>videofiles</include>
                    <include>seasons</include>
                    <include>episodes</include>
                    <include>videoaddons</include>
-                    <include>videofiles</include>
                </control>
            </control>

@ -75,7 +74,7 @@
                    <posy>row-1-begin</posy>
                    <width>14-col</width>
                    <font>pageTitle</font>
-                    <label>$VAR[listTitle] $INFO[container.foldername]</label>
+                    <label>$VAR[listTitle]</label>
                    <textcolor>textActive</textcolor>
                </control>
                <!--source subtitle-->
--- a/1080i/MyVideoPlaylist.xml
+++ b/1080i/MyVideoPlaylist.xml
@ -100,7 +100,7 @@
                    <effect type="fade" start="0" end="100" time="300"/>
                    <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
                </animation>
-                <animation type="Conditional" condition="!controlgroup(62).hasfocus | Window.IsActive(5000) | Window.IsActive(5900)">
+                <animation type="Conditional" condition="!controlgroup(62).hasfocus | Window.IsActive(1100) | Window.IsActive(5900)">
                    <effect type="fade" start="100" end="0" time="400"/>
                    <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
                </animation>
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@ -208,7 +208,8 @@
                    <description>Enable Artist Slideshow</description>
                    <width>14-col</width>
                    <label>31008</label>
-                    <onclick>Skin.ToggleSetting(artistSlideshowActive)</onclick>
+                    <onclick condition="System.HasAddon(script.artistslideshow)">Skin.ToggleSetting(artistSlideshowActive)</onclick>
+                    <onclick condition="!System.HasAddon(script.artistslideshow)">RunPlugin(plugin://script.artistslideshow)</onclick>
                    <selected>Skin.HasSetting(artistSlideshowActive)</selected>
                </control>
            </control>
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@ -132,7 +132,7 @@
                        <label2></label2>
                        <thumb>-</thumb>
                        <onclick>Close</onclick>
-                        <onclick>activateWindow(5901)</onclick>
+                        <onclick>activateWindow(1104)</onclick>
                    </item>
                    <item>
                        <description>Audio Settings</description>
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@ -23,7 +23,7 @@
            </control>

            <control type="panel" id="50">
-                <visible>!container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                <posx>78</posx>
                <posy>row-5-begin</posy>
                <width>1800</width>
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@ -24,7 +24,7 @@
            </control>

            <control type="panel" id="50">
-                <visible>!isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
+                <visible>Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons)</visible>
                <posx>col-1-begin</posx>
                <posy>row-5-begin</posy>
                <width>1800</width>
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@ -2,7 +2,7 @@
 <includes>
    <include name="videofiles">
        <control type="panel" id="50">
-            <visible>container.content(files) | StringCompare(container.foldername,files) | StringCompare(container.foldername,Video Playlists)</visible>
+            <visible>container.content(files) | StringCompare(container.foldername,files) | Substring(container.folderpath,special://videoplaylists)</visible>
            <posx>col-1-begin</posx>
            <posy>row-5-begin</posy>
            <width>24-col</width>
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@ -157,13 +157,14 @@
                <height>9-row</height>
                <onup>9123</onup>
                <onleft>9000</onleft>
-                <onback>activateWindow(home)</onback>
+                <onback condition="skin.string(moreinfo,false)">activateWindow(home)</onback>
+                <onback condition="skin.string(moreinfo,true)">skin.setstring(moreinfo,false)</onback>
                <orientation>horizontal</orientation>
                <onclick condition="container(9123).hasfocus(2)">Skin.SetString(showRecentVideoItems,false)</onclick>
                <onclick condition="container(9123).hasfocus(2)">activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season])</onclick>
                <onclick condition="container(9123).hasfocus(2)">Control.SetFocus(50)</onclick>
                <content>$INFO[control.getlabel(9123)]</content>
-                <oninfo>activateWindow(5824)</oninfo>
+                <oninfo>Skin.SetString(moreinfo,true)</oninfo>
                <itemlayout width="228" height="312">
                    <control type="image">
                        <posx>0</posx>
@ -339,5 +340,61 @@
                </focusedlayout>
            </control>
        </control>
+
+        <!--More video info (duplicates dialogVideoInfo)-->
+        <control type="group">
+            <visible>skin.string(moreinfo,true)</visible>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>fullscreenWidth</width>
+                <height>fullscreenHeight</height>
+                <aspectratio scalediffuse="false" align="center">stretch</aspectratio>
+                <texture border="0">colors/black.png</texture>
+                <fadetime>500</fadetime>
+                <colordiffuse>CCffffff</colordiffuse>
+            </control>
+            <!--summary content-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy>row-6-begin</posy>
+                <control type="label">
+                    <visible>container(9123).hasfocus(1)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>24-col</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>large</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$INFO[container(9998).listitem.title]</label>
+                </control>
+                <control type="label">
+                    <visible>container(9123).hasfocus(2)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>24-col</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>center</aligny>
+                    <font>large</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$INFO[container(9998).listitem.tvshowtitle]</label>
+                </control>
+                <control type="textbox">
+                    <posx>3-col</posx>
+                    <posy>3-row</posy>
+                    <font>textbox</font>
+                    <width>18-col</width>
+                    <align>left</align>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <height>12-row</height>
+                    <label fallback="31205">$INFO[container(9998).ListItem.plot]</label>
+                    <autoscroll delay="10000" time="1000" repeat="10000"/>
+                </control>
+            </control>
+        </control>
    </include>
 </includes>
--- a/1080i/custom_menuItemTypeSelector.xml
+++ b/1080i/custom_menuItemTypeSelector.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="5000">
+<window type="dialog" id="1100">
    <defaultcontrol always="true">6000</defaultcontrol>
    
    <onload>Skin.Reset(menuItemType)</onload>
@ -49,7 +49,7 @@
                <height>24-row</height>
                <itemgap>0</itemgap>
                <ondown>5000</ondown>
-                <onright>dialog.close(5000)</onright>
+                <onright>dialog.close(1100)</onright>
                <!--select a video addon-->
                <control type="button" id="6001">
                    <visible>stringcompare(skin.string(menuItemTypeFilter),video)</visible>
@ -137,7 +137,7 @@
                <height>16-row</height>
                <orientation>vertical</orientation>
                <onup>6000</onup>
-                <onright>dialog.close(5000)</onright>
+                <onright>dialog.close(1100)</onright>
                <itemlayout width="col-7-begin" height="2-row">
                    <control type="label">
                        <posx>60</posx>
--- a/1080i/custom_musicFullscreenDisabler.xml
+++ b/1080i/custom_musicFullscreenDisabler.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="3002">
+<window type="dialog" id="1101">
    <onload>Dialog.Close(all,true)</onload>
-    <visible>Window.IsActive(5001) + !player.hasaudio</visible>
+    <visible>Window.IsActive(1103) + !player.hasaudio</visible>
    <controls></controls>
 </window>
--- a/1080i/custom_musicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="3333">
+<window type="dialog" id="1102">
    <visible>player.hasaudio</visible>
    <controls>
        <control type="group">
            <posx>col-14-begin</posx>
            <posy>0</posy>
-            <visible>!Window.IsActive(visualisation) + !container.content(songs)</visible>
+            <visible>!Window.IsActive(visualisation)</visible>
            <animation type="windowopen">
                <effect type="slide" start="0,-50" end="0,0" tween="cubic" easing="out" delay="500" time="300"/>
                <effect type="fade" start="0" end="100" time="500" delay="500"/>
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="5001">
+<window type="dialog" id="1103">
    <defaultcontrol always="true">9876</defaultcontrol>

    <onload condition="Skin.HasSetting(artistSlideshowActive)">RunScript(script.artistslideshow)</onload>
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="5901">
+<window type="dialog" id="1104">
    <defaultcontrol always="true">5000</defaultcontrol>
     
    <controls>
--- a/1080i/custom_videoInformation.xml
+++ b/1080i/custom_videoInformation.xml
@ -5,10 +5,8 @@
    <onunload>Skin.Reset(showcast)</onunload>
    <controls>
        <control type="group">
-            <visible>false</visible>
            <!--background / fanart-->
            <control type="image">
-                <visible>!Substring(Container.folderpath,plugin) + !container.content(episodes)</visible>
                <posx>0</posx>
                <posy>0</posy>
                <include>dimensionsFullscreen</include>
@ -17,20 +15,10 @@
                <aspectratio>stretch</aspectratio>
            </control>
            <control type="image">
-                <visible>Substring(Container.folderpath,plugin) | container.content(episodes)</visible>
                <posx>0</posx>
                <posy>0</posy>
                <include>dimensionsFullscreen</include>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ddffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <visible>!Substring(Container.folderpath,plugin) + !container.content(episodes)</visible>
-                <posx>0</posx>
-                <posy>0</posy>
-                <include>dimensionsFullscreen</include>
-                <texture>$INFO[container(9998).listitem.art(fanart)]</texture>
+                <texture>$INFO[listitem.art(fanart)]</texture>
                <colordiffuse>ffffffff</colordiffuse>
                <aspectratio>stretch</aspectratio>
                <include>kenBurnsey</include>
@ -52,7 +40,6 @@
        </control>
        <!--content is movie or tvshow (from XBMC Library)-->
        <control type="group">
-            <visible>!Substring(Container.folderpath,plugin) + !container.content(episodes)</visible>
            <posx>col-15-begin</posx>
            <posy>0</posy>
            <animation type="Windowopen">
@ -329,182 +316,7 @@
            </control>
        </control>

-        <!--content is tvshow episode or content is from a plugin-->
-        <control type="group">
-            <visible>Substring(Container.folderpath,plugin) | container.content(episodes)</visible>
-            <!--animations-->
-            <include>modalDialogInOut</include>
-            <!--thumbnail if available-->
-            <control type="group">
-                <posx>col-7-begin</posx>
-                <posy>row-1-begin</posy>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>12-col</width>
-                    <height>486</height>
-                    <aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
-                    <texture background="true" fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
-                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                    <bordersize>3</bordersize>
-                </control>
-            </control>
-            <!--content-->
-            <control type="group">
-                <posx>col-7-begin</posx>
-                <posy>row-15-begin</posy>
-                <!--titles-->
-                <control type="label">
-                    <description>Episode title</description>
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>12-col-gutter</width>
-                    <height>2-row</height>
-                    <align>left</align>
-                    <aligny>center</aligny>
-                    <font>mediumStrong</font>
-                    <textcolor>highlight</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                    <label>$INFO[ListItem.Label]</label>
-                    <wrapmultiline>true</wrapmultiline>
-                </control>
-                <control type="grouplist">
-                    <posx>0</posx>
-                    <posy>-18</posy>
-                    <width>12-col</width>
-                    <orientation>horizontal</orientation>
-                    <control type="label">
-                        <width>1-col-gutter</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>symbolLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <label></label>
-                    </control>
-                    <control type="label">
-                        <width>3-col</width>
-                        <height>2-row</height>
-                        <aligny>center</aligny>
-                        <font>regularStrong</font>
-                        <textcolor>textActive</textcolor>
-                        <label fallback="31159">$INFO[listitem.duration,, $LOCALIZE[31018]]</label>
-                    </control>
-                </control>
       
-                <!--synopsis-->
-                <control type="textbox">
-                    <posx>0</posx>
-                    <posy>5-row</posy>
-                    <font>textbox</font>
-                    <width>12-col</width>
-                    <align>left</align>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor>-</shadowcolor>
-                    <height>160</height>
-                    <label fallback="31205">$INFO[ListItem.plot]</label>
-                    <autoscroll delay="10000" time="1000" repeat="10000"/>
-                </control>
-                <!--dialog controls-->
-                <control type="list" id="8000">
-                    <posx>0</posx>
-                    <posy>11-row</posy>
-                    <width>12-col</width>
-                    <height>2-row</height>
-                    <orientation>horizontal</orientation>
-                    <itemlayout width="6-col" height="2-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>6-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/black.png</texture>
-                        </control>
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <font>symbol</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>6-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout width="6-col" height="2-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col-textbox</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
-                            <colordiffuse>highlight</colordiffuse>
-                            <include>spinFocusIcon</include>
-                        </control>
-                        <control type="image">
-                            <posx>1-col</posx>
-                            <posy>0</posy>
-                            <width>5-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/white.png</texture>
-                        </control>
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <align>center</align>
-                            <font>symbol</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>6-col</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>black</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
-                        </control>
-                    </focusedlayout>
-                    <content>
-                        <item id="1">
-                            <label>31075</label>
-                            <label2></label2>
-                            <thumb>-</thumb>
-                            <onclick>sendclick(2003,8)</onclick>
-                        </item>
-                        <item id="2">
-                            <visible>!Substring(Container.folderpath,plugin)</visible>
-                            <label>31076</label>
-                            <label2></label2>
-                            <thumb>-</thumb>
-                            <onclick>SendClick(2003,6)</onclick>
-                        </item>
-                    </content>
-                </control>
-            </control>
-        </control>
       <!--cast and crew toggle-->
        <control type="group">
            <visible>skin.string(showcast,true)</visible>
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@ -251,7 +251,7 @@

        <!--sorting and misc controls-->
        <control type="group" id="61">
-            <animation type="Conditional" condition="!controlgroup(9002).hasfocus | window.isactive(5900) | window.isactive(5000)">
+            <animation type="Conditional" condition="!controlgroup(9002).hasfocus | window.isactive(5900) | window.isactive(1100)">
                <effect type="fade" start="100" end="0" time="300"/>
                <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
            </animation>
--- a/addon.xml
+++ b/addon.xml
@ -2,8 +2,6 @@
 <addon id="skin.pellucid" version="0.9.0" name="Pellucid" provider-name="theDeadman">
    <requires>
        <import addon="xbmc.gui" version="5.10.0"/>
-        <import addon="script.globalsearch" version="1.1.1"/>
-        <import addon="script.artistslideshow" version="1.5.0"/>
    </requires>
    <extension point="xbmc.gui.skin" debugging="false">
        <res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
--- a/changelog.txt
+++ b/changelog.txt
@ -3,6 +3,8 @@
 ***Working towards Kodi Jarvis release***

 - [REMOVED DEPENDENCY] script.thedeadman.functions (Nice one team Kodi!)
+- [REMOVED DEPENDENCY] script.globalsearch
+- [REMOVED DEPENDENCY] script.artistslideshow
 - [REMOVED] DialogPeripheralManager.xml
 - [REMOVED] DialogKaraokeSongSelector.xml
 - [REMOVED] DialogKaraokeSongSelectorLarge.xml
@ -32,6 +34,8 @@ DialogPVRinfo - button update

 Use 'has parent' to manage back button (open side menu on no parent item)

+Complete RecentItems oninfo
+
 Radio RDS test

 Touchscreen controls - get Android tablet for testing
@ -42,7 +46,7 @@ CREATE A BETTER SKIN LOGO!

 Addons manager - clean up a bit.

-Remove dependencies (ask for install - see forum)
+[DONE] Remove dependencies (ask for install - see forum)



--- a/language/English/strings.po
+++ b/language/English/strings.po
@ -133,6 +133,10 @@ msgctxt "#31037"
 msgid "Albums by"
 msgstr ""

+msgctxt "#31038"
+msgid "Albums"
+msgstr ""
+
 msgctxt "#31041"
 msgid "Edit Menu Shortcuts"
 msgstr ""