various

1080i/Home.xml

@@ -12,11 +12,15 @@
                 <effect type="zoom" center="auto" start="105" tween="sine" end="100" time="1500"/>
             </animation>
             <include>modalDialogContentShift</include>
-            <control type="image">
+            <control type="multiimage">
-                <include>dimensionsFullscreen</include>
+                  <include>dimensionsFullscreen</include>
-                <texture>$INFO[skin.string(homeBackground)]</texture>
+                  <imagepath>special://skin/extras/homeBackgrounds</imagepath>
-                <colordiffuse>ffffffff</colordiffuse>
+                  <timeperimage>20000</timeperimage>
-                <aspectratio>stretch</aspectratio>
+                  <fadetime>1000</fadetime>
+                  <pauseatend>10000</pauseatend>
+                  <randomize>true</randomize>
+                  <loop>yes</loop>
+                  <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
                 <include>dimensionsFullscreen</include>
@@ -27,14 +31,14 @@
         </control>
         <!--Date / time and weather-->
         <control type="group">
-            <posx>1852</posx>
+            <posx>col-9-begin</posx>
-            <posy>858</posy>
+            <posy>row-23-begin</posy>
             <control type="label">
                 <posx>0</posx>
                 <posy>-24</posy>
-                <width>24-col</width>
+                <width>8-col</width>
                 <height>4-row</height>
-                <align>right</align>
+                <align>center</align>
                 <font>veryLarge</font>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[System.Time]</label>
@@ -42,10 +46,10 @@
             <control type="label">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>24-col</width>
+                <width>8-col</width>
                 <height>4-row</height>
                 <font>regular</font>
-                <align>right</align>
+                <align>center</align>
                 <textcolor>textActive</textcolor>
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>

1080i/Includes_hubMenu.xml

@@ -81,8 +81,8 @@
                 <content>
                     <include condition="window.isactive(home)">skinshortcuts-mainmenu</include>
                     <include condition="window.isactive(pictures)">skinshortcuts-group-picturessubmenu</include>
-                    <include condition="window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers)">skinshortcuts-group-musicsubmenu</include>
+                    <include condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),music)] | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers)">skinshortcuts-group-musicsubmenu</include>
-                    <include condition="window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers)">skinshortcuts-group-videosubmenu</include>
+                    <include condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),video)] | window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers)">skinshortcuts-group-videosubmenu</include>
                 </content>
             </control>
         </control>

1080i/Includes_hubOptionsItems.xml

@@ -37,6 +37,15 @@
             <label>31041</label>
             <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videos)</onclick>
         </control>
+        <control type="button" id="508">
+            <visible>PVR.HasTVChannels</visible>
+            <description>PVR Timers</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>6-col</width>
+            <label>31087</label>
+            <onclick>ActivateWindow(TVTimerRules)</onclick>
+        </control>
         <control type="button" id="507">
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <focusedcolor>textActive</focusedcolor>
@@ -89,6 +98,15 @@
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
         </control>
+        <control type="button" id="508">
+            <visible>PVR.HasRadioChannels</visible>
+            <description>PVR Timers</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>6-col</width>
+            <label>31087</label>
+            <onclick>ActivateWindow(RadioTimerRules)</onclick>
+        </control>
         <control type="button" id="503">
             <width>6-col</width>
             <focusedcolor>textActive</focusedcolor>

1080i/MyPVRChannels.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
 

1080i/MyPVRGuide.xml

@@ -2,7 +2,6 @@
 <window>
     <views>10</views>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->

1080i/MyPVRRecordings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
-    <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->

1080i/MyPVRTimers.xml

@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+    <defaultcontrol always="false">9999</defaultcontrol>
+    <controls>
+        <include>globalBackground</include>
+        <!--page container group-->
+        <control type="group">
+            <!--window fader-->
+            <animation type="conditional" condition="window.next(0) | window.next(1)">
+                <effect type="fade" start="100" end="0" time="300"/>
+            </animation>
+            <!--shift page for certain modal dialogs-->
+            <include>modalDialogContentShift</include>
+            <!--initial animation-->
+            <animation type="Windowopen">
+                <effect type="fade" start="0" end="100" time="300"/>
+            </animation>
+            <!--Main content listing-->
+            <control type="group" id="9999">
+                <posx>col-1-begin</posx>
+                <posy>row-5-begin</posy>
+                <control type="panel" id="50">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>24-col</width>
+                    <height>21-row</height>
+                    <onleft>9000</onleft>
+                    <onright>60</onright>
+                    <onback>9000</onback>
+                    <pagecontrol>60</pagecontrol>
+                    <itemlayout width="24-col" height="2-row">
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>23-col</width>
+                            <height>69</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>overlay</colordiffuse>
+                        </control>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>3</posy>
+                            <width>66</width>
+                            <height>66</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        </control>
+                        <control type="label">
+                            <visible>ListItem.HasTimer</visible>
+                            <posx>16</posx>
+                            <posy>2</posy>
+                            <width>66</width>
+                            <height>66</height>
+                            <font>symbolLarge</font>
+                            <textcolor>textActive</textcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label></label>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
+                            <width>11-col</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                        <control type="label">
+                            <posx>13-col</posx>
+                            <posy>0</posy>
+                            <width>8-col-gutter</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Date]</label>
+                        </control>
+                        <control type="label">
+                            <posx>20-col</posx>
+                            <posy>0</posy>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Comment]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout width="24-col" height="2-row">
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>23-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                        </control>
+                        <control type="group">
+                            <animation type="focus" loop="false" reversible="false">
+                                <effect type="fade" time="500"/>
+                                <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            </animation>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>3</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
+                            </control>
+                            <control type="label">
+                                <visible>!isempty(ListItem.playcount) + !ListItem.IsResumable</visible>
+                                <posx>16</posx>
+                                <posy>2</posy>
+                                <width>66</width>
+                                <height>66</height>
+                                <font>symbolLarge</font>
+                                <textcolor>black</textcolor>
+                                <shadowcolor>-</shadowcolor>
+                                <label>✓</label>
+                            </control>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
+                            <posy>0</posy>
+                            <width>11-col</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>textActive</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
+                        </control>
+                        <control type="label">
+                            <posx>13-col</posx>
+                            <posy>0</posy>
+                            <width>8-col-gutter</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>textActive</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Date]</label>
+                        </control>
+                        <control type="label">
+                            <posx>20-col</posx>
+                            <posy>0</posy>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <font>itemTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <selectedcolor>textActive</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Comment]</label>
+                        </control>
+                    </focusedlayout>
+                </control>
+                <!--Additional info-->
+                <control type="group">
+                    <posx>16-col</posx>
+                    <posy>22-row</posy>
+                    <control type="progress">
+                        <description>Disk usage bar</description>
+                        <left>0</left>
+                        <top>1</top>
+                        <width>8-col</width>
+                        <height>1-row</height>
+                        <texturebg colordiffuse="textboxInactive">colors/black.png</texturebg>
+                        <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+                        <info>PVR.backenddiskspaceprogr</info><visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <font>itemSubTitle</font>
+                        <align>center</align>
+                        <textcolor>background</textcolor>
+                        <selectedcolor>textActive</selectedcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[Pvr.BackendDiskSpace]</label>
+                    </control>
+                </control>
+            </control>
+            <!--page scrollbar-->
+            <control type="group" id="9400">
+                <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
+                <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
+                <control type="scrollbar" id="60">
+                    <posx>48r</posx>
+                    <posy>row-11-begin</posy>
+                    <height>9-row</height>
+                    <onleft>9999</onleft>
+                    <onback>9999</onback>
+                </control>
+            </control>
+            <!--Folder titles-->
+            <control type="group">
+                <posx>col-1-begin</posx>
+                <posy>row-1-begin</posy>
+                <!--source title-->
+                <control type="label">
+                    <visible>Window.IsVisible(TVTimerRules)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>14-col</width>
+                    <font>pageTitle</font>
+                    <label>$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31055][/COLOR]</label>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="label">
+                    <visible>Window.IsVisible(RadioTimerRules)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>14-col</width>
+                    <font>pageTitle</font>
+                    <label>$LOCALIZE[31059] [COLOR highlight]$LOCALIZE[31055][/COLOR]</label>
+                    <textcolor>textActive</textcolor>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>45</posy>
+                    <width>14-col</width>
+                    <font>pageSubTitle</font>
+                    <label>$INFO[container.numitems] $LOCALIZE[31145]</label>
+                    <textcolor>textActive</textcolor>
+                </control>
+            </control>
+            <!--dateTime-->
+            <include>dateTime</include>
+        </control>
+        <!--hub menu-->
+        <include>hubMenu</include>
+        <include>hubOptions</include>
+        <!--debugging-->
+        <include>DebugGrid</include>
+        <control type="label">
+            <include>DialogID</include>
+            <label>MyPVRTimers.xml</label>
+        </control>
+    </controls>
+</window>

1080i/MyPrograms.xml

@@ -123,7 +123,7 @@
 
             <!--page scrollbar-->
             <control type="group" id="8000">
-                <visible>Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false)</visible>
+                <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
                     <posx>48r</posx>

1080i/SkinSettings.xml

@@ -129,15 +129,6 @@
                 <onleft>8000</onleft>
                 <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
-                <control type="button" id="2">
-                    <visible>Container(8000).Hasfocus(1)</visible>
-                    <description>Set home background image</description>
-                    <width>14-col</width>
-                    <label>31116</label>
-                    <label2>$INFO[Skin.String(homeBackground)]</label2>
-                    <onclick>Skin.SetFile(homeBackground,.png|.jpg|.gif)</onclick>
-                    <textwidth>8-col</textwidth>
-                </control>
                 <control type="radiobutton" id="1">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Reverse power down options</description>

1080i/custom_musicPlayerFullscreen.xml

@@ -2,7 +2,6 @@
 <window type="dialog" id="1103">
     <defaultcontrol always="true">9876</defaultcontrol>
     <onunload>activateWindow(music)</onunload>
-    <onunload>Skin.SetString(showRecentMusicItems,true)</onunload>
     <onunload>control.setfocus(9000)</onunload>
     <controls>
         <include>globalBackground</include>
@@ -10,15 +9,12 @@
             <include>fadeInOut</include>
             <control type="group">
                 <!--fanart-->
-                <control type="multiimage">
+                <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
                     <include>dimensionsFullscreen</include>
-                    <imagepath background="true">$INFO[Window(Home).Property(SkinHelper.Music.ExtraFanArt)]</imagepath>
+                    <texture border="0">$INFO[player.art(fanart)]</texture>
-                    <aspectratio>keep</aspectratio>
+                    <aspectratio>stretch</aspectratio>
-                    <timeperimage>10000</timeperimage>
-                    <fadetime>1000</fadetime>
-                    <randomize>true</randomize>
                     <include>kenBurnsey</include>
                     <colordiffuse>44ffffff</colordiffuse>
                 </control>
@@ -134,7 +130,7 @@
                          <info>Player.Progress</info>
                    </control>
                    <control type="label">
-				      	<posx>24</posx>
+                        <posx>24</posx>
                         <posy>3-row</posy>
                         <width>612</width>
                         <height>2-row</height>
@@ -194,7 +190,7 @@
             <aspectratio>stretch</aspectratio>
         </control>
         <!--hidden buttons to handle dialog autohide-->
-		<control type="button" id="9876">
+        <control type="button" id="9876">
             <posx>-100</posx>
             <posy>-100</posy>
             <height>1-col</height>

1080i/custom_recentContent.xml

@@ -9,16 +9,29 @@
             <!--fanart-->
             <control type="group">
                 <control type="image">
+                    <visible>String.IsEqual(skin.string(recentitems),video)</visible>
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>fullscreenWidth</width>
                     <height>fullscreenHeight</height>
-                    <aspectratio scalediffuse="false" align="center">stretch</aspectratio>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture background="true" fallback="special://skin/extras/backgrounds/videos.jpg" border="0">$INFO[container(9998).listitem.art(fanart)]</texture>
                     <fadetime>500</fadetime>
                     <colordiffuse>77FFFFFF</colordiffuse>
                     <include>kenBurnsey</include>
                 </control>
+                <control type="image">
+                    <visible>String.IsEqual(skin.string(recentitems),music)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>fullscreenWidth</width>
+                    <height>fullscreenHeight</height>
+                    <aspectratio scalediffuse="false">stretch</aspectratio>
+                    <texture background="true" fallback="special://skin/extras/backgrounds/music.jpg" border="0">$INFO[container(9998).listitem.art(fanart)]</texture>
+                    <fadetime>500</fadetime>
+                    <colordiffuse>77FFFFFF</colordiffuse>
+                    <include>kenBurnsey</include>
+                </control>
                 <control type="image">
                     <include>dimensionsFullscreen</include>
                     <texture>vignette.png</texture>
@@ -387,27 +400,11 @@
                 <ondown>9998</ondown>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
-                <itemlayout width="4-col-gutter" height="48">
+                <itemlayout width="204" height="48">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1</width>
-                        <height>48</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
-                    <control type="image">
-                        <posx>4-col-gutter</posx>
-                        <posy>0</posy>
-                        <width>1</width>
-                        <height>48</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
+                        <width>204</width>
                         <height>48</height>
                         <font>smallStrong</font>
                         <align>center</align>
@@ -417,11 +414,11 @@
                         <label>$INFO[ListItem.property(textTitle)]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col-gutter" height="48">
+                <focusedlayout width="204" height="48">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
+                        <width>204</width>
                         <height>48</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
@@ -429,7 +426,7 @@
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
+                        <width>204</width>
                         <height>48</height>
                         <font>smallStrong</font>
                         <align>center</align>
@@ -441,28 +438,31 @@
                 </focusedlayout>
                 <content>
                     <item id="1">
-                        <visible>Library.HasContent(movies)</visible>
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)</visible>
                         <label>special://skin/extras/playlists/recentMovies.xsp</label>
                         <property name="textTitle">31176</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="2">
-                        <visible>Library.HasContent(tvshows)</visible>
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)</visible>
                         <label>special://skin/extras/playlists/recentEpisodes.xsp</label>
                         <property name="textTitle">31178</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="3">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
                         <label>special://skin/extras/playlists/recentAlbums.xsp</label>
                         <property name="textTitle">31180</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="4">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
                         <label>special://skin/extras/playlists/topAlbums.xsp</label>
                         <property name="textTitle">31187</property>
                         <onclick>noop</onclick>
                     </item>
                     <item id="5">
+                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
                         <label>special://skin/extras/playlists/randomAlbums.xsp</label>
                         <property name="textTitle">31181</property>
                         <onclick>noop</onclick>

changelog.txt

@@ -20,25 +20,25 @@
 - [NEW] DialogAudioDSPManager.xml
 - Numerous misc tweaks and fixes
 - [MODIFIED] SmartPlaylistEditor.xml / SmartPlaylistRule.xml
+- [NEW] MyPVRTimers.xml
 
 
 [TODO]
-Add recent content screen to main menu
+Music menu: Radio recordings??
+
+Menu overrides: select correct content list
+Make sure default view is a pagewidth single list. Change all views to 50 (except episodes / songs / seasons etc)
+
+Finish recent content screen - default backgrounds
 
 Gamepad setup
 
-MyPVRTimers
-
-Make sure default view is a pagewidth single list. Change all views to 50 (except episodes / songs / seasons etc)
-
 Pictures section refresh
 
-Fix stop from fullscreen music view
+Fix stop from fullscreen music view & Check that the fanart is working
 
 Add user option: Revise player stop on return
 
-Check RCB (e.g. busy spinner and menu width)
-
 check all active strings
 
 Screenshots etc