aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authormontellese <montellese@xbmc.org>2013-07-21 13:05:43 +0200
committermontellese <montellese@xbmc.org>2013-08-02 16:07:51 +0200
commitcb531fc732d28a134120dea2049b422e39c93fc8 (patch)
tree06e2e4756d56d9d48b82233f1147b467ee1a6698 /addons
parent3d92f83b9c5db3d97faf8b327da199dae11654ad (diff)
[confluence] add "Now playing..." to sidebar player controls
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.confluence/720p/MyMusicNav.xml4
-rw-r--r--addons/skin.confluence/720p/MyVideoNav.xml4
-rw-r--r--addons/skin.confluence/720p/MyWeather.xml4
-rw-r--r--addons/skin.confluence/720p/includes.xml15
4 files changed, 20 insertions, 7 deletions
diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index d5567a608d..ad337889f2 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -56,9 +56,9 @@
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<posx>0</posx>
- <posy>110</posy>
+ <posy>60</posy>
<width>250</width>
- <height>600</height>
+ <height>650</height>
<onleft>9000</onleft>
<onright>50</onright>
<onup>9000</onup>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index 7d79e290cf..e3e0e56b01 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -60,9 +60,9 @@
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<posx>0</posx>
- <posy>110</posy>
+ <posy>60</posy>
<width>250</width>
- <height>600</height>
+ <height>650</height>
<onleft>9000</onleft>
<onright>50</onright>
<onup>9000</onup>
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index 76b66834a5..40943b9099 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -723,9 +723,9 @@
<include>SideBladeLeft</include>
<control type="grouplist" id="9000">
<posx>0</posx>
- <posy>110</posy>
+ <posy>60</posy>
<width>250</width>
- <height>610</height>
+ <height>650</height>
<onleft>9000</onleft>
<onright>50</onright>
<onup>9000</onup>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index d886a0bd1c..1885ddb87f 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -28,6 +28,10 @@
<value condition="!IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
<value condition="IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value>
</variable>
+ <variable name="PlayList">
+ <value condition="Player.HasVideo">ActivateWindow(videoplaylist)</value>
+ <value condition="Player.HasAudio">ActivateWindow(musicplaylist)</value>
+ </variable>
<include name="BehindDialogFadeOut">
<control type="image">
@@ -148,7 +152,7 @@
<control type="image">
<description>LOGO</description>
<posx>15</posx>
- <posy>50</posy>
+ <posy>0</posy>
<width>220</width>
<height>80</height>
<aspectratio>keep</aspectratio>
@@ -887,6 +891,15 @@
<textureradionofocus>GoFullscreen.png</textureradionofocus>
<visible>Player.HasMedia</visible>
</control>
+ <control type="button" id="612">
+ <description>Go to playlist</description>
+ <include>ButtonCommonValues</include>
+ <label>13350</label>
+ <onclick>$VAR[PlayList]</onclick>
+ <visible>Player.HasMedia</visible>
+ <visible>!VideoPlayer.Content(LiveTV)</visible>
+ <visible>!Window.IsVisible(MusicPlaylist) + !Window.IsVisible(VideoPlaylist)</visible>
+ </control>
</include>
<include name="ScrollOffsetLabel">
<control type="group">