Fixed: FF RW labels in seek bar got off Streamlined some code

This commit is contained in:
JezzX 2011-12-19 15:53:39 +11:00
parent dfb9aab4b6
commit dae21820d8
2 changed files with 24 additions and 179 deletions

View File

@ -49,188 +49,16 @@
<bordersize>4</bordersize> <bordersize>4</bordersize>
</control> </control>
<control type="label"> <control type="label">
<description>Playing Label</description> <description>Playback State Label</description>
<posx>120</posx> <posx>120</posx>
<posy>8</posy> <posy>8</posy>
<height>20</height> <height>20</height>
<width>130</width> <width>160</width>
<align>center</align> <align>center</align>
<aligny>center</aligny> <aligny>center</aligny>
<font>font10</font> <font>font10</font>
<textcolor>grey2</textcolor> <textcolor>grey2</textcolor>
<label>31042</label> <label>$VAR[PlaybackStateLabel]</label>
<visible>Player.Playing + !Player.Seeking</visible>
</control>
<control type="label">
<description>Paused Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>31043</label>
<visible>[Player.Paused + !Player.Caching] + !Player.Seeking</visible>
</control>
<control type="label">
<description>Cache Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
</control>
<control type="label">
<description>Seeking Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
<visible>Player.Seeking</visible>
</control>
<control type="label">
<description>RW x2 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31045] x2</label>
<visible>Player.Rewinding2x + !Player.Seeking</visible>
</control>
<control type="label">
<description>RW x4 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31045] x4</label>
<visible>Player.Rewinding4x + !Player.Seeking</visible>
</control>
<control type="label">
<description>RW x8 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31045] x8</label>
<visible>Player.Rewinding8x + !Player.Seeking</visible>
</control>
<control type="label">
<description>RW x16 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31045] x16</label>
<visible>Player.Rewinding16x</visible>
</control>
<control type="label">
<description>RW x32 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31045] x32</label>
<visible>Player.Rewinding32x + !Player.Seeking</visible>
</control>
<control type="label">
<description>FF x2 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31044] x2</label>
<visible>Player.Forwarding2x + !Player.Seeking</visible>
</control>
<control type="label">
<description>FF x4 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31044] x4</label>
<visible>Player.Forwarding4x + !Player.Seeking</visible>
</control>
<control type="label">
<description>FF x8 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31044] x8</label>
<visible>Player.Forwarding8x</visible>
</control>
<control type="label">
<description>FF x16 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31044] x16</label>
<visible>Player.Forwarding16x + !Player.Seeking</visible>
</control>
<control type="label">
<description>FF x32 Label</description>
<posx>120</posx>
<posy>8</posy>
<height>20</height>
<width>130</width>
<align>center</align>
<aligny>center</aligny>
<font>font10</font>
<textcolor>grey2</textcolor>
<label>$LOCALIZE[31044] x32</label>
<visible>Player.Forwarding32x + !Player.Seeking</visible>
</control> </control>
<!-- progressbar dialog --> <!-- progressbar dialog -->
@ -238,7 +66,7 @@
<description>Elapsed Time Label</description> <description>Elapsed Time Label</description>
<posx>10</posx> <posx>10</posx>
<posy>7</posy> <posy>7</posy>
<width>110</width> <width>100</width>
<height>20</height> <height>20</height>
<font>font11</font> <font>font11</font>
<textcolor>white</textcolor> <textcolor>white</textcolor>
@ -251,7 +79,7 @@
<description>Seek Time Label</description> <description>Seek Time Label</description>
<posx>10</posx> <posx>10</posx>
<posy>7</posy> <posy>7</posy>
<width>110</width> <width>100</width>
<height>20</height> <height>20</height>
<font>font11</font> <font>font11</font>
<textcolor>white</textcolor> <textcolor>white</textcolor>
@ -262,9 +90,9 @@
</control> </control>
<control type="label" id="0"> <control type="label" id="0">
<description>Duration Label</description> <description>Duration Label</description>
<posx>380</posx> <posx>390</posx>
<posy>7</posy> <posy>7</posy>
<width>130</width> <width>100</width>
<height>20</height> <height>20</height>
<label>$INFO[Player.Duration]</label> <label>$INFO[Player.Duration]</label>
<font>font11</font> <font>font11</font>

View File

@ -10,6 +10,23 @@
<constant name="FanartCrossfadeTime">400</constant> <constant name="FanartCrossfadeTime">400</constant>
<constant name="IconCrossfadeTime">400</constant> <constant name="IconCrossfadeTime">400</constant>
<variable name="PlaybackStateLabel">
<value condition="Player.Playing + !Player.Seeking">$LOCALIZE[31042]</value>
<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
<value condition="Player.Seeking">[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</value>
<value condition="Player.Rewinding2x + !Player.Seeking">$LOCALIZE[31045] x2</value>
<value condition="Player.Rewinding4x + !Player.Seeking">$LOCALIZE[31045] x4</value>
<value condition="Player.Rewinding8x + !Player.Seeking">$LOCALIZE[31045] x8</value>
<value condition="Player.Rewinding16x + !Player.Seeking">$LOCALIZE[31045] x16</value>
<value condition="Player.Rewinding32x + !Player.Seeking">$LOCALIZE[31045] x32</value>
<value condition="Player.Forwarding2x + !Player.Seeking">$LOCALIZE[31044] x2</value>
<value condition="Player.Forwarding4x + !Player.Seeking">$LOCALIZE[31044] x4</value>
<value condition="Player.Forwarding8x + !Player.Seeking">$LOCALIZE[31044] x8</value>
<value condition="Player.Forwarding16x + !Player.Seeking">$LOCALIZE[31044] x16</value>
<value condition="Player.Forwarding32x + !Player.Seeking">$LOCALIZE[31044] x32</value>
</variable>
<include name="CommonBackground"> <include name="CommonBackground">
<control type="image"> <control type="image">
<posx>0</posx> <posx>0</posx>