This commit is contained in:
Chris Bevan 2017-02-16 19:04:05 +00:00
parent 653ff1f4f7
commit dc318b106a
7 changed files with 57 additions and 19 deletions

View File

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

View File

@ -84,7 +84,7 @@
<!--menu logos-->
<variable name="menuLogo">
<value condition="window.isactive(pictures)"></value>
<value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),music)] | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers)"></value>
<value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),video)] | window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers)"></value>
<value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),music)] | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist)"></value>
<value condition="[window.isactive(1106) + String.IsEqual(skin.string(recentitems),video)] | window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers) | window.isactive(videoplaylist)"></value>
</variable>
</includes>

View File

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

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1101">
<onload>Dialog.Close(1103,true)</onload>
<onload>Dialog.Close(1103)</onload>
<visible>Window.IsActive(1103) + !player.hasaudio</visible>
<controls></controls>
</window>

View File

@ -4,7 +4,7 @@
<controls>
<!-- options menu-->
<control type="group">
<posx>1390</posx>
<posx>1438</posx>
<posy>0</posy>
<animation type="Windowopen">
<effect type="fade" start="0" end="100" time="300" delay="100"/>
@ -35,18 +35,18 @@
</control>
<!--thumbnail-->
<control type="image">
<posx>66</posx>
<posy>66</posy>
<width>6-col-gutter</width>
<height>6-col-gutter</height>
<posx>24</posx>
<posy>24</posy>
<width>6-col</width>
<height>6-col</height>
<texture fallback="DefaultAlbumCover.png">$INFO[MusicPlayer.Cover]</texture>
<colordiffuse>ffffffff</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--player controls-->
<control type="panel" id="8001">
<posx>54</posx>
<posy>15-row</posy>
<posx>24</posx>
<posy>384</posy>
<width>6-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
@ -54,6 +54,15 @@
<onup>Control.SetFocus(8003,4)</onup>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>textboxInactive</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
@ -107,6 +116,7 @@
<thumb>-</thumb>
<onclick>PlayerControl(stop)</onclick>
<onclick>Dialog.Close(1105)</onclick>
<onclick>Dialog.Close(1103)</onclick>
</item>
<item>
<visible>Player.Playing | player.forwarding | player.rewinding</visible>
@ -138,8 +148,8 @@
</control>
<!--Star rating-->
<control type="group">
<posx>54</posx>
<posy>18-row</posy>
<posx>24</posx>
<posy>14-row</posy>
<control type="image">
<visible>control.hasfocus(8002)</visible>
<posx>0</posx>
@ -178,10 +188,10 @@
</control>
<!--final options-->
<control type="panel" id="8003">
<posx>54</posx>
<posy>20-row</posy>
<posx>24</posx>
<posy>16-row</posy>
<width>429</width>
<height>10-row</height>
<height>14-row</height>
<orientation>vertical</orientation>
<onup>8002</onup>
<ondown>Control.SetFocus(8001,3)</ondown>
@ -251,6 +261,22 @@
</control>
</focusedlayout>
<content>
<item>
<description>go to artist</description>
<label>31155</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>Runscript(script.musicfinder,action=artist,title=$INFO[musicplayer.artist],listid=50)</onclick>
</item>
<item>
<description>go to album</description>
<label>31158</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>Runscript(script.musicfinder,action=album,title=$INFO[musicplayer.album],listid=50)</onclick>
</item>
<item>
<description>Playlist</description>
<label>31123</label>

View File

@ -6,10 +6,14 @@ DONE - pvr info screen rework (header - 2 column mode)
DONE - Add user options for menu customisation to skin settings
DONE - album default art fix
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'
- picture section fix
- add check for musicfinder script to buttons when on repo
DONE - Reworked music fullscreen menu. Ensure closes properly on stop
[V1.0.4]
- Minor tweaks and bug fixes

View File

@ -645,6 +645,10 @@ msgctxt "#31154"
msgid "Search for Subtitles"
msgstr ""
msgctxt "#31155"
msgid "Go to Artist"
msgstr ""
msgctxt "#31156"
msgid "Games"
msgstr ""
@ -653,6 +657,10 @@ msgctxt "#31157"
msgid "Home: Hide Games"
msgstr ""
msgctxt "#31158"
msgid "Go to Album"
msgstr ""
msgctxt "#31159"
msgid "Unknown"
msgstr ""