Improved PlaySpeed in DialogSeekBar.xml

This commit is contained in:
Christian Gade 2021-04-22 13:09:54 +02:00
parent 9fb0de2042
commit e56f0924e1
11 changed files with 65 additions and 57 deletions

View File

@ -114,7 +114,7 @@
<width>20</width>
<height>44</height>
<texture>OSDSeekRewind.png</texture>
<visible>Player.Rewinding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)]</visible>
<visible>Player.Rewinding</visible>
</control>
<control type="image">
<left>80</left>
@ -122,7 +122,7 @@
<width>20</width>
<height>44</height>
<texture>OSDSeekForward.png</texture>
<visible>Player.Forwarding | [Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)]</visible>
<visible>Player.Forwarding | Player.IsTempo</visible>
</control>
<control type="image">
<left>31</left>
@ -148,14 +148,6 @@
<texture>OSD2x.png</texture>
<visible>Player.Rewinding2x</visible>
</control>
<control type="image">
<left>28</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD0.9x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,0.90)</visible>
</control>
<control type="image">
<left>25</left>
<top>4</top>
@ -164,14 +156,6 @@
<texture>OSD4x.png</texture>
<visible>Player.Rewinding4x</visible>
</control>
<control type="image">
<left>25</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD0.8x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,0.80)</visible>
</control>
<control type="image">
<left>22</left>
<top>4</top>
@ -204,14 +188,6 @@
<texture>OSD2x.png</texture>
<visible>Player.Forwarding2x</visible>
</control>
<control type="image">
<left>34</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD1.1x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,1.10)</visible>
</control>
<control type="image">
<left>37</left>
<top>4</top>
@ -220,14 +196,6 @@
<texture>OSD4x.png</texture>
<visible>Player.Forwarding4x</visible>
</control>
<control type="image">
<left>37</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD1.2x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,1.20)</visible>
</control>
<control type="image">
<left>40</left>
<top>4</top>
@ -236,14 +204,6 @@
<texture>OSD8x.png</texture>
<visible>Player.Forwarding8x</visible>
</control>
<control type="image">
<left>40</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD1.3x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,1.30)</visible>
</control>
<control type="image">
<left>43</left>
<top>4</top>
@ -252,14 +212,6 @@
<texture>OSD16x.png</texture>
<visible>Player.Forwarding16x</visible>
</control>
<control type="image">
<left>43</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD1.4x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,1.40)</visible>
</control>
<control type="image">
<left>45</left>
<top>4</top>
@ -268,13 +220,33 @@
<texture>OSD32x.png</texture>
<visible>Player.Forwarding32x</visible>
</control>
<control type="image">
<left>45</left>
<top>4</top>
<width>40</width>
<height>40</height>
<texture>OSD1.5x.png</texture>
<visible>String.IsEqual(Player.PlaySpeed,1.50)</visible>
<control type="group">
<visible>Player.IsTempo</visible>
<left>24</left>
<top>3</top>
<animation effect="slide" end="3,0" condition="String.IsEqual(Player.PlaySpeed,0.90)">Conditional</animation>
<animation effect="slide" end="9,0" condition="String.IsEqual(Player.PlaySpeed,1.10)">Conditional</animation>
<animation effect="slide" end="12,0" condition="String.IsEqual(Player.PlaySpeed,1.20)">Conditional</animation>
<animation effect="slide" end="15,0" condition="String.IsEqual(Player.PlaySpeed,1.30)">Conditional</animation>
<animation effect="slide" end="18,0" condition="String.IsEqual(Player.PlaySpeed,1.40)">Conditional</animation>
<animation effect="slide" end="20,0" condition="String.IsEqual(Player.PlaySpeed,1.50) | String.IsEqual(Player.PlaySpeed,1.60) | String.IsEqual(Player.PlaySpeed,1.70) | String.IsEqual(Player.PlaySpeed,1.80) | String.IsEqual(Player.PlaySpeed,1.90) | String.IsEqual(Player.PlaySpeed,2.00) | String.IsEqual(Player.PlaySpeed,2.10)">Conditional</animation>
<control type="image">
<left>1</left>
<top>1</top>
<width>40</width>
<height>40</height>
<texture>OSDClean.png</texture>
</control>
<control type="label">
<description>Playspeed Label</description>
<width>40</width>
<height>40</height>
<align>center</align>
<aligny>center</aligny>
<font>OSDPlaySpeed</font>
<textcolor>white</textcolor>
<label>[I]$VAR[PlaySpeed][/I]</label>
</control>
</control>
</control>
<control type="label">

View File

@ -83,6 +83,11 @@
<filename>Roboto-Bold.ttf</filename>
<size>80</size>
</font>
<font>
<name>OSDPlaySpeed</name>
<filename>Roboto-Bold.ttf</filename>
<size>9</size>
</font>
</fontset>
<fontset id="Massive" idloc="15110">
<!-- Normal Fonts -->
@ -167,6 +172,11 @@
<filename>Roboto-Bold.ttf</filename>
<size>80</size>
</font>
<font>
<name>OSDPlaySpeed</name>
<filename>Roboto-Bold.ttf</filename>
<size>9</size>
</font>
</fontset>
<fontset id="DefaultNoCaps" idloc="31391">
<!-- Normal Fonts -->
@ -251,6 +261,11 @@
<filename>Roboto-Bold.ttf</filename>
<size>80</size>
</font>
<font>
<name>OSDPlaySpeed</name>
<filename>Roboto-Bold.ttf</filename>
<size>9</size>
</font>
</fontset>
<fontset id="Arial" idloc="31392">
<!-- Arial Font better for non English -->
@ -344,5 +359,10 @@
<size>80</size>
<style>bold</style>
</font>
<font>
<name>OSDPlaySpeed</name>
<filename>arial.ttf</filename>
<size>7</size>
</font>
</fontset>
</fonts>

View File

@ -486,6 +486,22 @@
<value condition="!String.IsEmpty(Player.Art(tvshow.poster))">$INFO[Player.Art(tvshow.poster)]</value>
<value>$INFO[Player.Icon]</value>
</variable>
<variable name="PlaySpeed">
<value condition="String.IsEqual(Player.PlaySpeed,0.80)">0.8X</value>
<value condition="String.IsEqual(Player.PlaySpeed,0.90)">0.9X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.10)">1.1X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.20)">1.2X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.30)">1.3X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.40)">1.4X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.50)">1.5X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.60)">1.6X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.70)">1.7X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.80)">1.8X</value>
<value condition="String.IsEqual(Player.PlaySpeed,1.90)">1.9X</value>
<value condition="String.IsEqual(Player.PlaySpeed,2.00)">2X</value>
<value condition="String.IsEqual(Player.PlaySpeed,2.10)">2.1X</value>
<value>$INFO[Player.PlaySpeed]</value>
</variable>
<variable name="MusicInfoPanelLabel">
<value condition="Container.Content(Artists)">$INFO[ListItem.Label]</value>
<value condition="Container.Content(Songs)">$INFO[ListItem.Label,[COLOR=selected][B],[/B][/COLOR] - ]$INFO[ListItem.Label2]</value>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
media/OSDClean.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB