Skip to content

Commit

Permalink
setting for poster instead of thumbs - tempo dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaVukovic
DaVukovic committed Mar 31, 2023
1 parent 4d4d110 commit a75a216
Show file tree
Hide file tree
Showing 18 changed files with 277 additions and 167 deletions.
90 changes: 31 additions & 59 deletions 720p/DialogSeekBar.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol>1</defaultcontrol>
<visible>Player.Seeking | Player.HasPerformedSeek(3) | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | Player.IsTempo</visible>
<visible>Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Player.ShowTime | [Player.IsTempo + !System.IdleTime(3)]</visible>
<visible>!Player.HasGame</visible>
<visible>!Player.FrameAdvance</visible>
<animation effect="fade" start="0" end="100" time="150">WindowOpen</animation>
Expand Down Expand Up @@ -114,15 +114,15 @@
<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>
<top>3</top>
<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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -409,4 +381,4 @@
</control>
</control>
</controls>
</window>
</window>
23 changes: 22 additions & 1 deletion 720p/Font.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -344,5 +359,11 @@
<size>80</size>
<style>bold</style>
</font>
<font>
<name>OSDPlaySpeed</name>
<filename>arial.ttf</filename>
<size>8</size>
<style>bold</style>
</font>
</fontset>
</fonts>
</fonts>
82 changes: 49 additions & 33 deletions 720p/Includes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,32 @@
<value>$INFO[ListItem.Icon]</value>
</variable>
<variable name="PosterThumb">
<value condition="!String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
<value condition="[Skin.HasSetting(ShowPosterInsteadThumb) + Container.Content(MusicVideos) + !String.IsEmpty(ListItem.Art(poster))]">$INFO[ListItem.Art(poster)]</value>
<value condition="[Skin.HasSetting(ShowPosterInsteadThumb) + Container.Content(MusicVideos) + String.IsEmpty(ListItem.Art(poster)) + !ListItem.IsFolder]">DefaultVideoPoster.png</value>
<value condition="[[Container.Content(MusicVideos) + Control.IsVisible(50) | Control.IsVisible(51)] | [!Container.Content(MusicVideos) + !String.IsEmpty(ListItem.Art(poster))]]">$INFO[ListItem.Art(poster)]</value>
<value>$INFO[ListItem.Icon]</value>
</variable>
<variable name="NowPlayingThumb">
<value condition="!String.IsEmpty(Player.Art(poster))">$INFO[Player.Art(poster)]</value>
<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>
Expand Down Expand Up @@ -531,14 +549,12 @@
<value>$INFO[ListItem.VideoCodec]</value>
</variable>
<variable name="SeekLabel">
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,0.)">$LOCALIZE[31045]</value>
<value condition="Player.IsTempo + String.StartsWith(Player.PlaySpeed,1.)">$LOCALIZE[31044]</value>
<value condition="Player.Playing + !Player.Seeking + !Player.HasPerformedSeek(3)">$LOCALIZE[31042]</value>
<value condition="[Player.Playing + !Player.Seeking + !Player.DisplayAfterSeek] | Player.IsTempo">$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="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
<value condition="Player.HasPerformedSeek(3) + ![player.forwarding | player.rewinding]">$LOCALIZE[31046][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
<value condition="!Player.HasPerformedSeek(3) + Player.Seeking">$LOCALIZE[31046]</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>
</variable>
Expand Down Expand Up @@ -1544,33 +1560,33 @@
<label>$INFO[System.Time]</label>
<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
</control>
<control type="group">
<visible>Integer.IsGreater(System.ProfileCount,1)</visible>
<control type="image">
<visible>Skin.HasSetting(show_profileavatar)</visible>
<top>5</top>
<left>1105</left>
<width>30</width>
<height>30</height>
<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
<texture>$INFO[System.ProfileThumb]</texture>
<aspectratio>scale</aspectratio>
</control>
<control type="label">
<visible>Skin.HasSetting(show_profilename)</visible>
<font>font28_title</font>
<align>right</align>
<top>5</top>
<left>540</left>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<aligny>center</aligny>
<height>30</height>
<width max="600">auto</width>
<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
<label>$INFO[System.ProfileName]</label>
</control>
</control>
<control type="group">
<visible>Integer.IsGreater(System.ProfileCount,1)</visible>
<control type="image">
<visible>Skin.HasSetting(show_profileavatar)</visible>
<top>5</top>
<left>1105</left>
<width>30</width>
<height>30</height>
<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
<texture>$INFO[System.ProfileThumb]</texture>
<aspectratio>scale</aspectratio>
</control>
<control type="label">
<visible>Skin.HasSetting(show_profilename)</visible>
<font>font28_title</font>
<align>right</align>
<top>5</top>
<left>540</left>
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<aligny>center</aligny>
<height>30</height>
<width max="600">auto</width>
<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
<label>$INFO[System.ProfileName]</label>
</control>
</control>

</include>
<include name="HomeAddonsCommonLayout">
Expand Down
12 changes: 12 additions & 0 deletions 720p/SkinSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,18 @@
<onclick>Skin.ToggleSetting(ShowBackgroundVis)</onclick>
<selected>!Skin.HasSetting(ShowBackgroundVis)</selected>
</control>
<control type="radiobutton" id="305">
<width>750</width>
<height>40</height>
<font>font13</font>
<label>31126</label>
<textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<texturefocus>MenuItemFO.png</texturefocus>
<texturenofocus>MenuItemNF.png</texturenofocus>
<onclick>Skin.ToggleSetting(ShowPosterInsteadThumb)</onclick>
<selected>Skin.HasSetting(ShowPosterInsteadThumb)</selected>
</control>
<control type="label" id="310">
<width>750</width>
<height>45</height>
Expand Down
Loading

0 comments on commit a75a216

Please sign in to comment.