This commit is contained in:
Chris Bevan 2015-06-04 16:41:37 +01:00
parent 7232da65d6
commit 07b9f120c5
6 changed files with 62 additions and 26 deletions

View File

@ -4,7 +4,7 @@
<controls>
<control type="group">
<posx>col-19-begin</posx>
<posy>row-4-begin</posy>
<posy>row-2-begin</posy>
<include condition="!window.isactive(progressdialog)">progressPosition1</include>
<include condition="window.isactive(progressdialog)">progressPosition2</include>
<!--<visible>!Window.IsActive(fullscreenvideo)</visible>-->

View File

@ -263,6 +263,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon1)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon1Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon1)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -273,6 +274,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon2)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon2Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon2)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -283,6 +285,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon3)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon3Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon3)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -293,6 +296,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon4)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon4Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon4)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -303,6 +307,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon5)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon5Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon5)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -313,6 +318,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon6)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon6Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon6)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -323,6 +329,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon7)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon7Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon7)],return)</onclick>
<onclick>setfocus(51)</onclick>
@ -333,6 +340,7 @@
<onclick>Skin.SetString(keepMusicMenuActive,true)</onclick>
<onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
<onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">ActivateWindow(musicfiles)</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioAddon)">RunAddon($INFO[Skin.String(customMusicAddon8)])</onclick>
<onclick condition="StringCompare(Skin.String(customMusicAddon8Type),audioPlaylist)">ActivateWindow(MusicLibrary,$INFO[Skin.String(customMusicAddon8)],return)</onclick>
<onclick>setfocus(51)</onclick>

View File

@ -79,13 +79,14 @@
<control type="label">
<right>12</right>
<posy>0</posy>
<width>6-col-gutter</width>
<width>12-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Date]$INFO[ListItem.Duration, • ,]</label>
<label>$INFO[ListItem.Date,$LOCALIZE[31192]: , ]$INFO[ListItem.Duration,(,)]</label>
</control>
</itemlayout>
<focusedlayout width="24-col" height="2-row">
@ -138,13 +139,14 @@
<control type="label">
<right>12</right>
<posy>0</posy>
<width>6-col-gutter</width>
<width>12-col</width>
<height>2-row</height>
<aligny>center</aligny>
<align>right</align>
<font>itemTitle</font>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
<label>$INFO[ListItem.Date]$INFO[ListItem.Duration, • ,]</label>
<label>$INFO[ListItem.Date,$LOCALIZE[31192]: , ]$INFO[ListItem.Duration,(,)]</label>
</control>
</focusedlayout>
</control>

View File

@ -47,14 +47,14 @@
<visible>Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false)</visible>
<animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
<control type="scrollbar" id="60">
<visible>!control.isvisible(52)</visible>
<visible>Substring(Container.folderpath,plugin)</visible>
<posx>84r</posx>
<posy>row-5-begin</posy>
<height>789</height>
<onleft>9999</onleft>
</control>
<control type="scrollbar" id="60">
<visible>control.isvisible(52)</visible>
<visible>!Substring(Container.folderpath,plugin)</visible>
<posx>84r</posx>
<posy>row-8-begin</posy>
<height>19-row</height>

View File

@ -19,39 +19,61 @@
<posy>2-row</posy>
<width>24-col</width>
<align>center</align>
<font>veryLarge</font>
<label>$INFO[Window.Property(Location)]</label>
<font>LargeStrong</font>
<label>$LOCALIZE[31212] $INFO[Window.Property(Location)]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<!--content begins-->
<control type="panel" id="9000">
<posx>-24</posx>
<posy>7-row</posy>
<posx>24</posx>
<posy>6-row</posy>
<width>24-col</width>
<height>18-row</height>
<itemlayout width="5-col-gutter" height="6-col">
<control type="image">
<posx>0</posx>
<posy>12</posy>
<width>5-col-gutter</width>
<height>6-col</height>
<aspectratio>stretch</aspectratio>
<texture>colors/black.png</texture>
<bordersize>0</bordersize>
<colordiffuse>overlay</colordiffuse>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<texture>colors/white.png</texture>
<colordiffuse>highlight</colordiffuse>
<aspectratio>stretch</aspectratio>
</control>
<control type="label">
<posx>46</posx>
<posy>56</posy>
<posx>0</posx>
<posy>0</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<align>center</align>
<aligny>center</aligny>
<font>dialogTitle</font>
<label>$INFO[ListItem.Label]</label>
<textcolor>textActive</textcolor>
<shadowcolor>-</shadowcolor>
</control>
<control type="label">
<posx>0</posx>
<posy>5-row</posy>
<width>5-col-gutter</width>
<font>symbolWeather</font>
<textcolor>textActive</textcolor>
<label>$VAR[weatherIcon]</label>
</control>
<control type="label">
<posx>0</posx>
<posy>6-row</posy>
<width>6-col-gutter</width>
<align>center</align>
<font>largeStrong</font>
<textcolor>highlight</textcolor>
<label>$INFO[ListItem.Label]</label>
</control>
<control type="textbox">
<posx>36</posx>
<posy>8-row</posy>
<posx>0</posx>
<posy>9-row</posy>
<width>5-col-gutter</width>
<height>2-row</height>
<align>center</align>
@ -61,8 +83,8 @@
<label>$INFO[ListItem.Property(Outlook)]</label>
</control>
<control type="textbox">
<posx>36</posx>
<posy>11-row</posy>
<posx>0</posx>
<posy>10-row</posy>
<width>5-col-gutter</width>
<height>1-row</height>
<align>center</align>

View File

@ -551,4 +551,8 @@ msgstr ""
msgctxt "#31211"
msgid "<Smart playlist name>"
msgstr ""
msgctxt "#31212"
msgid "5 Day Forecast for"
msgstr ""