This commit is contained in:
theDeadMan 2017-09-25 19:28:26 +01:00
parent 840c0c1487
commit 65117d6778
6 changed files with 293 additions and 334 deletions

View File

@ -17,7 +17,7 @@
<width>8-col-gutter</width>
<height>2-row</height>
<wrapmultiline>true</wrapmultiline>
<font>itemTitle</font>
<font>pageTitle</font>
<textcolor>textActive</textcolor>
</control>
<control type="textbox" id="9">

View File

@ -26,7 +26,7 @@
<value condition="Window.isactive(RadioChannels)">$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
<value condition="Window.isactive(programs)">$LOCALIZE[10506]</value>
<value condition="Window.isactive(playlists)">$LOCALIZE[31123]</value>
<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$LOCALIZE[31123]</value>
</variable>
<variable name="listSubTitle">
<value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
@ -35,7 +35,7 @@
<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
<value condition="Window.isactive(TVRecordings)">$INFO[container.numitems] $LOCALIZE[31165]</value>
<value condition="Window.isactive(programs)">$INFO[container.Numitems,, $LOCALIZE[31145]]</value>
<value condition="Window.isactive(playlists)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
<value condition="Window.isactive(musicplaylist) | Window.isactive(videoplaylist)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
</variable>
<!--list view item detail / subheader-->
<variable name="itemDetail">

View File

@ -73,6 +73,7 @@
<onleft>9000</onleft>
<onback>9000</onback>
<orientation>horizontal</orientation>
<onclick>activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid])</onclick>
<itemlayout width="586" height="5-col-gutter">
<control type="image">
<posx>0</posx>

View File

@ -8,9 +8,6 @@
<control type="group">
<include>fadeInOut</include>
<control type="group">
<animation type="Conditional" condition="window.isactive(1105)">
<effect type="slide" start="0,0" end="-100,0" tween="sine" time="300"/>
</animation>
<!--fanart-->
<control type="image">
<visible>isempty(Window(Visualisation).Property(ArtistSlideshow))</visible>
@ -48,12 +45,6 @@
<control type="group">
<posx>col-1-begin</posx>
<posy>row-23-begin</posy>
<animation type="Conditional" condition="window.isactive(1105)">
<effect type="slide" start="0,0" end="0,500" tween="sine" time="400"/>
</animation>
<animation type="conditional" condition="!StringCompare(MusicPlayer.Time,00:00)">
<effect type="slide" start="0,500" end="0,0" tween="sine" time="400"/>
</animation>
<!--coverart (or channel art if radio)-->
<control type="image">
<posx>0</posx>

View File

@ -1,341 +1,310 @@
<?xml version="1.0" encoding="UTF-8"?>
<window type="dialog" id="1105">
<defaultcontrol always="true">8001</defaultcontrol>
<include>fadeInOut</include>
<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>
<posx>0</posx>
<posy>0</posy>
<animation type="Windowopen">
<effect type="fade" start="0" end="100" time="300" delay="100"/>
<effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="100"/>
</animation>
<animation type="windowClose">
<effect type="fade" start="100" end="0" time="350"/>
<effect type="slide" start="0" end="900" tween="cubic" easing="out" time="400"/>
</animation>
<!--overlay-->
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>10-col</width>
<height>fullscreenHeight</height>
<include>fullscreenDimensions</include>
<texture>colors/black.png</texture>
<colordiffuse>cc111111</colordiffuse>
<colordiffuse>e9FFFFFF</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="image">
<posx>-6</posx>
<posy>0</posy>
<width>6</width>
<height>fullscreenHeight</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<!--thumbnail-->
<control type="image">
<posx>27</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>27</posx>
<posy>384</posy>
<width>6-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<ondown>8002</ondown>
<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>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout 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/white.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<description>Previous</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(previous)</onclick>
</item>
<item>
<description>Rewind</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(rewind)</onclick>
</item>
<item>
<description>Stop</description>
<label2></label2>
<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>
<description>Play/Pause</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<visible>Player.Paused</visible>
<description>Pause</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<description>Fast forward</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(forward)</onclick>
</item>
<item>
<description>Next Chapter</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(next)</onclick>
</item>
</content>
</control>
<!--Star rating-->
<control type="group">
<posx>24</posx>
<posy>14-row</posy>
<control type="image">
<visible>control.hasfocus(8002)</visible>
<control type="group">
<include>modalDialogInOut</include>
<posx>col-10-begin</posx>
<posy>row-7-begin</posy>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<width>6-col</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
<posy>2-row</posy>
<width>6-col</width>
<height>16-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="button" id="8002">
<posx>1-col</posx>
<posy>0</posy>
<height>2-row</height>
<width>5-col</width>
<font>symbolLarge</font>
<textoffsetx>12</textoffsetx>
<label>$VAR[starRating]</label>
<onup>8001</onup>
<ondown>control.setfocus(8003,0)</ondown>
<onleft>decreaserating</onleft>
<onright>increaserating</onright>
<onclick>noop</onclick>
</control>
</control>
<!--final options-->
<control type="panel" id="8003">
<posx>24</posx>
<posy>16-row</posy>
<width>429</width>
<height>14-row</height>
<orientation>vertical</orientation>
<onup>8002</onup>
<ondown>Control.SetFocus(8001,3)</ondown>
<itemlayout width="6-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="6-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/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>eeffffff</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</focusedlayout>
<content>
<item>
<description>go to artist</description>
<label>31155</label>
<label2></label2>
<thumb>-</thumb>
<onclick condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">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 condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Runscript(script.musicfinder,action=album,title=$INFO[musicplayer.album],listid=50)</onclick>
</item>
<item>
<description>Playlist</description>
<label>31123</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>action(back)</onclick>
<onclick>activateWindow(musicplaylist)</onclick>
</item>
<item>
<description>Repeat</description>
<label>$VAR[repeatState]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(Repeat)</onclick>
</item>
<item>
<description>Shuffle</description>
<label>$VAR[shuffleState]</label>
<label2></label2>
<thumb>-</thumb>
<onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
<onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
</item>
<item>
<description>Visualisation</description>
<label>31032</label>
<label2></label2>
<thumb>-</thumb>
<onclick>activateWindow(musicOSD)</onclick>
</item>
<item>
<visible>Visualisation.HasPresets</visible>
<description>Visualisation Settings</description>
<label>$LOCALIZE[21417]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
</item>
</content>
</control>
<!--player controls-->
<control type="panel" id="8001">
<posx>0</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<itemgap>0</itemgap>
<ondown>8002</ondown>
<onup>Control.SetFocus(8003,4)</onup>
<orientation>horizontal</orientation>
<itemlayout width="1-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
</itemlayout>
<focusedlayout width="1-col" height="2-row">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>69</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
</focusedlayout>
<content>
<item>
<description>Previous</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(previous)</onclick>
</item>
<item>
<description>Rewind</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(rewind)</onclick>
</item>
<item>
<description>Stop</description>
<label2></label2>
<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>
<description>Play/Pause</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<visible>Player.Paused</visible>
<description>Pause</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(play)</onclick>
</item>
<item>
<description>Fast forward</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(forward)</onclick>
</item>
<item>
<description>Next Chapter</description>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(next)</onclick>
</item>
</content>
</control>
<!--Star rating-->
<control type="group">
<posx>0</posx>
<posy>2-row</posy>
<control type="image">
<visible>control.hasfocus(8002)</visible>
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label></label>
</control>
<control type="button" id="8002">
<posx>1-col</posx>
<posy>0</posy>
<height>2-row</height>
<width>5-col</width>
<font>symbolLarge</font>
<textoffsetx>12</textoffsetx>
<label>$VAR[starRating]</label>
<onup>8001</onup>
<ondown>control.setfocus(8003,0)</ondown>
<onleft>decreaserating</onleft>
<onright>increaserating</onright>
<onclick>noop</onclick>
</control>
</control>
<!--final options-->
<control type="panel" id="8003">
<posx>0</posx>
<posy>4-row</posy>
<width>429</width>
<height>14-row</height>
<orientation>vertical</orientation>
<onup>8002</onup>
<ondown>Control.SetFocus(8001,3)</ondown>
<itemlayout width="6-col" height="2-row">
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</itemlayout>
<focusedlayout width="6-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/white.png</texture>
<colordiffuse>highlight</colordiffuse>
</control>
<control type="image">
<posx>1-col</posx>
<posy>0</posy>
<width>6-col</width>
<height>2-row</height>
<aspectratio>stretch</aspectratio>
<texture>colors/white.png</texture>
<colordiffuse>eeffffff</colordiffuse>
</control>
<control type="label">
<posx>0</posx>
<posy>0</posy>
<width>1-col</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>symbolLarge</font>
<textcolor>textActive</textcolor>
<label>$INFO[ListItem.label2]</label>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>1-col-indent</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<aligny>center</aligny>
<font>buttonTitle</font>
<textcolor>black</textcolor>
<label>$INFO[ListItem.label]</label>
</control>
</focusedlayout>
<content>
<item>
<description>go to artist</description>
<label>31155</label>
<label2></label2>
<thumb>-</thumb>
<onclick condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">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 condition="!System.hasAddon(script.musicfinder)">InstallAddon(script.musicfinder)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Dialog.Close(all,true)</onclick>
<onclick condition="System.hasAddon(script.musicfinder)">Runscript(script.musicfinder,action=album,title=$INFO[musicplayer.album],listid=50)</onclick>
</item>
<item>
<description>Playlist</description>
<label>31123</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Dialog.Close(all,true)</onclick>
<onclick>action(back)</onclick>
<onclick>activateWindow(musicplaylist)</onclick>
</item>
<item>
<description>Repeat</description>
<label>$VAR[repeatState]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>PlayerControl(Repeat)</onclick>
</item>
<item>
<description>Shuffle</description>
<label>$VAR[shuffleState]</label>
<label2></label2>
<thumb>-</thumb>
<onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
<onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
</item>
<item>
<description>Visualisation</description>
<label>31032</label>
<label2></label2>
<thumb>-</thumb>
<onclick>activateWindow(musicOSD)</onclick>
</item>
<item>
<visible>Visualisation.HasPresets</visible>
<description>Visualisation Settings</description>
<label>$LOCALIZE[21417]</label>
<label2></label2>
<thumb>-</thumb>
<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
</item>
</content>
</control>
</control>
</control>
<!--debugging-->
<include>DebugGrid</include>

View File

@ -2,11 +2,9 @@
***TESTING BRANCH***
DONE - set ondown in movie view etc to select first item in grid
- recent tvshow episode listing not working
DONE - recent tvshow episode listing not working
DONE - Add progress bar to resumable content
- playlist titles not working. (See Github for random label)
DONE - playlist titles not working. (See Github for random label)
[V1.2.4]
- [UPDATED] French language file