Skip to content

Commit

Permalink
Update video and music OSD buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@gade01
gade01 committed Oct 6, 2022
1 parent 15a22dc commit d2045a6
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 33 deletions.
23 changes: 18 additions & 5 deletions 720p/MusicOSD.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,17 @@
<onup condition="Window.IsVisible(script-cu-lrclyrics-main.xml)">SetFocus(9000)</onup>
<onback condition="Window.IsVisible(script-cu-lrclyrics-main.xml)">Dialog.Close(MusicOSD,true)</onback>
<onback condition="Window.IsVisible(script-cu-lrclyrics-main.xml)">SetFocus(9000)</onback>
<onleft>109</onleft>
<onleft condition="Control.IsEnabled(109)">109</onleft>
<onleft condition="Control.IsEnabled(108)">108</onleft>
<onleft condition="Control.IsVisible(107)">107</onleft>
<onleft>104</onleft>
<onright condition="PVR.CanRecordPlayingChannel">110</onright>
<onright condition="!PVR.CanRecordPlayingChannel + Control.IsVisible(250)">250</onright>
<onright condition="!PVR.CanRecordPlayingChannel + !Control.IsVisible(250)">106</onright>
<onright condition="MusicPlayer.Content(LiveTV) + VideoPlayer.HasEpg">98</onright>
<onright condition="MusicPlayer.Content(LiveTV) + !VideoPlayer.HasEpg">97</onright>
<onright condition="!MusicPartyMode.Enabled">250</onright>
<onright condition="Control.IsEnabled(106)">106</onright>
<onright condition="Control.IsEnabled(105)">105</onright>
<onright>104</onright>
<control type="button" id="100">
<description>Exit Fullscreen</description>
<include content="OSDButton">
Expand Down Expand Up @@ -286,7 +293,8 @@
<texturefocus>osd/osd-skip-prev-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-prev-nofocus.png</texturenofocus>
<onclick>PlayerControl(Previous)</onclick>
<visible>MusicPlayer.HasPrevious | Player.SeekEnabled</visible>
<enable>Player.ChapterCount | MusicPlayer.HasPrevious | Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="![Player.ChapterCount | MusicPlayer.HasPrevious | Player.SeekEnabled]">Conditional</animation>
</control>
<control type="button" id="105">
<description>Rewind</description>
Expand All @@ -297,6 +305,8 @@
<texturefocus>osd/osd-rewind-focus.png</texturefocus>
<texturenofocus>osd/osd-rewind-nofocus.png</texturenofocus>
<onclick>PlayerControl(Rewind)</onclick>
<enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation>
</control>
<control type="button" id="104">
<description>Stop</description>
Expand Down Expand Up @@ -331,6 +341,8 @@
<texturefocus>osd/osd-forward-focus.png</texturefocus>
<texturenofocus>osd/osd-forward-nofocus.png</texturenofocus>
<onclick>PlayerControl(Forward)</onclick>
<enable>Player.SeekEnabled</enable>
<animation effect="fade" start="100" end="50" time="100" condition="!Player.SeekEnabled">Conditional</animation>
</control>
<control type="button" id="109">
<description>Skip Next</description>
Expand All @@ -341,7 +353,8 @@
<texturefocus>osd/osd-skip-next-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-next-nofocus.png</texturenofocus>
<onclick>PlayerControl(Next)</onclick>
<visible>MusicPlayer.HasNext | [MusicPlayer.Content(LiveTV) + Player.SeekEnabled]</visible>
<enable>Player.ChapterCount | MusicPlayer.HasNext | PVR.IsTimeShift</enable>
<animation effect="fade" start="100" end="50" time="100" condition="![Player.ChapterCount | MusicPlayer.HasNext | PVR.IsTimeShift]">Conditional</animation>
</control>
</control>

Expand Down
6 changes: 3 additions & 3 deletions 720p/VideoFullScreen.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<depth>DepthOSD</depth>
<left>28</left>
<top>350</top>
<visible>[Player.ShowInfo | [Skin.HasSetting(ShowInfoOnPause) + Player.Paused]] + ![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(VideoBookmarks)
<visible>[Player.ShowInfo | [Skin.HasSetting(ShowInfoOnPause) + Player.Paused]] + ![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(OSDSubtitleSettings) | Window.IsActive(VideoBookmarks)
| Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide) | Window.IsActive(subtitlesearch) | Window.IsActive(osdcmssettings) | Window.IsActive(GameOSD)]</visible>
<include>FSMediaInfoPanel</include>
<include>FSMediaInfoOpenCloseAnim</include>
Expand Down Expand Up @@ -518,7 +518,7 @@
<left>28</left>
<top>-10</top>
<width>1224</width>
<height>170</height>
<height>190</height>
<texture border="8">panels/panel.png</texture>
<animation effect="slide" start="0,0" end="0,-110" time="0" condition="![Control.isVisible(11) + Control.IsVisible(12)]">Conditional</animation>
</control>
Expand Down Expand Up @@ -547,7 +547,7 @@
<control type="label" id="12">
<description>Row 3</description>
<width>1188</width>
<height>40</height>
<height>60</height>
<font>MediaInfoFont2</font>
<textcolor>MediaInfoItemColor2</textcolor>
<shadowcolor>ShadowColor</shadowcolor>
Expand Down
57 changes: 32 additions & 25 deletions 720p/VideoOSD.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<controls>
<control type="group">
<visible>![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(VideoBookmarks) | Window.IsActive(SliderDialog) | Window.IsActive(osdcmssettings) | Window.IsActive(playerprocessinfo) | Window.IsActive(1121)]</visible>
<visible>![Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(OSDSubtitleSettings) | Window.IsActive(VideoBookmarks) | Window.IsActive(SliderDialog) | Window.IsActive(osdcmssettings) | Window.IsActive(playerprocessinfo) | Window.IsActive(1121)]</visible>
<top>655</top>
<include>BottomPaneOpenCloseAnim</include>
<include>PlayerControlsPanel</include>
Expand All @@ -36,11 +36,13 @@
<include condition="!VideoPlayer.Content(LiveTV)">VideoOSDItemgap1</include>
<include condition="VideoPlayer.Content(LiveTV)">VideoOSDItemgap2</include>
<orientation>horizontal</orientation>
<onup>noop</onup>
<ondown>noop</ondown>
<onleft condition="Control.IsVisible(110)">110</onleft>
<onleft>109</onleft>
<onright>99</onright>
<onleft condition="Control.IsEnabled(109)">109</onleft>
<onleft condition="!Control.IsEnabled(109) + Control.IsEnabled(108)">108</onleft>
<onleft condition="!Control.IsEnabled(109) + !Control.IsEnabled(108) + Control.IsEnabled(107)">107</onleft>
<onleft condition="!Control.IsEnabled(109) + !Control.IsEnabled(108) + !Control.IsEnabled(107)">95</onleft>
<onright condition="Control.IsEnabled(99)">99</onright>
<onright condition="!Control.IsEnabled(99) + Control.IsEnabled(98)">98</onright>
<onright condition="!Control.IsEnabled(99) + !Control.IsEnabled(98)">95</onright>
<control type="button" id="100">
<description>Exit Fullscreen</description>
<include content="OSDButton">
Expand Down Expand Up @@ -99,7 +101,7 @@
<label>$LOCALIZE[287]</label>
<texturefocus>osd/osd-subtitles-focus.png</texturefocus>
<texturenofocus>osd/osd-subtitles-nofocus.png</texturenofocus>
<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
<onclick>ActivateWindow(OSDSubtitleSettings)</onclick>
</control>
<control type="button" id="105">
<description>Teletext</description>
Expand Down Expand Up @@ -183,8 +185,6 @@
<itemgap>10</itemgap>
<usecontrolcoords>true</usecontrolcoords>
<orientation>horizontal</orientation>
<onup>noop</onup>
<ondown>noop</ondown>
<onleft condition="Control.IsVisible(115)">115</onleft>
<onleft condition="!Control.IsVisible(115)">114</onleft>
<onleft>103</onleft>
Expand All @@ -198,6 +198,8 @@
<texturefocus>osd/osd-skip-prev-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-prev-nofocus.png</texturenofocus>
<onclick>PlayerControl(Previous)</onclick>
<enable>Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)</enable>
<animation effect="fade" start="100" end="60" time="100" condition="![Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)]">Conditional</animation>
</control>
<control type="button" id="98">
<description>Rewind</description>
Expand Down Expand Up @@ -254,6 +256,8 @@
<texturefocus>osd/osd-skip-next-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-next-nofocus.png</texturenofocus>
<onclick>PlayerControl(Next)</onclick>
<enable>Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)</enable>
<animation effect="fade" start="100" end="60" time="100" condition="![Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1)]">Conditional</animation>
</control>
</control>

Expand All @@ -267,8 +271,6 @@
<itemgap>6</itemgap>
<usecontrolcoords>true</usecontrolcoords>
<orientation>horizontal</orientation>
<onup>noop</onup>
<ondown>noop</ondown>
<onleft condition="Control.IsVisible(115)">115</onleft>
<onleft condition="!Control.IsVisible(115)">114</onleft>
<onleft>103</onleft>
Expand Down Expand Up @@ -301,6 +303,7 @@
<texturenofocus>osd/osd-epg-nofocus.png</texturenofocus>
<onclick>ActivateWindow(pvrchannelguide)</onclick>
<onclick>Dialog.Close(VideoOSD)</onclick>
<visible>VideoPlayer.HasEPG</visible>
</control>
<control type="button" id="97">
<description>Channels</description>
Expand All @@ -313,6 +316,18 @@
<onclick>ActivateWindow(PVROSDChannels)</onclick>
<onclick>Dialog.Close(VideoOSD)</onclick>
</control>
<control type="button" id="110">
<description>Skip Prev</description>
<top>5</top>
<include content="OSDButton">
<param name="size" value="40" />
</include>
<texturefocus>osd/osd-skip-prev-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-prev-nofocus.png</texturenofocus>
<onclick>PlayerControl(Previous)</onclick>
<enable>Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | [Player.SeekEnabled + VideoPlayer.Content(livetv)]</enable>
<animation effect="fade" start="100" end="60" time="100" condition="![Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | [Player.SeekEnabled + VideoPlayer.Content(livetv)]]">Conditional</animation>
</control>
<control type="button" id="96">
<description>Rewind</description>
<top>5</top>
Expand Down Expand Up @@ -365,24 +380,16 @@
<animation effect="fade" start="100" end="60" time="100" condition="!Player.SeekEnabled">Conditional</animation>
</control>
<control type="button" id="109">
<description>Next Channel</description>
<description>Skip Next</description>
<top>5</top>
<include content="OSDButton">
<param name="size" value="40" />
</include>
<texturefocus>osd/osd-channel-up-focus.png</texturefocus>
<texturenofocus>osd/osd-channel-up-nofocus.png</texturenofocus>
<texturefocus>osd/osd-skip-next-focus.png</texturefocus>
<texturenofocus>osd/osd-skip-next-nofocus.png</texturenofocus>
<onclick>PlayerControl(Next)</onclick>
</control>
<control type="button" id="110">
<description>Previous Channel</description>
<top>5</top>
<include content="OSDButton">
<param name="size" value="40" />
</include>
<texturefocus>osd/osd-channel-down-focus.png</texturefocus>
<texturenofocus>osd/osd-channel-down-nofocus.png</texturenofocus>
<onclick>PlayerControl(Previous)</onclick>
<enable>Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | PVR.IsTimeShift</enable>
<animation effect="fade" start="100" end="60" time="100" condition="![Player.HasSceneMarkers | Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | PVR.IsTimeShift]">Conditional</animation>
</control>
</control>

Expand Down Expand Up @@ -596,7 +603,7 @@
</control>

<control type="group">
<visible>![Window.IsActive(playerprocessinfo) | Window.IsActive(selectdialog) | Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(osdsubtitlesettings) | Window.IsActive(VideoBookmarks) | Window.IsActive(SliderDialog) | Window.IsActive(osdcmssettings) | Window.IsActive(1121)]</visible>
<visible>![Window.IsActive(playerprocessinfo) | Window.IsActive(selectdialog) | Window.IsActive(OSDVideoSettings) | Window.IsActive(OSDAudioSettings) | Window.IsActive(OSDSubtitleSettings) | Window.IsActive(VideoBookmarks) | Window.IsActive(SliderDialog) | Window.IsActive(osdcmssettings) | Window.IsActive(1121)]</visible>
<left>22</left>
<include>DialogOpenCloseAnim</include>

Expand Down

0 comments on commit d2045a6

Please sign in to comment.