Merge pull request #3017 from Montellese/context_menu_cleanup

context menu: cleanup & initial reorganisation

5 files changed, 64 insertions, 22 deletions

diff --git a/addons/skin.confluence/720p/MyMusicNav.xml b/addons/skin.confluence/720p/MyMusicNav.xml
index 41c69952cc..193f99418a 100644
--- a/addons/skin.confluence/720p/MyMusicNav.xml
+++ b/addons/skin.confluence/720p/MyMusicNav.xml
@@ -57,9 +57,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>
@@ -109,7 +109,7 @@
 					<include>ButtonCommonValues</include>
 					<label>587</label>
 				</control>
-				<control type="radiobutton" id="20">
+				<control type="radiobutton" id="98">
 					<visible>Container.CanFilterAdvanced</visible>
 					<description>Filter</description>
 					<include>ButtonCommonValues</include>
@@ -146,6 +146,24 @@
 					<label>589</label>
 					<include>ButtonCommonValues</include>
 				</control>
+				<control type="label" id="203">
+					<width>250</width>
+					<height>35</height>
+					<font>font12</font>
+					<label>31039</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
+				<control type="togglebutton" id="20">
+					<description>Update library</description>
+					<include>ButtonCommonValues</include>
+					<label>653</label>
+					<altlabel>13353</altlabel>
+					<alttexturefocus border="5">button-focus.png</alttexturefocus>
+					<alttexturenofocus>-</alttexturenofocus>
+					<usealttexture>library.isscanningvideo</usealttexture>
+				</control>
 				<include>CommonNowPlaying_Controls</include>
 			</control>
 		</control>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index af4c338f85..52acab4d03 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -61,9 +61,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>
@@ -106,7 +106,7 @@
 					<include>ButtonCommonValues</include>
 					<label>587</label>
 				</control>
-				<control type="radiobutton" id="20">
+				<control type="radiobutton" id="98">
 					<visible>Container.CanFilterAdvanced</visible>
 					<description>Filter</description>
 					<include>ButtonCommonValues</include>
@@ -144,18 +144,6 @@
 					<include>ButtonCommonValues</include>
 					<label>137</label>
 				</control>
-				<control type="radiobutton" id="7">
-					<description>Stack Toggle</description>
-					<textwidth>170</textwidth>
-					<include>ButtonCommonValues</include>
-					<label>346</label>
-				</control>
-				<control type="radiobutton" id="17">
-					<description>Flatten</description>
-					<textwidth>170</textwidth>
-					<include>ButtonCommonValues</include>
-					<label>20411</label>
-				</control>
 				<control type="radiobutton" id="16">
 					<description>PartyMode</description>
 					<label>589</label>
@@ -171,6 +159,24 @@
 					<selected>system.ismaster</selected>
 					<visible>system.haslocks</visible>
 				</control>
+				<control type="label" id="203">
+					<width>250</width>
+					<height>35</height>
+					<font>font12</font>
+					<label>31039</label>
+					<textcolor>blue</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+				</control>
+				<control type="togglebutton" id="20">
+					<description>Update library</description>
+					<include>ButtonCommonValues</include>
+					<label>653</label>
+					<altlabel>13353</altlabel>
+					<alttexturefocus border="5">button-focus.png</alttexturefocus>
+					<alttexturenofocus>-</alttexturenofocus>
+					<usealttexture>library.isscanningvideo</usealttexture>
+				</control>
 				<include>CommonNowPlaying_Controls</include>
 			</control>
 		</control>
diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index e8997170a8..75d2550f36 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -724,9 +724,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 2a412c6b89..c5be31437a 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -29,6 +29,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">
@@ -149,7 +153,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>
@@ -888,6 +892,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">
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po
index b903155bf8..bf121efb86 100644
--- a/addons/skin.confluence/language/English/strings.po
+++ b/addons/skin.confluence/language/English/strings.po
@@ -102,7 +102,12 @@ msgctxt "#31033"
 msgid "Info"
 msgstr ""
 
-#empty strings from id 31034 to 31039
+#empty strings from id 31034 to 31038
+
+msgctxt "#31039"
+msgid "Actions"
+msgstr ""
+
 #Extra labels
 
 msgctxt "#31040"