This commit is contained in:
chrisbevan 2016-10-11 19:44:50 +01:00
parent e75d557bf5
commit 7f6de22669
40 changed files with 199 additions and 442 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -40,13 +40,13 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<--addon details--> <--addon details-->
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
<posy>2-row</posy> <posy>2-row</posy>
<width>18-col</width> <width>18-col</width>
<height>8-row</height> <height>8-row</height>
<aspectratio aligny="center">scale</aspectratio> <aspectratio aligny="center">scale</aspectratio>
<texture fallback="colors/offblack.png">$INFO[ListItem.art(fanart)]</texture> <texture fallback="colors/black.png">$INFO[ListItem.art(fanart)]</texture>
</control> </control>
<!--screenshots--> <!--screenshots-->
<control type="panel" id="50"> <control type="panel" id="50">

View File

@ -10,7 +10,7 @@
<include>modalDialogInOut</include> <include>modalDialogInOut</include>
<!--text--> <!--text-->
<control type="group"> <control type="group">
<posx>col-7-begin</posx> <posx>col-1-begin</posx>
<posy>0</posy> <posy>0</posy>
<control type="label" id="1"> <control type="label" id="1">
<description>heading</description> <description>heading</description>
@ -42,7 +42,7 @@
</control> </control>
<!--options--> <!--options-->
<control type="group"> <control type="group">
<posx>col-7-begin</posx> <posx>col-1-begin</posx>
<posy>8-row</posy> <posy>8-row</posy>
<!--OK only--> <!--OK only-->

View File

@ -10,6 +10,29 @@
<effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/> <effect type="fade" start="100" end="0" time="200" tween="sine" easing="in"/>
</animation> </animation>
<include>dateTime</include> <include>dateTime</include>
<!--thumbnail-->
<control type="group">
<posx>col-1-begin</posx>
<posy>row-1-begin</posy>
<animation type="Windowopen">
<effect type="fade" start="0" end="100" time="300"/>
<effect type="slide" start="0,-300" end="0,0" tween="cubic" easing="out" time="400"/>
</animation>
<animation type="Windowclose">
<effect type="fade" start="100" end="0" time="300"/>
<effect type="slide" end="0,-300" tween="cubic" easing="out" time="400"/>
</animation>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>2-col-textbox</width>
<height>4-col-textbox</height>
<aspectratio scalediffuse="false" aligny="top">keep</aspectratio>
<texture border="0">$INFO[player.art(thumb)]</texture>
</control>
</control>
<control type="group"> <control type="group">
<posx>0</posx> <posx>0</posx>
<posy>row-22-begin</posy> <posy>row-22-begin</posy>
@ -31,34 +54,16 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="image"> <control type="image">
<posx>col-4-begin</posx> <posx>col-1-begin</posx>
<posy>0</posy> <posy>0</posy>
<width>21-col</width> <width>24-col</width>
<height>2-row</height> <height>2-row</height>
<texture colordiffuse="highlight">colors/white.png</texture> <texture colordiffuse="highlight">colors/white.png</texture>
<colordiffuse>ccffffff</colordiffuse> <colordiffuse>ccffffff</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<!--thumbnail-->
<control type="image">
<posx>col-1-begin</posx>
<posy>0</posy>
<width>3-col-textbox</width>
<height>3-col-textbox</height>
<aspectratio>stretch</aspectratio>
<texture>DefaultAlbumCover.png</texture>
<colordiffuse></colordiffuse>
</control>
<control type="image">
<posx>col-1-begin</posx>
<posy>0</posy>
<width>3-col-textbox</width>
<height>3-col-textbox</height>
<aspectratio scalediffuse="false">scale</aspectratio>
<texture border="0">$INFO[player.art(thumb)]</texture>
</control>
<control type="label"> <control type="label">
<posx>324</posx> <posx>120</posx>
<posy>0</posy> <posy>0</posy>
<width>16-col</width> <width>16-col</width>
<height>2-row</height> <height>2-row</height>
@ -91,10 +96,10 @@
<scroll>false</scroll> <scroll>false</scroll>
</control> </control>
<control type="textbox"> <control type="textbox">
<posx>324</posx> <posx>120</posx>
<posy>84</posy> <posy>84</posy>
<font>textbox</font> <font>textbox</font>
<width>1476</width> <width>23-col</width>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<height>116</height> <height>116</height>
<label fallback="31205">$INFO[videoplayer.plot]</label> <label fallback="31205">$INFO[videoplayer.plot]</label>

View File

@ -214,6 +214,7 @@
<label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label> <label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
</control> </control>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -121,6 +121,31 @@
</control> </control>
</control> </control>
</include> </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)--> <!--conditional positioning for progress dialogs (avoid overlaps)-->
<include name="progressPosition1"><posy>row-2-begin</posy></include> <include name="progressPosition1"><posy>row-2-begin</posy></include>
<include name="progressPosition2"><posy>row-6-begin</posy></include> <include name="progressPosition2"><posy>row-6-begin</posy></include>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<includes> <includes>
<include name="homeBackground"> <include name="homeBackground">
<!--Video content-->
<control type="group"> <control type="group">
<animation type="conditional" condition="!Skin.HasSetting(lowPowerMode)" loop="true"> <animation type="conditional" condition="!Skin.HasSetting(lowPowerMode)" loop="true">
<effect type="fade" start="0" end="100" time="5000"/> <effect type="fade" start="0" end="100" time="5000"/>
@ -12,8 +13,7 @@
<animation type="conditional" condition="Skin.HasSetting(lowPowerMode)"> <animation type="conditional" condition="Skin.HasSetting(lowPowerMode)">
<effect type="fade" start="0" end="100" time="5000"/> <effect type="fade" start="0" end="100" time="5000"/>
</animation> </animation>
<!--library based thumbs--> <control type="panel">
<control type="panel" id="9451">
<enable>false</enable> <enable>false</enable>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
@ -28,193 +28,19 @@
<effect type="fade" end="0" time="0"/> <effect type="fade" end="0" time="0"/>
</animation> </animation>
<itemlayout width="3-col" height="3-col"> <itemlayout width="3-col" height="3-col">
<control type="image"> <control type="image">
<visible>Container(9000).HasFocus(10)</visible>
<posx>0</posx> <posx>0</posx>
<posy>0</posy> <posy>0</posy>
<width>3-col-textbox</width> <width>204</width>
<height>3-col-textbox</height> <height>204</height>
<aspectratio>scale</aspectratio> <aspectratio>scale</aspectratio>
<texture fallback="colors/black.png" border="0">$INFO[Listitem.art(poster)]</texture> <texture border="0">$INFO[Listitem.thumb]</texture>
<colordiffuse>44FFFFFF</colordiffuse>
</control>
<control type="image">
<visible>!Container(9000).HasFocus(10)</visible>
<posx>0</posx>
<posy>0</posy>
<width>3-col-textbox</width>
<height>3-col-textbox</height>
<aspectratio>scale</aspectratio>
<texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
<colordiffuse>44FFFFFF</colordiffuse> <colordiffuse>44FFFFFF</colordiffuse>
</control> </control>
</itemlayout> </itemlayout>
<focusedlayout/> <focusedlayout/>
<content>$VAR[homescreenCollage]</content> <content>special://skin/extras/playlists/collage_RandomContent.xsp</content>
</control> </control>
<!--Discs inserted / Live TV-->
<control type="group">
<visible>Container(9000).HasFocus(10) | Container(9000).HasFocus(13) | Container(9000).HasFocus(14)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/videos.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
<animation type="windowopen">
<effect type="fade" end="100" time="1000" delay="800"/>
</animation>
</control>
</control>
<!--videos (no library present)-->
<control type="group">
<visible>Container(9000).HasFocus(1) + !Library.HasContent(Movies)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/videos.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--music (no Library)-->
<control type="group">
<visible>Container(9000).HasFocus(2) + !Library.HasContent(Music)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/music.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--photos-->
<control type="group">
<visible>Container(9000).HasFocus(9)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/weather.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--games-->
<control type="group">
<visible>Container(9000).HasFocus(4)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/games.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--photos-->
<control type="group">
<visible>Container(9000).HasFocus(3)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/photos.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--search-->
<control type="group">
<visible>Container(9000).HasFocus(6)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/search.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--settings-->
<control type="group">
<visible>Container(9000).HasFocus(7) | Container(9000).HasFocus(11)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/settings.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--power-->
<control type="group">
<visible>Container(9000).HasFocus(8)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/power.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
<!--advanced launcher-->
<control type="group">
<visible>Container(9000).HasFocus(12)</visible>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>special://skin/extras/backgrounds/advancedLauncher.jpg</texture>
<colordiffuse>44ffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
</control>
</control> </control>
</include> </include>
</includes> </includes>

View File

@ -31,12 +31,12 @@
<visible>Library.HasContent(Video)</visible> <visible>Library.HasContent(Video)</visible>
<label>31005</label> <label>31005</label>
<label2/> <label2/>
<onclick>activateWindow(VidvideoseoLibrary)</onclick> <onclick>activateWindow(VideoLibrary)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,true)</onclick> <onclick>Skin.SetString(showRecentVideoItems,true)</onclick>
<onclick>Control.SetFocus(9998)</onclick> <onclick>Control.SetFocus(9998)</onclick>
</item> </item>
<item> <item>
<visible>System.GetBool(pvrmanager.enabled)</visible> <visible>PVR.HasTVChannels</visible>
<label>31006</label> <label>31006</label>
<label2/> <label2/>
<onclick>ActivateWindow(TVChannels)</onclick> <onclick>ActivateWindow(TVChannels)</onclick>
@ -44,7 +44,7 @@
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick> <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
</item> </item>
<item> <item>
<visible>System.GetBool(pvrmanager.enabled)</visible> <visible>PVR.HasTVChannels</visible>
<label>31112</label> <label>31112</label>
<label2/> <label2/>
<onclick>ActivateWindow(TVGuide)</onclick> <onclick>ActivateWindow(TVGuide)</onclick>
@ -52,7 +52,7 @@
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick> <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
</item> </item>
<item> <item>
<visible>System.GetBool(pvrmanager.enabled)</visible> <visible>PVR.HasTVChannels</visible>
<label>19163</label> <label>19163</label>
<label2/> <label2/>
<onclick>ActivateWindow(TVRecordings)</onclick> <onclick>ActivateWindow(TVRecordings)</onclick>

View File

@ -23,128 +23,16 @@
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<control type="group" id="9002"> <control type="group" id="9002">
<!--shortcuts-->
<control type="panel" id="9003">
<visible>!window.isactive(home)</visible>
<posx>col-10-begin</posx>
<posy>7-row</posy>
<width>6-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<ondown>Control.SetFocus(9004,0)</ondown>
<onleft>control.setfocus(9999)</onleft>
<onright>control.setfocus(9999)</onright>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col-textbox</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<visible>!Skin.HasSetting(hideVideo)</visible>
<label2></label2>
<onclick condition="!Library.HasContent(Video)">ActivateWindow(Videos,sources://video/)</onclick>
<onclick condition="!Library.HasContent(Video)">Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="Library.HasContent(Video)">ActivateWindow(Videos,library://video/)</onclick>
<onclick condition="Library.HasContent(Video)">Skin.SetString(showRecentVideoItems,true)</onclick>
<onclick>Control.SetFocus(9000)</onclick>
</item>
<item>
<visible>!Skin.HasSetting(hideMusic)</visible>
<label2></label2>
<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>
<onclick>Control.SetFocus(9000)</onclick>
</item>
<item>
<visible>!Skin.HasSetting(hidePictures)</visible>
<label2></label2>
<onclick>ActivateWindow(pictures)</onclick>
<onclick>Control.SetFocus(9999)</onclick>
</item>
<item>
<visible>!Skin.HasSetting(hideGames) + System.HasAddon(script.games.rom.collection.browser)</visible>
<label2></label2>
<onclick>RunScript(script.games.rom.collection.browser,)</onclick>
<onclick>Control.SetFocus(9999)</onclick>
</item>
<item>
<visible>System.HasAddon(plugin.program.advanced.launcher)</visible>
<onclick>RunAddon(plugin.program.advanced.launcher,)</onclick>
<onclick>Control.SetFocus(9999)</onclick>
</item>
<item>
<visible>!Skin.HasSetting(hideSearch)</visible>
<label2></label2>
<onclick condition="!System.HasAddon(script.globalsearch)">RunPlugin(plugin://script.globalsearch)</onclick>
<onclick condition="System.HasAddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick>Control.SetFocus(9999)</onclick>
</item>
<item>
<label2></label2>
<onclick>ActivateWindow(settings)</onclick>
<onclick>Control.SetFocus(9999)</onclick>
</item>
</content>
</control>
<!--menu items--> <!--menu items-->
<control type="grouplist" id="9004"> <control type="grouplist" id="9004">
<posx>col-10-begin</posx> <posx>col-10-begin</posx>
<posy>10-row</posy> <posy>8-row</posy>
<itemgap>0</itemgap> <itemgap>0</itemgap>
<width>6-col</width> <width>6-col</width>
<height>17-row</height> <height>17-row</height>
<itemgap>0</itemgap> <itemgap>0</itemgap>
<onleft>control.setfocus(9999)</onleft> <onleft>control.setfocus(9999)</onleft>
<onright>control.setfocus(9999)</onright> <onright>control.setfocus(9999)</onright>
<onup>9003</onup>
<ondown>noop</ondown>
<include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include> <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
<include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include> <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
<include condition="window.isactive(pictures)">picturesSideMenu</include> <include condition="window.isactive(pictures)">picturesSideMenu</include>

View File

@ -76,11 +76,6 @@
<value condition="window.isactive(infodialog) + window.isactive(extendedprogressdialog)">323</value> <value condition="window.isactive(infodialog) + window.isactive(extendedprogressdialog)">323</value>
<value>95</value> <value>95</value>
</variable> </variable>
<!--homescreen background image content-->
<variable name="homescreenCollage">
<value condition="Container(9000).HasFocus(1)">special://skin/extras/playlists/collage_RandomMovies.xsp</value>
<value condition="Container(9000).HasFocus(2)">special://skin/extras/playlists/collage_RandomAlbums.xsp</value>
</variable>
<!--Star rating for music tracks--> <!--Star rating for music tracks-->
<variable name="starRating"> <variable name="starRating">
<value condition="SubString(MusicPlayer.Rating,1)"></value> <value condition="SubString(MusicPlayer.Rating,1)"></value>

View File

@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="false">9000</defaultcontrol> <defaultcontrol always="false">9000</defaultcontrol>
<onload condition="window.previous(0)">setfocus(9000)</onload> <onload condition="window.previous(0)">setfocus(9000)</onload>
<previouswindow>home</previouswindow> <previouswindow>home</previouswindow>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
<!--page container group--> <!--page container group-->
<control type="group"> <control type="group">
@ -81,6 +78,7 @@
<include>dateTime</include> <include>dateTime</include>
</control> </control>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="false">9999</defaultcontrol> <defaultcontrol always="false">9999</defaultcontrol>
<onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
<onunload>Skin.SetString(showRecentVideoItems,true)</onunload> <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
@ -73,35 +71,10 @@
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
</control> </control>
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
<!--mini player window-->
<control type="group">
<visible>Player.HasVideo</visible>
<posx>col-20-begin</posx>
<posy>row-22-begin</posy>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>444</width>
<height>255</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>6-col</width>
<height>243</height>
</control>
</control>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -2,8 +2,6 @@
<window> <window>
<views>10</views> <views>10</views>
<defaultcontrol always="false">9999</defaultcontrol> <defaultcontrol always="false">9999</defaultcontrol>
<onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
<onunload>Skin.SetString(showRecentVideoItems,true)</onunload> <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
@ -175,6 +173,7 @@
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="false">9999</defaultcontrol> <defaultcontrol always="false">9999</defaultcontrol>
<onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
<onunload>Skin.SetString(showRecentVideoItems,true)</onunload> <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
@ -208,6 +207,7 @@
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="false">9000</defaultcontrol> <defaultcontrol always="false">9000</defaultcontrol>
<onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
<onload condition="window.previous(0)">setfocus(9000)</onload> <onload condition="window.previous(0)">setfocus(9000)</onload>
<previouswindow>home</previouswindow> <previouswindow>home</previouswindow>
<controls> <controls>
@ -68,6 +67,7 @@
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="true">9999</defaultcontrol> <defaultcontrol always="true">9999</defaultcontrol>
<previouswindow>home</previouswindow> <previouswindow>home</previouswindow>
<controls> <controls>
<include>globalBackground</include> <include>globalBackground</include>
<!--fanart--> <!--fanart-->
<control type="group"> <control type="group">
<control type="image"> <control type="image">
@ -23,28 +20,22 @@
</control> </control>
<include>kenBurnsey</include> <include>kenBurnsey</include>
</control> </control>
<!--page container group--> <!--page container group-->
<control type="group"> <control type="group">
<!--window fader--> <!--window fader-->
<animation type="conditional" condition="window.next(0) | window.next(1)"> <animation type="conditional" condition="window.next(0) | window.next(1)">
<effect type="fade" start="100" end="0" time="300"/> <effect type="fade" start="100" end="0" time="300"/>
</animation> </animation>
<!--shift page for certain modal dialogs--> <!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include> <include>modalDialogContentShift</include>
<!--initial animation--> <!--initial animation-->
<animation type="Windowopen"> <animation type="Windowopen">
<effect type="fade" start="0" end="100" time="300"/> <effect type="fade" start="0" end="100" time="300"/>
</animation> </animation>
<!--Main content listing--> <!--Main content listing-->
<control type="group" id="9999"> <control type="group" id="9999">
<include>viewMusicPlayList</include> <include>viewMusicPlayList</include>
</control> </control>
<!--page scrollbar--> <!--page scrollbar-->
<control type="group" id="8000"> <control type="group" id="8000">
<visible>Control.IsVisible(60)</visible> <visible>Control.IsVisible(60)</visible>
@ -57,7 +48,6 @@
<onback>9999</onback> <onback>9999</onback>
</control> </control>
</control> </control>
<!--Folder titles--> <!--Folder titles-->
<control type="group"> <control type="group">
<posx>col-1-begin</posx> <posx>col-1-begin</posx>
@ -94,11 +84,10 @@
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
</control> </control>
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<window> <window>
<defaultcontrol always="false">9000</defaultcontrol> <defaultcontrol always="false">9000</defaultcontrol>
<onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
<onload condition="window.previous(0)">setfocus(9000)</onload> <onload condition="window.previous(0)">setfocus(9000)</onload>
<previouswindow>home</previouswindow> <previouswindow>home</previouswindow>
<controls> <controls>
@ -80,8 +79,9 @@
</control> </control>
<!--dateTime--> <!--dateTime-->
<include>dateTime</include> <include>dateTime</include>
</control> </control>
</control> </control>
<include>miniVideoPlayer</include>
<!--hub menu--> <!--hub menu-->
<include>hubMenu</include> <include>hubMenu</include>
<include>hubOptions</include> <include>hubOptions</include>

View File

@ -63,7 +63,7 @@
<align></align> <align></align>
<font>medium</font> <font>medium</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<label>[B]$INFO[ListItem.TVShowTitle][/B] $INFO[listitem.Season,$LOCALIZE[31011] , ]</label> <label>[B]$INFO[Container.ShowTitle][/B] $INFO[listitem.Season,$LOCALIZE[31011] , ]</label>
</control> </control>
</control> </control>
@ -114,6 +114,19 @@
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control> </control>
<control type="label"> <control type="label">
<visible>ListItem.IsParentFolder</visible>
<posx>1-col-indent</posx>
<posy>0</posy>
<width>9-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>..</label>
<scroll>false</scroll>
</control>
<control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>9-col</width> <width>9-col</width>
@ -173,6 +186,19 @@
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<bordersize>0</bordersize> <bordersize>0</bordersize>
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<visible>ListItem.IsParentFolder</visible>
<posx>1-col-indent</posx>
<posy>0</posy>
<width>9-col</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>..</label>
<scroll>false</scroll>
</control> </control>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>

View File

@ -70,16 +70,7 @@
<control type="image"> <control type="image">
<posx>1-col</posx> <posx>1-col</posx>
<posy>0</posy> <posy>0</posy>
<width>11-col-textbox</width> <width>13-col-textbox</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="image">
<posx>12-col</posx>
<posy>0</posy>
<width>2-col-textbox</width>
<height>69</height> <height>69</height>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
<texture border="0">colors/black.png</texture> <texture border="0">colors/black.png</texture>
@ -97,7 +88,7 @@
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>11-col-gutter</width> <width>12-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>itemTitle</font> <font>itemTitle</font>
@ -106,16 +97,16 @@
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label"> <control type="label">
<posx>12-col-gutter</posx> <posx>708</posx>
<posy>0</posy> <posy>0</posy>
<width>2-col</width> <width>4-col</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<align>right</align> <align>right</align>
<font>itemSubTitle</font> <font>itemSubTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.duration, , $LOCALIZE[31018]]</label> <label>$INFO[ListItem.year]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!isempty(ListItem.playcount)</visible> <visible>!isempty(ListItem.playcount)</visible>
@ -156,7 +147,7 @@
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>11-col-gutter</width> <width>12-col-gutter</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<font>itemTitle</font> <font>itemTitle</font>
@ -165,16 +156,16 @@
<label>$INFO[ListItem.Label]</label> <label>$INFO[ListItem.Label]</label>
</control> </control>
<control type="label"> <control type="label">
<posx>12-col-gutter</posx> <posx>708</posx>
<posy>0</posy> <posy>0</posy>
<width>2-col</width> <width>4-col</width>
<height>2-row</height> <height>2-row</height>
<aligny>center</aligny> <aligny>center</aligny>
<align>right</align> <align>right</align>
<font>itemSubTitle</font> <font>itemSubTitle</font>
<textcolor>textActive</textcolor> <textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor> <shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.duration, , $LOCALIZE[31018]]</label> <label>$INFO[ListItem.year]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!isempty(ListItem.playcount)</visible> <visible>!isempty(ListItem.playcount)</visible>

View File

@ -70,8 +70,8 @@
<onleft>9000</onleft> <onleft>9000</onleft>
<onback>9000</onback> <onback>9000</onback>
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID])</onclick> <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID])</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Control.SetFocus(50)</onclick> <onclick>Control.SetFocus(50)</onclick>
<content>$INFO[control.getlabel(9123)]</content> <content>$INFO[control.getlabel(9123)]</content>
<itemlayout width="300" height="4-col"> <itemlayout width="300" height="4-col">

View File

@ -91,9 +91,21 @@
<bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture> <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
<bordersize>6</bordersize> <bordersize>6</bordersize>
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="label">
<visible>ListItem.IsParentFolder</visible>
<posx>12</posx>
<posy>4-row</posy>
<width>240</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textDisabled</textcolor>
<label>..</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!controlgroup(9000).hasfocus</visible> <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
<posx>12</posx> <posx>12</posx>
<posy>4-row</posy> <posy>4-row</posy>
<width>240</width> <width>240</width>
@ -142,17 +154,30 @@
<bordersize>6</bordersize> <bordersize>6</bordersize>
<colordiffuse>ff666666</colordiffuse> <colordiffuse>ff666666</colordiffuse>
</control> </control>
<control type="label"> <control type="label">
<posx>12</posx> <visible>ListItem.IsParentFolder</visible>
<posy>4-row</posy> <posx>12</posx>
<width>240</width> <posy>4-row</posy>
<height>2-row</height> <width>240</width>
<align>center</align> <height>2-row</height>
<aligny>center</aligny> <align>center</align>
<font>regularStrong</font> <aligny>center</aligny>
<textcolor>textActive</textcolor> <font>regularStrong</font>
<label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</label> <textcolor>textActive</textcolor>
</control> <label>..</label>
</control>
<control type="label">
<visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
<posx>12</posx>
<posy>4-row</posy>
<width>240</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>regularStrong</font>
<textcolor>textActive</textcolor>
<label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</label>
</control>
<control type="label"> <control type="label">
<posx>12</posx> <posx>12</posx>
<posy>5-row</posy> <posy>5-row</posy>

View File

@ -154,6 +154,18 @@
<colordiffuse>textboxInactive</colordiffuse> <colordiffuse>textboxInactive</colordiffuse>
</control> </control>
<control type="label"> <control type="label">
<visible>ListItem.IsParentFolder</visible>
<posx>1-col-indent</posx>
<posy>0</posy>
<width>11-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>..</label>
</control>
<control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
<posy>0</posy> <posy>0</posy>
<width>11-col-gutter</width> <width>11-col-gutter</width>
@ -165,6 +177,7 @@
<label>$INFO[ListItem.Title]</label> <label>$INFO[ListItem.Title]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!ListItem.IsParentFolder</visible>
<posx>12-col</posx> <posx>12-col</posx>
<posy>0</posy> <posy>0</posy>
<width>1-col-gutter</width> <width>1-col-gutter</width>
@ -257,6 +270,18 @@
<texture>colors/white.png</texture> <texture>colors/white.png</texture>
<bordersize>0</bordersize> <bordersize>0</bordersize>
<colordiffuse>highlight</colordiffuse> <colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<visible>ListItem.IsParentFolder</visible>
<posx>1-col-indent</posx>
<posy>0</posy>
<width>11-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>..</label>
</control> </control>
<control type="label"> <control type="label">
<posx>1-col-indent</posx> <posx>1-col-indent</posx>
@ -270,6 +295,7 @@
<label>$INFO[ListItem.Title]</label> <label>$INFO[ListItem.Title]</label>
</control> </control>
<control type="label"> <control type="label">
<visible>!ListItem.IsParentFolder</visible>
<posx>12-col</posx> <posx>12-col</posx>
<posy>0</posy> <posy>0</posy>
<width>1-col-gutter</width> <width>1-col-gutter</width>

View File

@ -9,16 +9,16 @@
<control type="image"> <control type="image">
<include>dimensionsFullscreen</include> <include>dimensionsFullscreen</include>
<aspectratio scalediffuse="false">stretch</aspectratio> <aspectratio scalediffuse="false">stretch</aspectratio>
<texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture> <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
<fadetime>500</fadetime> <fadetime>500</fadetime>
<colordiffuse>99ffffff</colordiffuse> <colordiffuse>99ffffff</colordiffuse>
<include>kenBurnsey</include>
</control> </control>
<control type="image"> <control type="image">
<texture>vignette.png</texture> <texture>vignette.png</texture>
<colordiffuse>ffffffff</colordiffuse> <colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio> <aspectratio>stretch</aspectratio>
</control> </control>
<include>kenBurnsey</include>
</control> </control>
<!--cover art--> <!--cover art-->

View File

@ -91,7 +91,6 @@
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<onback>control.setfocus(9000)</onback> <onback>control.setfocus(9000)</onback>
<content>$INFO[control.getlabel(9123)]</content> <content>$INFO[control.getlabel(9123)]</content>
<oninfo>RunScript(script.skin.helper.service,action=showinfo,movieid=$INFO[container(9998).listitem.dbid])</oninfo>
<itemlayout width="228" height="312"> <itemlayout width="228" height="312">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>
@ -207,10 +206,9 @@
<orientation>horizontal</orientation> <orientation>horizontal</orientation>
<onback>control.setfocus(9000)</onback> <onback>control.setfocus(9000)</onback>
<content>$INFO[control.getlabel(9123)]</content> <content>$INFO[control.getlabel(9123)]</content>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick> <onclick>activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid])</onclick>
<onclick>activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid])</onclick> <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick>Control.SetFocus(50)</onclick> <onclick>Control.SetFocus(50)</onclick>
<oninfo>RunScript(script.skin.helper.service,action=showinfo,tvshowid=$INFO[container(9998).listitem.dbid])</oninfo>
<itemlayout width="228" height="312"> <itemlayout width="228" height="312">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>

View File

@ -19,14 +19,18 @@
[TODO] [TODO]
Home Backgrounds (esp. non library)
Fix stop from fullscreen music view
Skin shortcuts for all sub menus Skin shortcuts for all sub menus
- homescreen images - homescreen images
Check yes / no progress bar works ok Check yes / no progress bar works ok
PRV mini window and recordings storage indicator and recordings storage indicator
Revise player stop on return Add user option Revise player stop on return
DialogAudioDSPManager.xml DialogAudioDSPManager.xml

BIN
extras/.DS_Store vendored Normal file

Binary file not shown.

BIN
extras/backgrounds/.DS_Store vendored Normal file

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 554 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 818 KiB

BIN
extras/playlists/.DS_Store vendored Normal file

Binary file not shown.

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<smartplaylist type="albums">
<name>collage_RandomAlbums</name>
<match>all</match>
<limit>50</limit>
<order direction="ascending">random</order>
</smartplaylist>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<smartplaylist type="mixed">
<name>collage_RandomContent</name>
<match>all</match>
<rule field="playlist" operator="is">randomAlbums</rule>
<rule field="playlist" operator="is">recentMovies</rule>
<limit>50</limit>
<order direction="ascending">random</order>
</smartplaylist>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<smartplaylist type="movies">
<name>collage_RandomMovies</name>
<match>all</match>
<limit>50</limit>
<order direction="ascending">random</order>
</smartplaylist>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<smartplaylist type="tvshows">
<name>collage_RandomTVShows</name>
<match>all</match>
<limit>50</limit>
<order direction="ascending">random</order>
</smartplaylist>

View File

@ -46,7 +46,7 @@ msgid "Power"
msgstr "" msgstr ""
msgctxt "#31005" msgctxt "#31005"
msgid "What's New" msgid "Latest Content"
msgstr "" msgstr ""
msgctxt "#31006" msgctxt "#31006"

BIN
media/.DS_Store vendored Normal file

Binary file not shown.