From 29ab7775e5d75d7c52dc9d72fced610f44ed0e57 Mon Sep 17 00:00:00 2001
From: ronie <ronie@poedel.net>
Date: Fri, 30 Jan 2015 23:34:51 +0100
Subject: [Confluence] use grouplist in MusicOSD

---
 addons/skin.confluence/720p/MusicOSD.xml | 225 +++++++++++--------------------
 1 file changed, 80 insertions(+), 145 deletions(-)

diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index 86aab2bd28..ce6f4e5884 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -42,44 +42,34 @@
 			<animation effect="fade" time="200">VisibleChange</animation>
 			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
 		</control>
-		<control type="group" id="100">
+		<control type="grouplist" id="100">
 			<left>325</left>
 			<top>60r</top>
+			<onup>1000</onup>
+			<ondown>1000</ondown>
+			<orientation>horizontal</orientation>
+			<itemgap>0</itemgap>
 			<animation effect="fade" time="200">VisibleChange</animation>
 			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
 			<control type="button" id="600">
-				<left>0</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>210</label>
 				<font>-</font>
 				<texturefocus>OSDPrevTrackFO.png</texturefocus>
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
-				<onleft>704</onleft>
-				<onright>601</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Previous)</onclick>
 			</control>
 			<control type="button" id="601">
-				<left>55</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31354</label>
 				<font>-</font>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
-				<onleft>600</onleft>
-				<onright>602</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Rewind)</onclick>
 			</control>
 			<control type="togglebutton" id="602">
-				<left>110</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31351</label>
@@ -90,129 +80,109 @@
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
 				<alttexturefocus>OSDPlayFO.png</alttexturefocus>
 				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
-				<onleft>601</onleft>
-				<onright>603</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Play)</onclick>
 			</control>
 			<control type="button" id="603">
-				<left>165</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31352</label>
 				<font>-</font>
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
-				<onleft>602</onleft>
-				<onright>604</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Stop)</onclick>
 			</control>
 			<control type="button" id="604">
-				<left>220</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31353</label>
 				<font>-</font>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
-				<onleft>603</onleft>
-				<onright>605</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Forward)</onclick>
 			</control>
 			<control type="button" id="605">
-				<left>275</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
 				<font>-</font>
 				<texturefocus>OSDNextTrackFO.png</texturefocus>
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
-				<onleft>604</onleft>
-				<onright>606</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(Next)</onclick>
 			</control>
-			<control type="button" id="606">
-				<left>330</left>
-				<top>0</top>
+			<control type="group" id="699">
 				<width>55</width>
 				<height>55</height>
-				<label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label>
-				<font>-</font>
-				<texturefocus>-</texturefocus>
-				<texturenofocus>-</texturenofocus>
-				<onclick>PlayerControl(Repeat)</onclick>
-				<onleft>605</onleft>
-				<onright>607</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatNF.png</texture>
-				<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
-				<visible>!Control.HasFocus(606)</visible>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatFO.png</texture>
-				<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
-				<visible>Control.HasFocus(606)</visible>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatOneNF.png</texture>
-				<visible>Playlist.IsRepeatOne</visible>
-				<visible>!Control.HasFocus(606)</visible>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatOneFO.png</texture>
-				<visible>Playlist.IsRepeatOne</visible>
-				<visible>Control.HasFocus(606)</visible>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatAllNF.png</texture>
-				<visible>Playlist.IsRepeat</visible>
-				<visible>!Control.HasFocus(606)</visible>
-			</control>
-			<control type="image">
-				<left>330</left>
-				<top>0</top>
-				<width>55</width>
-				<height>55</height>
-				<texture>OSDRepeatAllFO.png</texture>
-				<visible>Playlist.IsRepeat</visible>
-				<visible>Control.HasFocus(606)</visible>
+				<control type="button" id="606">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label>
+					<font>-</font>
+					<texturefocus>-</texturefocus>
+					<texturenofocus>-</texturenofocus>
+					<onleft>605</onleft>
+					<onright>607</onright>
+					<onup>1000</onup>
+					<ondown>1000</ondown>
+					<onclick>PlayerControl(Repeat)</onclick>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatNF.png</texture>
+					<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
+					<visible>!Control.HasFocus(606)</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatFO.png</texture>
+					<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
+					<visible>Control.HasFocus(606)</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatOneNF.png</texture>
+					<visible>Playlist.IsRepeatOne</visible>
+					<visible>!Control.HasFocus(606)</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatOneFO.png</texture>
+					<visible>Playlist.IsRepeatOne</visible>
+					<visible>Control.HasFocus(606)</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatAllNF.png</texture>
+					<visible>Playlist.IsRepeat</visible>
+					<visible>!Control.HasFocus(606)</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>55</width>
+					<height>55</height>
+					<texture>OSDRepeatAllFO.png</texture>
+					<visible>Playlist.IsRepeat</visible>
+					<visible>Control.HasFocus(606)</visible>
+				</control>
 			</control>
 			<control type="togglebutton" id="607">
-				<left>385</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label>
@@ -223,20 +193,13 @@
 				<alttexturefocus>OSDRandomOnFO.png</alttexturefocus>
 				<alttexturenofocus>OSDRandomOnNF.png</alttexturenofocus>
 				<onclick>PlayerControl(Random)</onclick>
-				<onleft>606</onleft>
-				<onright>701</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 			</control>
-		</control>
-		<control type="group">
-			<left>300r</left>
-			<top>60r</top>
-			<animation effect="fade" time="200">VisibleChange</animation>
-			<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<control type="image" id="2300">
+				<width>215</width>
+				<height>55</height>
+				<texture>-</texture>
+			</control>
 			<control type="togglebutton" id="701">
-				<left>0</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31128</label>
@@ -245,10 +208,6 @@
 				<texturenofocus>OSDLyricsNF.png</texturenofocus>
 				<alttexturefocus>OSDLyricsFO.png</alttexturefocus>
 				<alttexturenofocus>OSDLyricsNF.png</alttexturenofocus>
-				<onleft>607</onleft>
-				<onright>500</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>Close</onclick>
 				<onclick>RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
 				<altclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</altclick>
@@ -257,62 +216,38 @@
 				<usealttexture>IsEmpty(Skin.String(LyricScript_Path))</usealttexture>
 			</control>
 			<control type="button" id="500">
-				<left>55</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>12006</label>
 				<font>-</font>
 				<texturefocus>OSDVizFO.png</texturefocus>
 				<texturenofocus>OSDVizNF.png</texturenofocus>
-				<onleft>701</onleft>
-				<onright>702</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 			</control>
 			<control type="button" id="702">
-				<left>110</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[250] $LOCALIZE[21417]</label>
 				<font>-</font>
 				<texturefocus>OSDPresetSettingsFO.png</texturefocus>
 				<texturenofocus>OSDPresetSettingsNF.png</texturenofocus>
-				<onleft>500</onleft>
-				<onright>703</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
 			</control>
 			<control type="button" id="703">
-				<left>165</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>31048</label>
 				<font>-</font>
 				<texturefocus>OSDPreFO.png</texturefocus>
 				<texturenofocus>OSDPreNF.png</texturenofocus>
-				<onleft>702</onleft>
-				<onright>704</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>ActivateWindow(122)</onclick>
 			</control>
 			<control type="button" id="704">
-				<left>220</left>
-				<top>0</top>
 				<width>55</width>
 				<height>55</height>
 				<label>264</label>
 				<font>-</font>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-				<onleft>703</onleft>
-				<onright>600</onright>
-				<onup>1000</onup>
-				<ondown>1000</ondown>
 				<onclick>PlayerControl(record)</onclick>
 				<enable>Player.CanRecord</enable>
 				<animation effect="fade" start="100" end="50" time="100" condition="!Player.CanRecord">Conditional</animation>
-- 
cgit v1.2.3