This commit is contained in:
Chris Bevan 2016-11-29 22:56:29 +00:00
parent 49768791ad
commit 177832641a
17 changed files with 340 additions and 155 deletions

View File

@ -2,6 +2,7 @@
<window id="0">
<defaultcontrol always="true">9999</defaultcontrol>
<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu)</onload>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
<animation effect="fade" start="0" end="100" time="500" reversible="true">WindowOpen</animation>
<controls>
@ -62,6 +63,8 @@
<onleft>9000</onleft>
<onclick>control.setfocus(9000)</onclick>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -64,6 +64,8 @@
<include>dateTime</include>
</control>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="false">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<controls>
<include>globalBackground</include>
@ -64,9 +65,9 @@
</control>
<!--dateTime-->
<include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -3,6 +3,7 @@
<views>10</views>
<include>fadeInOut</include>
<defaultcontrol always="true">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<controls>
<include>globalBackground</include>
<!--page container group-->
@ -162,9 +163,9 @@
</control>
<!--dateTime-->
<include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="false">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<controls>
<include>globalBackground</include>
@ -203,9 +204,9 @@
</control>
<!--dateTime-->
<include>dateTime</include>
<!--mini window-->
<include>miniVideoPlayer</include>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="false">9000</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<controls>
<include>globalBackground</include>
@ -66,6 +67,8 @@
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--debug-->
<include>DebugGrid</include>
<control type="label">

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<controls>
<include>globalBackground</include>
@ -80,6 +81,8 @@
<!--dateTime-->
<include>dateTime</include>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<controls>
<!--page container group-->
<control type="group">
<include>globalBackground</include>
<!--shift page for certain modal dialogs-->
<include>modalDialogContentShift</include>
<!--Main content listing-->
<control type="group" id="9999">
<!--source content-->
@ -120,7 +119,6 @@
</control>
</control>
</control>
<!--page scrollbar-->
<control type="group" id="8000">
<visible>Control.IsVisible(60)</visible>
@ -133,7 +131,6 @@
<onback>9999</onback>
</control>
</control>
<!--Folder titles-->
<control type="group">
<!--source title-->
@ -160,6 +157,8 @@
<!--dateTime-->
<include>dateTime</include>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">9999</defaultcontrol>
<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
<include>fadeInOut</include>
<previouswindow>home</previouswindow>
<controls>
@ -62,6 +63,8 @@
<include>dateTime</include>
</control>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -125,6 +125,14 @@
<onleft>8000</onleft>
<itemgap>0</itemgap>
<orientation>vertical</orientation>
<control type="radiobutton" id="6">
<visible>Container(8000).Hasfocus(1)</visible>
<description>Stop video on return to menu</description>
<width>14-col</width>
<label>31138</label>
<onclick>Skin.ToggleSetting(stopVideoOnMenu)</onclick>
<selected>Skin.HasSetting(stopVideoOnMenu)</selected>
</control>
<control type="button" id="2">
<visible>Container(8000).Hasfocus(1)</visible>
<description>Set home background image directory</description>

View File

@ -295,7 +295,7 @@
</control>
</focusedlayout>
</control>
<!--content listing: episodes-->
<!--content listing: episodes-->
<control type="panel" id="9998">
<visible>container(9123).hasfocus(7)</visible>
<posx>72</posx>
@ -404,7 +404,7 @@
</control>
</focusedlayout>
</control>
<!--content listing: Music-->
<!--content listing: Music-->
<control type="panel" id="9998">
<visible>container(9123).hasfocus(3) | container(9123).hasfocus(4) | container(9123).hasfocus(5)</visible>
<posx>72</posx>
@ -639,6 +639,8 @@
<include>dateTime</include>
</control>
</control>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>

View File

@ -3,6 +3,23 @@
<include name="skinshortcuts-mainmenu">
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasMedia</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Master user)</visible>
<property name="submenuVisibility">num-31136</property>
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$ADDON[script.skinshortcuts 32032]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -18,8 +35,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32033]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -35,8 +52,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31147]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -53,8 +70,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -70,8 +87,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$ADDON[script.skinshortcuts 32087]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -87,8 +104,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[10006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -106,8 +123,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[10006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -123,8 +140,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[10005]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -142,8 +159,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<label>$LOCALIZE[10005]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -159,8 +176,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<label>$LOCALIZE[12600]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -176,8 +193,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<label>$LOCALIZE[10002]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -192,8 +209,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<label>$LOCALIZE[10004]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -208,8 +225,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="13">
<property name="id">$NUMBER[13]</property>
<item id="14">
<property name="id">$NUMBER[14]</property>
<label>$LOCALIZE[31004]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -226,6 +243,23 @@
</item>
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasMedia</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="submenuVisibility">num-31136</property>
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$ADDON[script.skinshortcuts 32032]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -241,8 +275,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32033]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -258,8 +292,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31147]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -276,8 +310,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -293,8 +327,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$ADDON[script.skinshortcuts 32087]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -310,8 +344,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[10006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -329,8 +363,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[10006]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -346,8 +380,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[10005]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -365,8 +399,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<label>$LOCALIZE[10005]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -382,8 +416,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<label>$LOCALIZE[12600]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -399,8 +433,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">False</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<label>$LOCALIZE[10002]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -415,8 +449,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<label>$LOCALIZE[10004]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -431,8 +465,8 @@
<property name="group">mainmenu</property>
<property name="hasSubmenu">True</property>
</item>
<item id="13">
<property name="id">$NUMBER[13]</property>
<item id="14">
<property name="id">$NUMBER[14]</property>
<label>$LOCALIZE[31004]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
@ -714,6 +748,22 @@
</item>
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Master user)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -729,8 +779,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -745,8 +795,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -761,8 +811,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -777,8 +827,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -793,8 +843,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -809,8 +859,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -824,8 +874,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -847,7 +897,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasAudio] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>
@ -1260,6 +1310,22 @@
</item>
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),videosubmenu)</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1275,8 +1341,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1291,8 +1357,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1307,8 +1373,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1323,8 +1389,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1339,8 +1405,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1355,8 +1421,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1370,8 +1436,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -1393,7 +1459,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasAudio] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
<visible>[Player.HasMedia] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>
@ -1543,6 +1609,14 @@
<property name="isSubmenu">True</property>
</item>
</include>
<include name="skinshortcuts-group-num-31136">
<description>No items</description>
<description>No items</description>
</include>
<include name="skinshortcuts-group-alt-num-31136">
<description>No items</description>
<description>No items</description>
</include>
<include name="skinshortcuts-group-dvd">
<item id="1">
<property name="id">$NUMBER[1]</property>
@ -2674,6 +2748,22 @@
<include name="skinshortcuts-group-videosubmenu">
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasMedia</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Master user)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2689,8 +2779,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2705,8 +2795,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2721,8 +2811,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2737,8 +2827,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2753,8 +2843,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2769,8 +2859,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2784,8 +2874,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2801,6 +2891,22 @@
</item>
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasMedia</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2816,8 +2922,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2832,8 +2938,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2848,8 +2954,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2864,8 +2970,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2880,8 +2986,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2896,8 +3002,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2911,8 +3017,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2930,6 +3036,22 @@
<include name="skinshortcuts-group-alt-videosubmenu">
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Master user)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2945,8 +3067,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2961,8 +3083,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2977,8 +3099,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -2993,8 +3115,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3009,8 +3131,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3025,8 +3147,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3040,8 +3162,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3057,6 +3179,22 @@
</item>
<item id="1">
<property name="id">$NUMBER[1]</property>
<label>$LOCALIZE[31136]</label>
<label2>$ADDON[script.skinshortcuts 32034]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),videosubmenu)</visible>
<onclick>action(FullScreen)</onclick>
<property name="path">action(FullScreen)</property>
<property name="list">action(FullScreen)</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<label>$LOCALIZE[31005]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3072,8 +3210,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="2">
<property name="id">$NUMBER[2]</property>
<item id="3">
<property name="id">$NUMBER[3]</property>
<label>$ADDON[script.skinshortcuts 32022]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3088,8 +3226,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="3">
<property name="id">$NUMBER[3]</property>
<item id="4">
<property name="id">$NUMBER[4]</property>
<label>$LOCALIZE[31112]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3104,8 +3242,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<item id="5">
<property name="id">$NUMBER[5]</property>
<label>$LOCALIZE[31165]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3120,8 +3258,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="5">
<property name="id">$NUMBER[5]</property>
<item id="6">
<property name="id">$NUMBER[6]</property>
<label>$LOCALIZE[342]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3136,8 +3274,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="6">
<property name="id">$NUMBER[6]</property>
<item id="7">
<property name="id">$NUMBER[7]</property>
<label>$LOCALIZE[20343]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3152,8 +3290,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="7">
<property name="id">$NUMBER[7]</property>
<item id="8">
<property name="id">$NUMBER[8]</property>
<label>$LOCALIZE[31088]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3167,8 +3305,8 @@
<property name="group">videosubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="8">
<property name="id">$NUMBER[8]</property>
<item id="9">
<property name="id">$NUMBER[9]</property>
<label>$LOCALIZE[744]</label>
<label2>$ADDON[script.skinshortcuts 32014]</label2>
<icon>DefaultAddon.png</icon>
@ -3192,7 +3330,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasAudio</visible>
<visible>Player.HasMedia</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>
@ -3334,7 +3472,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>Player.HasAudio</visible>
<visible>Player.HasMedia</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>
@ -3478,7 +3616,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasAudio] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>
@ -3620,7 +3758,7 @@
<thumb />
<property name="labelID">31136</property>
<property name="defaultID">31136</property>
<visible>[Player.HasAudio] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
<visible>[Player.HasMedia] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
<onclick>activateWindow(1103)</onclick>
<property name="path">activateWindow(1103)</property>
<property name="list">activateWindow(1103)</property>

View File

@ -25,7 +25,8 @@
[TODO]
Mini video window. Add user option: Revise player stop on return
Check user option: player stop on return (include may need work)
Needs to allow PVR content if user has not adjusted their settings.
[B]1.1.0[/B]

View File

@ -569,6 +569,10 @@ msgctxt "#31137"
msgid "Content Scraper:"
msgstr ""
msgctxt "#31138"
msgid "Stop video playing on return to menu"
msgstr ""
msgctxt "#31142"
msgid "Prioritise exit over shutdown in power menu"
msgstr ""

View File

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<shortcuts>
<shortcut>
<visible>Player.HasMedia</visible>
<label>31136</label>
<label2>32034</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>action(FullScreen)</action>
</shortcut>
<shortcut>
<label>32032</label>
<label2>32034</label2>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<shortcuts>
<shortcut>
<visible>Player.HasAudio</visible>
<visible>Player.HasMedia</visible>
<label>31136</label>
<label2>10005</label2>
<icon>DefaultAddon.png</icon>
@ -13,9 +13,9 @@
<label2>10005</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>Skin.SetString(recentitems,music)</action>
<action>Skin.SetString(recentitems,music)</action>
<action>ActivateWindow(1106)</action>
<action>control.setfocus(9998)</action>
<action>control.setfocus(9998)</action>
</shortcut>
<shortcut>
<visible>PVR.HasRadioChannels</visible>

View File

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<shortcuts>
<shortcut>
<visible>Player.HasMedia</visible>
<label>31136</label>
<label2>32034</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>action(FullScreen)</action>
</shortcut>
<shortcut>
<label>31005</label>
<label2>32014</label2>
@ -7,7 +15,7 @@
<thumb />
<action>Skin.SetString(recentitems,video)</action>
<action>ActivateWindow(1106)</action>
<action>control.setfocus(9998)</action>
<action>control.setfocus(9998)</action>
</shortcut>
<shortcut>
<visible>PVR.HasTVChannels</visible>