[Confluence] cosmetics

Memphiz · Feb 15, 2015 · 3a2a417 · 3a2a417
1 parent 26a1503
commit 3a2a417
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 80 deletions.
diff --git a/addons/skin.confluence/720p/DialogSeekBar.xml b/addons/skin.confluence/720p/DialogSeekBar.xml
@@ -181,48 +181,8 @@
 					<visible>Player.Forwarding32x</visible>
 				</control>
 			</control>
-
-			<control type="label">
-				<description>Playing Label</description>
-				<left>20</left>
-				<top>7</top>
-				<width>240</width>
-				<height>20</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font10_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[31042]</label>
-				<visible>Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-			</control>
-			<control type="label">
-				<description>Paused Label</description>
-				<left>20</left>
-				<top>7</top>
-				<width>240</width>
-				<height>20</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font10_title</font>
-				<textcolor>blue</textcolor>
-				<label>31043</label>
-				<visible>[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek</visible>
-			</control>
-			<control type="label">
-				<description>Cache Label</description>
-				<left>20</left>
-				<top>7</top>
-				<width>240</width>
-				<height>20</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font10_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
-				<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
-			</control>
 			<control type="label">
-				<description>Seeking Label</description>
+				<description>Seekbar Label</description>
 				<left>20</left>
 				<top>7</top>
 				<width>240</width>
@@ -233,45 +193,6 @@
 				<textcolor>blue</textcolor>
 				<label>$VAR[SeekLabel]</label>
 			</control>
-			<control type="label">
-				<description>FF Label</description>
-				<left>20</left>
-				<top>7</top>
-				<width>240</width>
-				<height>20</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font10_title</font>
-				<textcolor>blue</textcolor>
-				<label>31044</label>
-				<visible>Player.Forwarding</visible>
-			</control>
-			<control type="label">
-				<description>RW Label</description>
-				<left>20</left>
-				<top>7</top>
-				<width>240</width>
-				<height>20</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font10_title</font>
-				<textcolor>blue</textcolor>
-				<label>31045</label>
-				<visible>Player.Rewinding</visible>
-			</control>
-			<control type="label">
-				<description>Elapsed Time Label</description>
-				<left>20</left>
-				<top>23</top>
-				<width>240</width>
-				<height>20</height>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<align>left</align>
-				<aligny>center</aligny>
-				<label>$INFO[Player.Time] - $INFO[Player.Duration]</label>
-				<visible>!Player.Seeking</visible>
-			</control>
 			<control type="label">
 				<description>Seek Time Label</description>
 				<left>20</left>

diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
@@ -60,9 +60,15 @@
 		<value>$INFO[ListItem.VideoCodec]</value>
 	</variable>
 	<variable name="SeekLabel">
+		<value condition="Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31042]</value>
+		<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[31043]</value>
+		<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
 		<value condition="!IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
 		<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
 		<value condition="!Player.DisplayAfterSeek + Player.Seeking">$LOCALIZE[31046]</value>
+		<value condition="Player.Forwarding">$LOCALIZE[31044]</value>
+		<value condition="Player.Rewinding">$LOCALIZE[31045]</value>
+		<value condition="!Player.Seeking">$INFO[Player.Time] - $INFO[Player.Duration]</value>
 	</variable>
 
 	<include name="BehindDialogFadeOut">