tweaks

1080i/MyPics.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol always="true">9000</defaultcontrol>
+    <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <include>fadeInOut</include>
     <controls>

1080i/VideoOSD.xml

@@ -3,6 +3,22 @@
     <defaultcontrol always="true">8001</defaultcontrol>
     <onload>Control.SetFocus(8001,3)</onload>
     <controls>
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>row-1-begin</posy>
+            <width>12-col</width>
+            <font>pageTitle</font>
+            <label>$INFO[System.Time]</label>
+            <textcolor>textActive</textcolor>
+        </control>
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>94</posy>
+            <width>12-col</width>
+            <font>pageSubTitle</font>
+            <label>$INFO[System.Date(DDD)], $INFO[system.Date(mmm d)]</label>
+            <textcolor>textActive</textcolor>
+        </control>
         <control type="group">
             <posx>1200</posx>
             <posy>0</posy>
@@ -136,7 +152,7 @@
                     <align>left</align>
                     <textcolor>textActive</textcolor>
                     <height>388</height>
-                    <label fallback="31205">$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,. ]$INFO[videoplayer.plot]</label>
+                    <label fallback="31205">[B]$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,. ][/B]$INFO[videoplayer.plot]</label>
                     <autoscroll>false</autoscroll>
                     <shadowcolor>-</shadowcolor>
                     <pagecontrol>61</pagecontrol>

1080i/custom_musicPlayerOptions.xml

@@ -2,6 +2,22 @@
 <window type="dialog" id="1105">
     <defaultcontrol always="true">8001</defaultcontrol>
     <controls>
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>row-1-begin</posy>
+            <width>12-col</width>
+            <font>pageTitle</font>
+            <label>$INFO[System.Time]</label>
+            <textcolor>textActive</textcolor>
+        </control>
+        <control type="label">
+            <posx>col-1-begin</posx>
+            <posy>94</posy>
+            <width>12-col</width>
+            <font>pageSubTitle</font>
+            <label>$INFO[System.Date(DDD)], $INFO[system.Date(mmm d)]</label>
+            <textcolor>textActive</textcolor>
+        </control>
         <!-- options menu-->
         <control type="group">
             <posx>1438</posx>

1080i/script-skinshortcuts-includes.xml

@@ -907,22 +907,6 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
-			<label>&lt;None&gt;</label>
-			<label2>Custom item</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">none</property>
-			<property name="defaultID" />
-			<onclick>PlayerControl(PartyMode)</onclick>
-			<property name="path">PlayerControl(PartyMode)</property>
-			<property name="list">PlayerControl(PartyMode)</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
-			<property name="group">musicsubmenu</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -937,8 +921,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
+		<item id="4">
-			<property name="id">$NUMBER[5]</property>
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
@@ -954,8 +938,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
+		<item id="5">
-			<property name="id">$NUMBER[6]</property>
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
@@ -964,15 +948,15 @@
 			<property name="labelID">132</property>
 			<property name="defaultID">132</property>
 			<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
-			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<onclick>ActivateWindow(Music,musicdb://albums/,return)</onclick>
-			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="path">ActivateWindow(Music,musicdb://albums/,return)</property>
 			<property name="list">musicdb://albums/</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
+		<item id="6">
-			<property name="id">$NUMBER[7]</property>
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
@@ -988,8 +972,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
+		<item id="7">
-			<property name="id">$NUMBER[8]</property>
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
@@ -997,15 +981,15 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
+		<item id="8">
-			<property name="id">$NUMBER[9]</property>
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
@@ -1020,8 +1004,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
+		<item id="9">
-			<property name="id">$NUMBER[10]</property>
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
@@ -1045,10 +1029,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -1062,10 +1045,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -1544,9 +1526,9 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -1592,10 +1574,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -1609,10 +1590,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3207,22 +3187,6 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
-			<label>&lt;None&gt;</label>
-			<label2>Custom item</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">none</property>
-			<property name="defaultID" />
-			<onclick>PlayerControl(PartyMode)</onclick>
-			<property name="path">PlayerControl(PartyMode)</property>
-			<property name="list">PlayerControl(PartyMode)</property>
-			<visible>StringCompare(System.ProfileName,Master user)</visible>
-			<property name="group">musicsubmenu</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3237,8 +3201,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
+		<item id="4">
-			<property name="id">$NUMBER[5]</property>
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
@@ -3254,8 +3218,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
+		<item id="5">
-			<property name="id">$NUMBER[6]</property>
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
@@ -3264,15 +3228,15 @@
 			<property name="labelID">132</property>
 			<property name="defaultID">132</property>
 			<visible>Library.HasContent(Music)</visible>
-			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<onclick>ActivateWindow(Music,musicdb://albums/,return)</onclick>
-			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="path">ActivateWindow(Music,musicdb://albums/,return)</property>
 			<property name="list">musicdb://albums/</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
+		<item id="6">
-			<property name="id">$NUMBER[7]</property>
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
@@ -3288,8 +3252,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
+		<item id="7">
-			<property name="id">$NUMBER[8]</property>
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
@@ -3297,15 +3261,15 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
+		<item id="8">
-			<property name="id">$NUMBER[9]</property>
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
@@ -3320,8 +3284,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
+		<item id="9">
-			<property name="id">$NUMBER[10]</property>
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
@@ -3448,9 +3412,9 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>StringCompare(System.ProfileName,Test profile)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3527,22 +3491,6 @@
 		<item id="3">
 			<property name="id">$NUMBER[3]</property>
 			<property name="mainmenuid">17</property>
-			<label>&lt;None&gt;</label>
-			<label2>Custom item</label2>
-			<icon>DefaultShortcut.png</icon>
-			<thumb />
-			<property name="labelID">none</property>
-			<property name="defaultID" />
-			<onclick>PlayerControl(PartyMode)</onclick>
-			<property name="path">PlayerControl(PartyMode)</property>
-			<property name="list">PlayerControl(PartyMode)</property>
-			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
-			<property name="group">musicsubmenu</property>
-			<property name="isSubmenu">True</property>
-		</item>
-		<item id="4">
-			<property name="id">$NUMBER[4]</property>
-			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31059]</label>
 			<label2>Music</label2>
 			<icon>DefaultAddon.png</icon>
@@ -3557,8 +3505,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="5">
+		<item id="4">
-			<property name="id">$NUMBER[5]</property>
+			<property name="id">$NUMBER[4]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[133]</label>
 			<label2>Music</label2>
@@ -3574,8 +3522,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="6">
+		<item id="5">
-			<property name="id">$NUMBER[6]</property>
+			<property name="id">$NUMBER[5]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[132]</label>
 			<label2>Music</label2>
@@ -3584,15 +3532,15 @@
 			<property name="labelID">132</property>
 			<property name="defaultID">132</property>
 			<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
-			<onclick>ActivateWindow(Music,musicdb://albums/)</onclick>
+			<onclick>ActivateWindow(Music,musicdb://albums/,return)</onclick>
-			<property name="path">ActivateWindow(Music,musicdb://albums/)</property>
+			<property name="path">ActivateWindow(Music,musicdb://albums/,return)</property>
 			<property name="list">musicdb://albums/</property>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="7">
+		<item id="6">
-			<property name="id">$NUMBER[7]</property>
+			<property name="id">$NUMBER[6]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[135]</label>
 			<label2>Music</label2>
@@ -3608,8 +3556,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="8">
+		<item id="7">
-			<property name="id">$NUMBER[8]</property>
+			<property name="id">$NUMBER[7]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[136]</label>
 			<label2>Music</label2>
@@ -3617,15 +3565,15 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="9">
+		<item id="8">
-			<property name="id">$NUMBER[9]</property>
+			<property name="id">$NUMBER[8]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[31090]</label>
 			<label2>Music</label2>
@@ -3640,8 +3588,8 @@
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
 		</item>
-		<item id="10">
+		<item id="9">
-			<property name="id">$NUMBER[10]</property>
+			<property name="id">$NUMBER[9]</property>
 			<property name="mainmenuid">17</property>
 			<label>$LOCALIZE[744]</label>
 			<label2>Music</label2>
@@ -3768,9 +3716,9 @@
 			<thumb />
 			<property name="labelID">136</property>
 			<property name="defaultID">136</property>
-			<onclick>ActivateWindow(Music,special://musicplaylists/)</onclick>
+			<onclick>activateWindow(Music,special://musicplaylists/)</onclick>
-			<property name="path">ActivateWindow(Music,special://musicplaylists/)</property>
+			<property name="path">activateWindow(Music,special://musicplaylists/)</property>
-			<property name="list">special://musicplaylists/</property>
+			<property name="list">activateWindow(Music,special://musicplaylists/)</property>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
 			<property name="group">musicsubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3818,10 +3766,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3835,10 +3782,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Master user)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3852,10 +3798,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Test profile)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3869,10 +3814,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>StringCompare(System.ProfileName,Test profile)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3888,10 +3832,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3905,10 +3848,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Master user)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3922,10 +3864,9 @@
 			<thumb />
 			<property name="labelID">744</property>
 			<property name="defaultID">744</property>
-			<onclick condition="true">ActivateWindow(Pictures,files)</onclick>
+			<onclick>ActivateWindow(Pictures,files)</onclick>
 			<property name="path">ActivateWindow(Pictures,files)</property>
 			<property name="list">files</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>
@@ -3939,10 +3880,9 @@
 			<thumb />
 			<property name="labelID">1039</property>
 			<property name="defaultID">1039</property>
-			<onclick condition="true">ActivateWindow(Pictures,Addons,return)</onclick>
+			<onclick>ActivateWindow(Pictures,Addons,return)</onclick>
 			<property name="path">ActivateWindow(Pictures,Addons,return)</property>
 			<property name="list">Addons</property>
-			<onclick condition="true">control.setfocus(9999)</onclick>
 			<visible>[StringCompare(System.ProfileName,Test profile)] + StringCompare(Window(10000).Property(submenuVisibility),picturessubmenu)</visible>
 			<property name="group">picturessubmenu</property>
 			<property name="isSubmenu">True</property>

changelog.txt

@@ -9,11 +9,10 @@ DONE - rework fullscreen options OSD
 DONE - Reworked music fullscreen menu. Ensure closes properly on stop
 DONE - add 'go to artist'
 DONE - add 'go to album'
-
+DONE - picture section fix
-- picture section fix
 - add check for musicfinder script to buttons when on repo
 
-
+Extra overrides required for submenus (e.g. selecting 'artist' when artist is not open fails to reopen the window properly. )
 
 [V1.0.4]
 - Minor tweaks and bug fixes

language/English/strings.po

@@ -57,10 +57,6 @@ msgctxt "#31007"
 msgid "System Info"
 msgstr ""
 
-msgctxt "#31008"
-msgid "Enable Artist Slideshow"
-msgstr ""
-
 msgctxt "#31009"
 msgid "Genres"
 msgstr ""
@@ -121,10 +117,6 @@ msgctxt "#31023"
 msgid "Notification"
 msgstr ""
 
-msgctxt "#31024"
-msgid "Set skin highlight colour"
-msgstr ""
-
 msgctxt "#31025"
 msgid "Settings"
 msgstr ""
@@ -149,10 +141,6 @@ msgctxt "#31030"
 msgid "Humidity"
 msgstr ""
 
-msgctxt "#31031"
-msgid "Content:"
-msgstr ""
-
 msgctxt "#31032"
 msgid "Visualisation"
 msgstr ""

shortcuts/musicsubmenu.DATA.xml

@@ -28,35 +28,35 @@
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>ActivateWindow(MusicLibrary,musicdb://artists/)</action>
+        <action>ActivateWindow(Music,musicdb://artists/)</action>
     </shortcut>
     <shortcut>
         <label>132</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>ActivateWindow(MusicLibrary,musicdb://albums/)</action>
+        <action>ActivateWindow(Music,musicdb://albums/)</action>
     </shortcut>
     <shortcut>
         <label>135</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>ActivateWindow(MusicLibrary,musicdb://genres/)</action>
+        <action>ActivateWindow(Music,musicdb://genres/)</action>
     </shortcut>
     <shortcut>
         <label>136</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>activateWindow(MusicLibrary,special://musicplaylists/)</action>
+        <action>activateWindow(Music,special://musicplaylists/)</action>
     </shortcut>
     <shortcut>
         <label>31090</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>
         <thumb />
-        <action>ActivateWindow(MusicLibrary,Addons)</action>
+        <action>ActivateWindow(Music,Addons)</action>
     </shortcut>
     <shortcut>
         <label>744</label>

shortcuts/overrides.xml

@@ -36,10 +36,4 @@
         <action>::ACTION::</action>
         <action>control.setfocus(9998)</action>
     </override>
-
-    <override action="globaloverride" group="picturessubmenu">
-         <condition>true</condition>
-         <action>::ACTION::</action>
-         <action>control.setfocus(9999)</action>
-    </override>
 </overrides>