VolumeUp/VolumeDown buttons in video and music OSD #764

Closed
wants to merge 2 commits into
from
View
64 addons/skin.confluence/720p/MusicOSD.xml
@@ -145,72 +145,102 @@
<posy>0</posy>
<width>45</width>
<height>45</height>
+ <label>209</label>
+ <font>-</font>
+ <texturefocus>OSDVolDownFO.png</texturefocus>
+ <texturenofocus>OSDVolDownNF.png</texturenofocus>
+ <onleft>605</onleft>
+ <onright>607</onright>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
+ <onclick>VolumeDown</onclick>
+ </control>
+ <control type="button" id="607">
+ <posx>315</posx>
+ <posy>0</posy>
+ <width>45</width>
+ <height>45</height>
+ <label>209</label>
+ <font>-</font>
+ <texturefocus>OSDVolUpFO.png</texturefocus>
+ <texturenofocus>OSDVolUpNF.png</texturenofocus>
+ <onleft>606</onleft>
+ <onright>608</onright>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
+ <onclick>VolumeUp</onclick>
+ </control>
+ <control type="button" id="608">
+ <posx>360</posx>
+ <posy>0</posy>
+ <width>45</width>
+ <height>45</height>
<label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label>
<font>-</font>
<texturefocus>-</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>XBMC.PlayerControl(Repeat)</onclick>
- <onleft>605</onleft>
- <onright>607</onright>
+ <onleft>607</onleft>
+ <onright>609</onright>
<onup>1000</onup>
<ondown>1000</ondown>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatNF.png</texture>
<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
- <visible>!Control.HasFocus(606)</visible>
+ <visible>!Control.HasFocus(608)</visible>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatFO.png</texture>
<visible>!Playlist.IsRepeat + !Playlist.IsRepeatOne</visible>
- <visible>Control.HasFocus(606)</visible>
+ <visible>Control.HasFocus(608)</visible>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatOneNF.png</texture>
<visible>Playlist.IsRepeatOne</visible>
- <visible>!Control.HasFocus(606)</visible>
+ <visible>!Control.HasFocus(608)</visible>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatOneFO.png</texture>
<visible>Playlist.IsRepeatOne</visible>
- <visible>Control.HasFocus(606)</visible>
+ <visible>Control.HasFocus(608)</visible>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatAllNF.png</texture>
<visible>Playlist.IsRepeat</visible>
- <visible>!Control.HasFocus(606)</visible>
+ <visible>!Control.HasFocus(608)</visible>
</control>
<control type="image">
- <posx>270</posx>
+ <posx>360</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
<texture>OSDRepeatAllFO.png</texture>
<visible>Playlist.IsRepeat</visible>
- <visible>Control.HasFocus(606)</visible>
+ <visible>Control.HasFocus(608)</visible>
</control>
- <control type="togglebutton" id="607">
- <posx>315</posx>
+ <control type="togglebutton" id="609">
+ <posx>405</posx>
<posy>0</posy>
<width>45</width>
<height>45</height>
@@ -222,7 +252,7 @@
<alttexturefocus>OSDRandomOnFO.png</alttexturefocus>
<alttexturenofocus>OSDRandomOnNF.png</alttexturenofocus>
<onclick>XBMC.PlayerControl(Random)</onclick>
- <onleft>606</onleft>
+ <onleft>608</onleft>
<onright>701</onright>
<onup>1000</onup>
<ondown>1000</ondown>
View
34 addons/skin.confluence/720p/VideoOSD.xml
@@ -135,11 +135,41 @@
<texturefocus>OSDNextTrackFO.png</texturefocus>
<texturenofocus>OSDNextTrackNF.png</texturenofocus>
<onleft>604</onleft>
- <onright>701</onright>
+ <onright>606</onright>
<onup>1000</onup>
<ondown>1000</ondown>
<onclick>PlayerControl(Next)</onclick>
</control>
+ <control type="button" id="606">
+ <posx>270</posx>
+ <posy>0</posy>
+ <width>45</width>
+ <height>45</height>
+ <label>209</label>
+ <font>-</font>
+ <texturefocus>OSDVolDownFO.png</texturefocus>
+ <texturenofocus>OSDVolDownNF.png</texturenofocus>
+ <onleft>605</onleft>
+ <onright>607</onright>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
+ <onclick>VolumeDown</onclick>
+ </control>
+ <control type="button" id="607">
+ <posx>315</posx>
+ <posy>0</posy>
+ <width>45</width>
+ <height>45</height>
+ <label>209</label>
+ <font>-</font>
+ <texturefocus>OSDVolUpFO.png</texturefocus>
+ <texturenofocus>OSDVolUpNF.png</texturenofocus>
+ <onleft>606</onleft>
+ <onright>701</onright>
+ <onup>1000</onup>
+ <ondown>1000</ondown>
+ <onclick>VolumeUp</onclick>
+ </control>
</control>
<control type="group">
<posx>250r</posx>
@@ -157,7 +187,7 @@
<texturenofocus>OSDSubtitlesNF.png</texturenofocus>
<alttexturefocus>OSDSubtitlesFO.png</alttexturefocus>
<alttexturenofocus>OSDSubtitlesNF.png</alttexturenofocus>
- <onleft>605</onleft>
+ <onleft>607</onleft>
<onright>702</onright>
<onup>1000</onup>
<ondown>1000</ondown>
View
BIN addons/skin.confluence/media/OSDVolDownFO.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN addons/skin.confluence/media/OSDVolDownNF.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN addons/skin.confluence/media/OSDVolUpFO.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN addons/skin.confluence/media/OSDVolUpNF.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.