Changed: [Confluence] Simplified the fullscreen info and OSD's

1 files changed, 172 insertions, 212 deletions

diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index 648e0de7c0..a647d31c91 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -1,284 +1,244 @@
-<window id="2006">
+<window id="2006">
 	<defaultcontrol>-</defaultcontrol>
 	<allowoverlay>no</allowoverlay>
 	<controls>
-		<control type="visualisation" id="2">
+		<control type="visualisation">
 			<description>visualisation</description>
 			<posx>0</posx>
 			<posy>0</posy>
 			<width>1280</width>
 			<height>720</height>
-<!--			<visible>IsEmpty(MusicPlayer.Property(Fanart_Image)</visible>
 		</control>
-		<control type="image">
-			<description>Fanart image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>1280</width>
-			<height>720</height>
-			<texture>$INFO[MusicPlayer.Property(Fanart_Image)]</texture>
-			<visible>!IsEmpty(MusicPlayer.Property(Fanart_Image))</visible>
--->		</control>
-
+		<!-- media infos -->
 		<control type="group">
-			<visible>Player.ShowInfo + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(MusicOSD)]</visible>
-			<animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">WindowClose</animation>
-			<animation effect="fade" start="0" end="100" time="300" tween="quadratic" easing="out">visible</animation>
-			<animation effect="fade" start="100" end="0" time="300" delay="150" tween="quadratic" easing="out">hidden</animation>
+			<animation effect="fade" time="200">VisibleChange</animation>
+			<visible>[Player.ShowInfo | Window.IsActive(MusicOSD)] + ![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList)]</visible>
 			<control type="image">
-				<description>media info background image</description>
 				<posx>0</posx>
-				<posy>270r</posy>
+				<posy>-150</posy>
 				<width>1280</width>
-				<height>270</height>
-				<texture>HomeNowPlayingBack.png</texture>
+				<height>256</height>
+				<texture flipy="true">HomeNowPlayingBack.png</texture>
+			</control>
+			<control type="label">
+				<description>Partymode Header label</description>
+				<posx>30</posx>
+				<posy>5</posy>
+				<width>800</width>
+				<height>25</height>
+				<align>left</align>
+				<aligny>center</aligny>
+				<font>font13</font>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<label>$LOCALIZE[589]</label>
+				<visible>MusicPartyMode.Enabled</visible>
+			</control>
+			<control type="label">
+				<description>Normal Header label</description>
+				<posx>30</posx>
+				<posy>5</posy>
+				<width>800</width>
+				<height>25</height>
+				<align>left</align>
+				<aligny>center</aligny>
+				<font>font13</font>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<label>$INFO[musicplayer.Playlistposition,$LOCALIZE[554]: ]$INFO[musicplayer.Playlistlength, / ]</label>
+				<visible>!MusicPartyMode.Enabled</visible>
+			</control>
+			<control type="label">
+				<description>Clock label</description>
+				<posx>1250</posx>
+				<posy>5</posy>
+				<width>800</width>
+				<height>25</height>
+				<align>right</align>
+				<aligny>center</aligny>
+				<font>font13</font>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<label>$INFO[System.Time]</label>
 			</control>
 			<control type="image">
-				<description>media info background image</description>
 				<posx>0</posx>
-				<posy>270r</posy>
+				<posy>230r</posy>
 				<width>1280</width>
-				<height>270</height>
-				<colordiffuse>88FFFFFF</colordiffuse>
+				<height>230</height>
 				<texture>HomeNowPlayingBack.png</texture>
 			</control>
 			<control type="image">
 				<description>cover image</description>
-				<posx>10</posx>
-				<posy>290r</posy>
-				<width>340</width>
-				<height>260</height>
-				<fadetime>200</fadetime>
-				<texture background="true">$INFO[MusicPlayer.cover]</texture>
+				<posx>20</posx>
+				<posy>250r</posy>
+				<width>300</width>
+				<height>230</height>
+				<info>MusicPlayer.Cover</info>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
-				<bordersize>8</bordersize>
-			</control>
-			<control type="progress">
-				<description>Progressbar</description>
-				<posx>10</posx>
-				<posy>30r</posy>
-				<width>340</width>
-				<height>14</height>
-				<info>Player.Progress</info>
+				<bordertexture border="19,3,19,3">thumb-border.png</bordertexture>
+				<bordersize>17,1,17,1</bordersize>
 			</control>
 			<control type="group">
-				<posx>370</posx>
-				<posy>180r</posy>
-				<control type="grouplist">
-					<description>Media Codec Flagging Images</description>
-					<posx>340</posx>
+				<posx>330</posx>
+				<posy>175r</posy>
+				<control type="label" id="1">
+					<description>Heading label</description>
+					<posx>0</posx>
 					<posy>0</posy>
-					<width>550</width>
-					<align>right</align>
-					<itemgap>0</itemgap>
+					<width>910</width>
+					<height>25</height>
+					<align>left</align>
+					<font>font13</font>
+					<label>$LOCALIZE[31040]</label>
+					<textcolor>white</textcolor>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="label" id="1">
+					<description>Artist label</description>
+					<posx>20</posx>
+					<posy>30</posy>
+					<width>910</width>
+					<height>25</height>
+					<align>left</align>
+					<font>font12</font>
+					<label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label>
+					<textcolor>grey2</textcolor>
+					<shadowcolor>black</shadowcolor>
+				</control>
+				<control type="grouplist">
+					<posx>20</posx>
+					<posy>60</posy>
+					<width>910</width>
+					<height>35</height>
+					<itemgap>5</itemgap>
 					<orientation>horizontal</orientation>
-					<control type="image">
-						<description>Rating image</description>
-						<width>120</width>
-						<height>40</height>
-						<aspectratio align="right">keep</aspectratio>
-						<texture>LeftRating/$INFO[Player.StarRating]</texture>
+					<control type="label">
+						<width min="10" max="710">auto</width>
+						<height>30</height>
+						<font>font30</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[MusicPlayer.Title]</label>
+						<textcolor>orange</textcolor>
+						<scroll>true</scroll>
 					</control>
 					<control type="image">
-						<description>Codec Image</description>
-						<width>80</width>
-						<height>40</height>
-						<aspectratio>keep</aspectratio>
+						<description>Audio Codec Image</description>
+						<width>90</width>
+						<height>35</height>
+						<aspectratio align="right">keep</aspectratio>
 						<texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
 					</control>
 					<control type="image">
-						<description>Channels Image</description>
-						<width>80</width>
-						<height>40</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[MusicPlayer.Channels,flagging/audio/,.png]</texture>
+						<description>Rating</description>
+						<width>110</width>
+						<height>35</height>
+						<aspectratio align="center">keep</aspectratio>
+						<texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,LeftRating/]</texture>
 					</control>
 				</control>
 				<control type="label">
-					<description>Playing Label</description>
 					<posx>0</posx>
-					<posy>0</posy>
-					<width>500</width>
+					<posy>120</posy>
+					<width>910</width>
 					<height>25</height>
-					<align>left</align>
+					<label>$LOCALIZE[209]: $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
+					<align>center</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
-					<textcolor>blue</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<label>31040</label>
-				</control>
-				<control type="label">
-					<posx>10</posx>
-					<posy>35</posy>
-					<width>880</width>
-					<height>30</height>
-					<label>$INFO[MusicPlayer.Artist]$INFO[MusicPlayer.Album, - ]</label>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font13</font>
+					<font>font12</font>
 					<textcolor>grey</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<posx>10</posx>
-					<posy>65</posy>
-					<width>880</width>
-					<height>30</height>
-					<label>$INFO[MusicPlayer.Title]</label>
 					<scroll>true</scroll>
-					<align>left</align>
-					<aligny>center</aligny>
-					<font>font24_title</font>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
+					<visible>MusicPlayer.HasNext + !Window.IsVisible(MusicOSD)</visible>
+					<animation effect="fade" time="200">VisibleChange</animation>
 				</control>
+			</control>
+			<control type="group">
+				<posx>330</posx>
+				<posy>85r</posy>
 				<control type="label">
 					<posx>0</posx>
-					<posy>110</posy>
-					<width>300</width>
-					<height>20</height>
-					<label>$INFO[musicplayer.Playlistposition,[COLOR=blue]$LOCALIZE[554]:[/COLOR] ]$INFO[musicplayer.Playlistlength, / ]</label>
+					<posy>0</posy>
+					<width>100</width>
+					<height>40</height>
+					<font>font13</font>
 					<align>left</align>
 					<aligny>center</aligny>
-					<font>font12_title</font>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
+					<label>$INFO[Player.Time(hh:mm:ss)]</label>
 				</control>
-				<control type="label">
-					<posx>890</posx>
-					<posy>115</posy>
-					<width>500</width>
-					<height>25</height>
-					<label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
-					<align>right</align>
-					<aligny>center</aligny>
-					<font>font35_title</font>
-					<textcolor>grey</textcolor>
-					<shadowcolor>black</shadowcolor>
+				<control type="progress">
+					<description>Progressbar</description>
+					<posx>100</posx>
+					<posy>15</posy>
+					<width>720</width>
+					<height>16</height>
+					<info>Player.Progress</info>
 				</control>
 				<control type="label">
-					<posx>890</posx>
-					<posy>150</posy>
-					<width>890</width>
-					<height>20</height>
-					<label>[COLOR=blue]$LOCALIZE[209] :[/COLOR] $INFO[MusicPlayer.offset(1).Artist,, - ]$INFO[MusicPlayer.offset(1).Title]</label>
+					<posx>920</posx>
+					<posy>0</posy>
+					<width>100</width>
+					<height>40</height>
+					<font>font13</font>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font12_title</font>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
+					<label>$INFO[Player.Duration(hh:mm:ss)]</label>
 				</control>
 			</control>
 		</control>
-		<control type="group">
-			<visible>Player.ShowInfo</visible>
-			<animation effect="slide" start="0,0" end="160,0" delay="0" time="300" condition="!Window.IsVisible(MusicOSD)">hidden</animation>
-			<animation effect="slide" start="160,0" end="0,0" delay="0" time="300" condition="!Window.IsVisible(MusicOSD)">visible</animation>
-			<include>Clock</include>
-		</control>
+		<!-- codec & viz infos -->
 		<control type="group" id="0">
-			<posx>240</posx>
-			<posy>100</posy>
-			<include>VisibleFadeEffect</include>
-			<visible>Player.ShowCodec + ![Window.IsVisible(121) | Window.IsVisible(122)]</visible>
+			<posx>0</posx>
+			<posy>50</posy>
+			<visible>Player.ShowCodec + ![Window.IsVisible(script-XBMC_Lyrics-main.xml) | Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
+			<animation effect="fade" time="200">VisibleChange</animation>
 			<control type="image">
-				<description>gradient</description>
+				<description>media info background image</description>
 				<posx>0</posx>
 				<posy>0</posy>
-				<width>800</width>
-				<height>200</height>
-				<colordiffuse>CCFFFFFF</colordiffuse>
-				<texture border="20">OverlayDialogBackground.png</texture>
+				<width>1280</width>
+				<height>105</height>
+				<colordiffuse>AAFFFFFF</colordiffuse>
+				<texture>black-back.png</texture>
 			</control>
 			<control type="label">
-				<posx>30</posx>
-				<posy>20</posy>
-				<width>360</width>
-				<height>25</height>
-				<label>$LOCALIZE[31046]</label>
+				<description>row 1 label</description>
+				<posx>50</posx>
+				<posy>10</posy>
+				<label>-</label>
 				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
+				<label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, · $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, · $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, · $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, · $LOCALIZE[21444]: ]</label>
+				<font>font12</font>
 			</control>
 			<control type="label">
-				<posx>30</posx>
-				<posy>50</posy>
-				<width>360</width>
-				<height>100</height>
-				<label>$INFO[musicplayer.Codec,· $LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate,[CR]· $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample,[CR]· $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate,[CR]· $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels,[CR]· $LOCALIZE[21444]: ]</label>
+				<description>row 2 label</description>
+				<posx>50</posx>
+				<posy>40</posy>
+				<label>-</label>
 				<align>left</align>
-				<aligny>top</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<posx>760</posx>
-				<posy>20</posy>
-				<width>360</width>
-				<height>25</height>
-				<label>$LOCALIZE[250]</label>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<posx>760</posx>
-				<posy>50</posy>
-				<width>360</width>
-				<height>25</height>
-				<label>$INFO[Visualisation.Name] [I]($LOCALIZE[20166])[/I] ·[CR]fps: $INFO[System.FPS] ·</label>
-				<align>right</align>
-				<aligny>top</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
+				<label>$INFO[Visualisation.Name] [I][COLOR=orange]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label>
+				<font>font12</font>
 				<visible>Visualisation.Locked</visible>
 			</control>
 			<control type="label">
-				<posx>760</posx>
-				<posy>50</posy>
-				<width>360</width>
-				<height>25</height>
-				<label>$INFO[Visualisation.Name] ·[CR]fps: $INFO[System.FPS] ·</label>
-				<align>right</align>
-				<aligny>top</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
+				<description>Unlocked row 2 label</description>
+				<posx>50</posx>
+				<posy>40</posy>
+				<label>-</label>
+				<align>left</align>
+				<label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label>
+				<font>font12</font>
 				<visible>!Visualisation.Locked</visible>
 			</control>
 			<control type="label">
-				<posx>760</posx>
-				<posy>105</posy>
-				<width>360</width>
-				<height>25</height>
-				<label>$LOCALIZE[31047]</label>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<posx>760</posx>
-				<posy>135</posy>
-				<width>360</width>
-				<height>25</height>
-				<label fallback="161">$INFO[Visualisation.Preset,, ·]</label>
-				<align>right</align>
-				<aligny>top</aligny>
+				<description>row 3 label</description>
+				<posx>50</posx>
+				<posy>70</posy>
+				<label>-</label>
+				<align>left</align>
+				<label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label>
 				<font>font12</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<wrapmultiline>true</wrapmultiline>
 			</control>
 		</control>
 	</controls>
-</window>
+</window>
\ No newline at end of file