Prep for 1.1.0

This commit is contained in:
Chris Bevan 2017-02-19 19:11:49 +00:00
parent 4e23eae04e
commit 696c8b6ce0
24 changed files with 350 additions and 157 deletions

View File

@ -148,7 +148,7 @@
<font>
<name>itemSubTitleCondensed</name>
<filename>roboto/condensedBold.ttf</filename>
<size>30</size>
<size>26</size>
<linespacing>0.8</linespacing>
</font>
<font>

View File

@ -33,6 +33,9 @@
<control type="group">
<posx>col-1-begin</posx>
<posy>row-22-begin</posy>
<animation type="conditional" condition="player.hasaudio + !skin.hassetting(weatherdisplay)">
<effect type="slide" start="0,0" end="0,-72" tween="cubic" easing="out" time="0"/>
</animation>
<control type="label">
<posx>0</posx>
<posy>-24</posy>
@ -65,6 +68,69 @@
<label>$INFO[weather.location] [B]$INFO[weather.temperature][/B] [LOWERCASE]$INFO[weather.conditions][/LOWERCASE]</label>
</control>
</control>
<!--now playing music-->
<control type="group">
<visible>player.hasaudio</visible>
<posx>col-7-begin</posx>
<posy>row-26-begin</posy>
<control type="grouplist">
<posx>0</posx>
<posy>18</posy>
<width>12-col</width>
<align>center</align>
<itemgap>18</itemgap>
<orientation>horizontal</orientation>
<control type="image">
<visible>!player.paused + !System.Platform.Linux.RaspberryPi</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>1-col-gutter</height>
<texture>equaliser.gif</texture>
</control>
<control type="label">
<visible>!player.paused + System.Platform.Linux.RaspberryPi</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<visible>player.paused</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col-gutter</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label></label>
</control>
<control type="label">
<description>Artist</description>
<posx>0</posx>
<posy>0</posy>
<font>regular</font>
<width>auto</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<height>2-row</height>
<label>[B]$INFO[MusicPlayer.ChannelName,, ][/B]$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
<scroll>true</scroll>
<textcolor>textActive</textcolor>
<wrapmultiline>false</wrapmultiline>
</control>
</control>
</control>
<!--hidden button to reveal background-->
<control type="button" id="9999">
<posx>-500</posx>
@ -78,7 +144,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -5,7 +5,6 @@
<include file="Includes_variables.xml"/>
<include file="Includes_animations.xml"/>
<include file="Includes_hubMenu.xml"/>
<include file="Includes_hubOptions.xml"/>
<include file="Includes_hubOptionsItems.xml"/>
<include file="View_LiveTVChannels.xml"/>
<include file="View_Seasons.xml"/>
@ -70,7 +69,7 @@
</control>
<control type="label">
<posx>1-col</posx>
<posy>40</posy>
<posy>42</posy>
<width>12-col</width>
<align>right</align>
<font>pageSubTitle</font>

View File

@ -53,7 +53,7 @@
<width>col-5-begin</width>
<height>832</height>
<orientation>vertical</orientation>
<onleft>9002</onleft>
<onleft>activateWindow(1104)</onleft>
<onright>9999</onright>
<onback>activateWindow(home)</onback>
<itemlayout width="col-5-begin" height="2-row">

View File

@ -20,7 +20,7 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>31147</label>
<onclick>right</onclick>
<onclick>dialog.close(1104)</onclick>
<onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true)</onclick>
</control>
<control type="button" id="3">
@ -28,7 +28,8 @@
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>103</label>
<label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
<onclick>sendclick(videos,3)</onclick>
</control>
<control type="togglebutton" id="4">
<description>Sort direction</description>
@ -38,6 +39,7 @@
<label>31109</label>
<altlabel>31110</altlabel>
<width>6-col</width>
<onclick>sendclick(videos,4)</onclick>
</control>
<control type="button" id="505">
<description>Menu shortcuts</description>
@ -45,6 +47,7 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>31041</label>
<onclick>dialog.close(1104)</onclick>
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videosubmenu)</onclick>
</control>
<control type="button" id="508">
@ -54,6 +57,7 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>31087</label>
<onclick>dialog.close(1104)</onclick>
<onclick>ActivateWindow(TVTimerRules)</onclick>
</control>
<control type="button" id="507">
@ -61,8 +65,8 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>653</label>
<onclick>dialog.close(1104)</onclick>
<onclick>UpdateLibrary(video)</onclick>
<onclick>right</onclick>
</control>
<control type="radiobutton" id="14">
<description>Watched Toggle</description>
@ -74,6 +78,7 @@
<textureradionofocus>-</textureradionofocus>
<radiowidth/>
<radioheight/>
<onclick>sendclick(videos,14)</onclick>
</control>
<control type="radiobutton" id="11">
<description>Unlock Shares</description>
@ -99,7 +104,7 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>31147</label>
<onclick>right</onclick>
<onclick>dialog.close(1104)</onclick>
<onclick>RunScript(script.globalsearch,artists=true&amp;albums=true)</onclick>
</control>
<control type="button" id="3">
@ -107,7 +112,8 @@
<width>6-col</width>
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<label>103</label>
<label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
<onclick>sendclick(music,3)</onclick>
</control>
<control type="togglebutton" id="4">
<description>Sort direction</description>
@ -117,6 +123,7 @@
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
<onclick>sendclick(music,4)</onclick>
</control>
<control type="button" id="508">
<visible>PVR.HasRadioChannels</visible>
@ -125,6 +132,7 @@
<focusedcolor>textActive</focusedcolor>
<width>6-col</width>
<label>31087</label>
<onclick>dialog.close(1104)</onclick>
<onclick>ActivateWindow(RadioTimerRules)</onclick>
</control>
<control type="button" id="503">
@ -132,6 +140,7 @@
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<label>31041</label>
<onclick>dialog.close(1104)</onclick>
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=musicsubmenu)</onclick>
</control>
<control type="button" id="504">
@ -139,8 +148,8 @@
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<label>653</label>
<onclick>dialog.close(1104)</onclick>
<onclick>UpdateLibrary(music)</onclick>
<onclick>right</onclick>
</control>
</include>
<!--pictures submenu items-->
@ -152,6 +161,7 @@
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<label>103</label>
<onclick>sendclick(pictures,3)</onclick>
</control>
<control type="togglebutton" id="4">
<description>Sort direction</description>
@ -161,12 +171,14 @@
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
<onclick>sendclick(pictures,4)</onclick>
</control>
<control type="button" id="5">
<width>6-col</width>
<focusedcolor>textActive</focusedcolor>
<texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
<label>31041</label>
<onclick>dialog.close(1104)</onclick>
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
</control>
</include>

View File

@ -12,7 +12,8 @@
<value condition="Window.isactive(Videos) + isEmpty(container.foldername)">$LOCALIZE[31012]</value>
<value condition="Window.isactive(Music) + SubString(container.folderpath,addons://)">$LOCALIZE[31058]</value>
<value condition="Window.isactive(Music) + SubString(container.folderpath,plugin://)">$INFO[container.foldername]</value>
<value condition="Window.isactive(Music) + Container.Content(albums) + !SubString(container.folderpath,musicdb://albums)">$LOCALIZE[31037] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
<value condition="Window.isactive(Music) + Container.Content(albums)">$LOCALIZE[31037] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
<value condition="Window.isactive(Music) + Container.Content(artists)">$LOCALIZE[31024] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR]</value>
<value condition="Window.isactive(Music) + Container.Content(songs)">$LOCALIZE[31182]</value>
<value condition="Window.isactive(Music) + !container.content(genres) + SubString(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
<value condition="Window.isactive(Music) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>

View File

@ -68,7 +68,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--loading indicator-->
<include>loadingIndicator</include>
<!--debugging-->

View File

@ -74,7 +74,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -171,7 +171,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -212,7 +212,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -228,7 +228,6 @@
</control>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -65,7 +65,6 @@
</control>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--mini window-->
<include>miniVideoPlayer</include>
<!--debug-->

View File

@ -85,7 +85,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -161,7 +161,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">

View File

@ -64,7 +64,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--loading indicator-->
<include>loadingIndicator</include>
<!--debugging-->

View File

@ -13,7 +13,7 @@
</control>
<control type="label">
<posx>col-1-begin</posx>
<posy>94</posy>
<posy>96</posy>
<width>12-col</width>
<font>pageSubTitle</font>
<label>$INFO[System.Date(DDD)], $INFO[system.Date(mmm d)]</label>

View File

@ -61,7 +61,7 @@
<textcolor>66ffffff</textcolor>
<shadowcolor>-</shadowcolor>
<wrapmultiline>true</wrapmultiline>
<label>[B]$INFO[listitem.title][/B][CR]$INFO[listitem.year]</label>
<label>[B]$INFO[container.foldername][/B][CR]$INFO[listitem.title]</label>
</control>
<control type="label">
<visible>false</visible>

View File

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<includes>
<!--Hub options menu (sort order etc)-->
<include name="hubOptions">
<!--hub options-->
<window type="dialog" id="1104">
<onload>control.setfocus(9002)</onload>
<onunload>control.setfocus(9999)</onunload>
<include>fadeInOut</include>
<controls>
<control type="group">
<animation type="Conditional" condition="!controlgroup(9002).hasfocus | window.isactive(1100)">
<effect type="fade" start="100" end="0" time="300"/>
</animation>
<animation type="Conditional" condition="controlgroup(9002).hasfocus">
<effect type="fade" start="0" end="100" time="300"/>
</animation>
<control type="image">
<include>dimensionsFullscreen</include>
<texture>colors/black.png</texture>
@ -31,8 +26,6 @@
<width>6-col</width>
<height>17-row</height>
<itemgap>0</itemgap>
<onleft>control.setfocus(9999)</onleft>
<onright>control.setfocus(9999)</onright>
<include condition="[String.IsEqual(skin.string(recentitems),video) + Window.isactive(1106)] | Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
<include condition="[String.IsEqual(skin.string(recentitems),music) + Window.isactive(1106)] | Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
<include condition="window.isactive(pictures)">picturesSideMenu</include>
@ -40,5 +33,11 @@
</control>
</control>
</control>
</include>
</includes>
<!--debugging-->
<include>DebugGrid</include>
<control type="label">
<include>WindowID</include>
<label>custom_contextMenu.xml</label>
</control>
</controls>
</window>

View File

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1102">
<visible>player.hasaudio</visible>
<visible>player.hasaudio + !Window.IsActive(visualisation) + !window.isactive(home)</visible>
<controls>
<control type="group">
<posx>col-14-begin</posx>
<posx>col-12-begin</posx>
<posy>0</posy>
<visible>!Window.IsActive(visualisation)</visible>
<animation type="windowopen">
<effect type="slide" start="0,-50" end="0,0" tween="cubic" easing="out" delay="500" time="300"/>
<effect type="fade" start="0" end="100" time="500" delay="500"/>
@ -14,14 +13,14 @@
<posx>0</posx>
<posy>0</posy>
<width>8-col</width>
<height>2-row</height>
<height>54</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="image">
<visible>!player.paused + !System.Platform.Linux.RaspberryPi</visible>
<posx>12</posx>
<posy>0</posy>
<posy>-10</posy>
<width>1-col-gutter</width>
<height>1-col-gutter</height>
<texture>equaliser.gif</texture>
@ -29,7 +28,7 @@
<control type="label">
<visible>!player.paused + System.Platform.Linux.RaspberryPi</visible>
<posx>3</posx>
<posy>0</posy>
<posy>-9</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<align>center</align>
@ -42,7 +41,7 @@
<control type="label">
<visible>player.paused</visible>
<posx>3</posx>
<posy>0</posy>
<posy>-9</posy>
<width>1-col-textbox</width>
<height>2-row</height>
<align>center</align>
@ -60,13 +59,13 @@
<description>Artist</description>
<posx>1-col</posx>
<posy>0</posy>
<font>itemTitle</font>
<font>itemSubTitleCondensed</font>
<width>7-col-gutter</width>
<height>2-row</height>
<height>54</height>
<align>left</align>
<aligny>center</aligny>
<height>1-row</height>
<label>$INFO[musicplayer.Artist] - $INFO[MusicPlayer.Title]</label>
<label>[B]$INFO[MusicPlayer.ChannelName,, ][/B]$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
<scroll>true</scroll>
<textcolor>textActive</textcolor>
</control>

View File

@ -655,7 +655,6 @@
<include>miniVideoPlayer</include>
<!--hub menu-->
<include>hubMenu</include>
<include>hubOptions</include>
<!--loading indicator-->
<include>loadingIndicator</include>
<!--debugging-->

View File

@ -933,6 +933,23 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">17</property>
<label>Party mode</label>
<label2>Music</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">partymode</property>
<property name="defaultID">partymode</property>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</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>
@ -948,8 +965,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -966,8 +983,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -984,8 +1001,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -1002,8 +1019,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -1020,8 +1037,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -1038,8 +1055,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -1056,8 +1073,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[136]</label>
<label2>Music</label2>
@ -1073,8 +1090,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[31090]</label>
<label2>Music</label2>
@ -1090,8 +1107,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[744]</label>
<label2>Music</label2>
@ -1567,6 +1584,24 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31031]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31031</property>
<property name="defaultID">31031</property>
<visible>[Library.HasContent(Music)] + StringCompare(Container(9001).ListItem.Property(submenuVisibility),musicsubmenu)</visible>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31059]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
@ -1582,8 +1617,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1600,8 +1635,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1618,8 +1653,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1636,8 +1671,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1654,8 +1689,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1672,8 +1707,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1690,8 +1725,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[136]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1707,8 +1742,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31090]</label>
<label2>$LOCALIZE[10005]</label2>
@ -1724,8 +1759,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[744]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3469,6 +3504,23 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">17</property>
<label>Party mode</label>
<label2>Music</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">partymode</property>
<property name="defaultID">partymode</property>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</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>
@ -3484,8 +3536,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -3502,8 +3554,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -3520,8 +3572,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -3538,8 +3590,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -3556,8 +3608,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -3574,8 +3626,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -3592,8 +3644,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[136]</label>
<label2>Music</label2>
@ -3609,8 +3661,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[31090]</label>
<label2>Music</label2>
@ -3626,8 +3678,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[744]</label>
<label2>Music</label2>
@ -3681,6 +3733,24 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31031]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31031</property>
<property name="defaultID">31031</property>
<visible>Library.HasContent(Music)</visible>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31059]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
@ -3696,8 +3766,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3714,8 +3784,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3732,8 +3802,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3750,8 +3820,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3768,8 +3838,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3786,8 +3856,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3804,8 +3874,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[136]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3821,8 +3891,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31090]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3838,8 +3908,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[744]</label>
<label2>$LOCALIZE[10005]</label2>
@ -3895,6 +3965,23 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">17</property>
<label>Party mode</label>
<label2>Music</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">partymode</property>
<property name="defaultID">partymode</property>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</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>
@ -3910,8 +3997,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -3928,8 +4015,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[133]</label>
<label2>Music</label2>
@ -3946,8 +4033,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -3964,8 +4051,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[132]</label>
<label2>Music</label2>
@ -3982,8 +4069,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -4000,8 +4087,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[135]</label>
<label2>Music</label2>
@ -4018,8 +4105,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[136]</label>
<label2>Music</label2>
@ -4035,8 +4122,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[31090]</label>
<label2>Music</label2>
@ -4052,8 +4139,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">17</property>
<label>$LOCALIZE[744]</label>
<label2>Music</label2>
@ -4107,6 +4194,24 @@
<item id="3">
<property name="id">$NUMBER[3]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31031]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<property name="labelID">31031</property>
<property name="defaultID">31031</property>
<visible>[Library.HasContent(Music)] + StringCompare(Window(10000).Property(submenuVisibility),musicsubmenu)</visible>
<onclick condition="true">control.setfocus(9999)</onclick>
<onclick>PlayerControl(Partymode(music))</onclick>
<property name="path">PlayerControl(Partymode(music))</property>
<property name="list">PlayerControl(Partymode(music))</property>
<visible>StringCompare(System.ProfileName,Test profile)</visible>
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="4">
<property name="id">$NUMBER[4]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31059]</label>
<label2>$LOCALIZE[10005]</label2>
<icon>DefaultAddon.png</icon>
@ -4122,8 +4227,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4140,8 +4245,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[133]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4158,8 +4263,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4176,8 +4281,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[132]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4194,8 +4299,8 @@
<property name="group">musicsubmenu</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>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4212,8 +4317,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="9">
<property name="id">$NUMBER[9]</property>
<item id="10">
<property name="id">$NUMBER[10]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[135]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4230,8 +4335,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="10">
<property name="id">$NUMBER[10]</property>
<item id="11">
<property name="id">$NUMBER[11]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[136]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4247,8 +4352,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="11">
<property name="id">$NUMBER[11]</property>
<item id="12">
<property name="id">$NUMBER[12]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[31090]</label>
<label2>$LOCALIZE[10005]</label2>
@ -4264,8 +4369,8 @@
<property name="group">musicsubmenu</property>
<property name="isSubmenu">True</property>
</item>
<item id="12">
<property name="id">$NUMBER[12]</property>
<item id="13">
<property name="id">$NUMBER[13]</property>
<property name="mainmenuid">16</property>
<label>$LOCALIZE[744]</label>
<label2>$LOCALIZE[10005]</label2>

View File

@ -10,6 +10,9 @@ DONE - Reworked music fullscreen menu. Ensure closes properly on stop
DONE - add 'go to artist'
DONE - add 'go to album'
DONE - picture section fix
DONE - add party mode as default music menu item
DONE - reposition now playing box
- add check for musicfinder script to buttons when on repo

View File

@ -57,6 +57,10 @@ msgctxt "#31007"
msgid "System Info"
msgstr ""
msgctxt "#31008"
msgid "Sort by"
msgstr ""
msgctxt "#31009"
msgid "Genres"
msgstr ""
@ -117,6 +121,10 @@ msgctxt "#31023"
msgid "Notification"
msgstr ""
msgctxt "#31024"
msgid "Artists"
msgstr ""
msgctxt "#31025"
msgid "Settings"
msgstr ""
@ -141,6 +149,10 @@ msgctxt "#31030"
msgid "Humidity"
msgstr ""
msgctxt "#31031"
msgid "Play Random"
msgstr ""
msgctxt "#31032"
msgid "Visualisation"
msgstr ""

View File

@ -15,6 +15,14 @@
<thumb />
<action>ActivateWindow(1106)</action>
</shortcut>
<shortcut>
<visible>Library.HasContent(Music)</visible>
<label>31031</label>
<label2>10005</label2>
<icon>DefaultAddon.png</icon>
<thumb />
<action>PlayerControl(Partymode(music))</action>
</shortcut>
<shortcut>
<visible>PVR.HasRadioChannels</visible>
<label>31059</label>