Updated: Redid the PVR OSD so it actually looks nice and doesn't have all the extra buttons that don't actually work

This commit is contained in:
JezzX 2013-02-18 19:37:55 +11:00
parent 64796e9632
commit 72c386e88b
14 changed files with 493 additions and 404 deletions

View File

@ -1,5 +1,5 @@
<window type="dialog">
<defaultcontrol>213</defaultcontrol>
<defaultcontrol always="true">100</defaultcontrol>
<include>dialogeffect</include>
<coordinates>
<system>1</system>
@ -7,8 +7,21 @@
<posy>320</posy>
</coordinates>
<controls>
<control type="group">
<animation effect="fade" start="100" end="0" time="200" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(PvrOSDChannels) | Window.IsVisible(PvrOSDGuide)">conditional</animation>
<control type="button" id="100">
<posx>-10</posx>
<posy>-10</posy>
<width>1</width>
<height>1</height>
<texturefocus>-</texturefocus>
<texturenofocus>-</texturenofocus>
<label>-</label>
<font>-</font>
<onfocus condition="!VideoPlayer.Content(LiveTV)">SetFocus(101)</onfocus>
<onfocus condition="VideoPlayer.Content(LiveTV)">SetFocus(102)</onfocus>
</control>
<control type="group" id="101">
<defaultcontrol>202</defaultcontrol>
<animation effect="fade" start="100" end="0" time="200" condition="Window.IsVisible(SliderDialog)">conditional</animation>
<control type="group">
<posx>80r</posx>
<posy>-320</posy>
@ -39,41 +52,10 @@
<onclick>FullScreen</onclick>
</control>
</control>
<control type="button" id="208">
<description>REC button</description>
<posx>10</posx>
<posy>40</posy>
<width>128</width>
<height>128</height>
<texturefocus>osd_button_rec.png</texturefocus>
<texturenofocus>osd_button_recNF.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>918</onright>
<onup>918</onup>
<ondown>210</ondown>
<onclick>XBMC.PlayerControl(record)</onclick>
<visible>!VideoPlayer.HasMenu + Player.CanRecord</visible>
</control>
<control type="group">
<!-- Buttons for non PVR mode -->
<visible>!VideoPlayer.Content(LiveTV)</visible>
<control type="button" id="209">
<description>REC button 2</description>
<posx>10</posx>
<posy>40</posy>
<width>128</width>
<height>128</height>
<texturefocus>-</texturefocus>
<texturenofocus>osd_button_rec2.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>921</onright>
<onup>921</onup>
<ondown>211</ondown>
<onclick>XBMC.PlayerControl(record)</onclick>
<visible>!VideoPlayer.HasMenu + Player.CanRecord + Player.Recording</visible>
</control>
<control type="button" id="208">
<description>DVD menu button</description>
<posx>10</posx>
<posy>40</posy>
@ -83,14 +65,14 @@
<texturenofocus>osd_button_dvdmenuNF.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>918</onright>
<onup>918</onup>
<ondown>210</ondown>
<onleft>201</onleft>
<onright>206</onright>
<onup>206</onup>
<ondown>201</ondown>
<onclick>XBMC.PlayerControl(ShowVideoMenu)</onclick>
<visible>VideoPlayer.HasMenu</visible>
</control>
<control type="button" id="209">
<control type="button" id="210">
<description>DVD menu button 2</description>
<posx>10</posx>
<posy>40</posy>
@ -100,14 +82,14 @@
<texturenofocus>-</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>921</onright>
<onup>921</onup>
<ondown>211</ondown>
<onleft>200</onleft>
<onright>205</onright>
<onup>205</onup>
<ondown>200</ondown>
<onclick>XBMC.PlayerControl(ShowVideoMenu)</onclick>
<visible>VideoPlayer.HasMenu</visible>
</control>
<control type="button" id="208">
<control type="button" id="209">
<description>Subtitle button</description>
<posx>10</posx>
<posy>40</posy>
@ -117,14 +99,14 @@
<texturenofocus>osd_SubtitleNF.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>918</onright>
<onup>918</onup>
<ondown>210</ondown>
<onleft>201</onleft>
<onright>206</onright>
<onup>206</onup>
<ondown>201</ondown>
<onclick>RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
<visible>!VideoPlayer.HasMenu + !Player.CanRecord + !Player.Recording + Skin.HasSetting(SubtitleScript_Enable)</visible>
</control>
<control type="button" id="209">
<control type="button" id="210">
<description>Subtitle button 2</description>
<posx>10</posx>
<posy>40</posy>
@ -134,34 +116,23 @@
<texturenofocus>-</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>921</onright>
<onup>921</onup>
<ondown>211</ondown>
<onleft>200</onleft>
<onright>205</onright>
<onup>205</onup>
<ondown>200</ondown>
<onclick>RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
<visible>!VideoPlayer.HasMenu + !Player.CanRecord + !Player.Recording + Skin.HasSetting(SubtitleScript_Enable)</visible>
</control>
<control type="image" id="1">
<control type="image">
<description>Panel</description>
<posx>0</posx>
<posy>0</posy>
<height>379</height>
<width>373</width>
<texture>osd_panel.png</texture>
<visible>!VideoPlayer.Content(LiveTV)</visible>
</control>
<control type="image" id="1">
<description>Panel</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>0</posx>
<posy>0</posy>
<height>379</height>
<width>373</width>
<texture>osd_panel_tv.png</texture>
</control>
<control type="button" id="210">
<control type="button" id="200">
<description>Skip Bwd</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>32</posx>
<posy>158</posy>
<width>77</width>
@ -171,31 +142,13 @@
<onclick>XBMC.PlayerControl(Previous)</onclick>
<label>-</label>
<font>-</font>
<onleft>215</onleft>
<onright>211</onright>
<onup>208</onup>
<ondown>919</ondown>
<onleft>204</onleft>
<onright>201</onright>
<onup>210</onup>
<ondown>208</ondown>
</control>
<control type="button" id="210">
<description>Teletext</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>32</posx>
<posy>158</posy>
<width>77</width>
<height>79</height>
<texturefocus>osd_button_txt.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>XBMC.ActivateWindow(Teletext)</onclick>
<label>-</label>
<font>-</font>
<onleft>215</onleft>
<onright>211</onright>
<onup>208</onup>
<ondown>919</ondown>
</control>
<control type="togglebutton" id="211">
<control type="togglebutton" id="201">
<description>Rewind</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>95</posx>
<posy>149</posy>
<width>71</width>
@ -207,35 +160,14 @@
<alttexturenofocus>osd_button_rewSELNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>213</onright>
<onleft>200</onleft>
<onright>202</onright>
<onup>209</onup>
<ondown>920</ondown>
<ondown>207</ondown>
<onclick>XBMC.PlayerControl(Rewind)</onclick>
</control>
<control type="togglebutton" id="211">
<description>TV channel down</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>95</posx>
<posy>149</posy>
<width>71</width>
<height>79</height>
<texturefocus>osd_button_rewFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>-</usealttexture>
<alttexturefocus>osd_button_rewFO.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>213</onright>
<onup>209</onup>
<ondown>920</ondown>
<onclick>XBMC.PlayerControl(Previous)</onclick>
</control>
<control type="togglebutton" id="213">
<control type="togglebutton" id="202">
<description>Play</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>153</posx>
<posy>123</posy>
<width>100</width>
@ -247,55 +179,14 @@
<alttexturenofocus>osd_button_playNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>214</onright>
<onup>921</onup>
<ondown>920</ondown>
<onleft>201</onleft>
<onright>203</onright>
<onup>206</onup>
<ondown>207</ondown>
<onclick>XBMC.PlayerControl(Play)</onclick>
</control>
<control type="togglebutton" id="213">
<description>TV Channels</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>153</posx>
<posy>123</posy>
<width>100</width>
<height>98</height>
<texturefocus>osd_button_channels.png</texturefocus>
<texturenofocus>-</texturenofocus>
<alttexturefocus>osd_button_channels.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<usealttexture>Window.IsActive(PVROSDChannels)</usealttexture>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>214</onright>
<onup>921</onup>
<ondown>920</ondown>
<onclick>XBMC.ActivateWindow(PVROSDChannels)</onclick>
</control>
<control type="togglebutton" id="214">
<description>tv channel up</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>241</posx>
<posy>122</posy>
<width>64</width>
<height>75</height>
<texturefocus>osd_button_ffFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>-</usealttexture>
<alttexturefocus>osd_button_ffFO.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>213</onleft>
<onright>215</onright>
<onup>921</onup>
<ondown>920</ondown>
<onclick>XBMC.PlayerControl(Next)</onclick>
</control>
<control type="togglebutton" id="214">
<control type="togglebutton" id="203">
<description>Fast Forward</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>241</posx>
<posy>122</posy>
<width>64</width>
@ -307,15 +198,14 @@
<alttexturenofocus>osd_button_ffSELNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>213</onleft>
<onright>215</onright>
<onup>921</onup>
<ondown>920</ondown>
<onleft>202</onleft>
<onright>204</onright>
<onup>206</onup>
<ondown>207</ondown>
<onclick>XBMC.PlayerControl(Forward)</onclick>
</control>
<control type="button" id="215">
<control type="button" id="204">
<description>Skip Fwd</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>287</posx>
<posy>112</posy>
<width>71</width>
@ -325,32 +215,12 @@
<onclick>XBMC.PlayerControl(Next)</onclick>
<label>-</label>
<font>-</font>
<onleft>214</onleft>
<onright>210</onright>
<onup>918</onup>
<ondown>919</ondown>
<onleft>203</onleft>
<onright>200</onright>
<onup>205</onup>
<ondown>208</ondown>
</control>
<control type="button" id="215">^
<description>EPG button</description>
<visible>VideoPlayer.Content(LiveTV)</visible>
<posx>287</posx>
<posy>112</posy>
<width>71</width>
<height>72</height>
<texturefocus>osd_button_epg.png</texturefocus>
<texturenofocus>-</texturenofocus>
<alttexturefocus>osd_button_epg.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<usealttexture>Window.IsActive(PVROSDGuide)</usealttexture>
<onclick>XBMC.ActivateWindow(PVROSDGuide)</onclick>
<label>-</label>
<font>-</font>
<onleft>214</onleft>
<onright>210</onright>
<onup>918</onup>
<ondown>919</ondown>
</control>
<control type="togglebutton" id="918">
<control type="togglebutton" id="205">
<description>Audio Menu</description>
<posx>138</posx>
<posy>16</posy>
@ -364,12 +234,12 @@
<onclick>XBMC.ActivateWindow(124)</onclick>
<label>-</label>
<font>-</font>
<onleft>208</onleft>
<onright>215</onright>
<onup>919</onup>
<ondown>921</ondown>
<onleft>210</onleft>
<onright>204</onright>
<onup>208</onup>
<ondown>206</ondown>
</control>
<control type="togglebutton" id="921">
<control type="togglebutton" id="206">
<description>Video Menu</description>
<posx>147</posx>
<posy>71</posy>
@ -384,11 +254,11 @@
<label>-</label>
<font>-</font>
<onleft>209</onleft>
<onright>214</onright>
<onup>918</onup>
<ondown>213</ondown>
<onright>203</onright>
<onup>205</onup>
<ondown>202</ondown>
</control>
<control type="button" id="920">
<control type="button" id="207">
<description>stop</description>
<posx>180</posx>
<posy>214</posy>
@ -399,14 +269,13 @@
<onclick>XBMC.PlayerControl(Stop)</onclick>
<label>-</label>
<font>-</font>
<onleft>211</onleft>
<onright>214</onright>
<onup>213</onup>
<ondown>919</ondown>
<onleft>201</onleft>
<onright>203</onright>
<onup>202</onup>
<ondown>208</ondown>
</control>
<control type="togglebutton" id="919">
<control type="togglebutton" id="208">
<description>Bookmarks Menu</description>
<visible>!VideoPlayer.Content(LiveTV)</visible>
<posx>195</posx>
<posy>268</posy>
<width>84</width>
@ -419,31 +288,251 @@
<onclick>XBMC.ActivateWindow(125)</onclick>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>215</onright>
<onup>920</onup>
<ondown>918</ondown>
<onleft>200</onleft>
<onright>204</onright>
<onup>207</onup>
<ondown>205</ondown>
</control>
</control>
<control type="togglebutton" id="919">
<description>Portal Menu</description>
<control type="group" id="102">
<!-- Buttons for PVR mode -->
<defaultcontrol>302</defaultcontrol>
<visible>VideoPlayer.Content(LiveTV)</visible>
<control type="button" id="309">
<description>REC button</description>
<posx>10</posx>
<posy>40</posy>
<width>128</width>
<height>128</height>
<texturefocus>osd_button_rec.png</texturefocus>
<texturenofocus>osd_button_recNF.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>301</onleft>
<onright>306</onright>
<onup>306</onup>
<ondown>301</ondown>
<onclick>XBMC.PlayerControl(record)</onclick>
<visible>Player.CanRecord</visible>
</control>
<control type="button" id="310">
<description>REC button 2</description>
<posx>10</posx>
<posy>40</posy>
<width>128</width>
<height>128</height>
<texturefocus>-</texturefocus>
<texturenofocus>osd_button_rec2.png</texturenofocus>
<label>-</label>
<font>-</font>
<onleft>300</onleft>
<onright>305</onright>
<onup>305</onup>
<ondown>300</ondown>
<onclick>XBMC.PlayerControl(record)</onclick>
<visible>Player.CanRecord + Player.Recording</visible>
</control>
<control type="image">
<description>Panel</description>
<posx>0</posx>
<posy>0</posy>
<height>379</height>
<width>373</width>
<texture>osd_panel_pvr.png</texture>
</control>
<control type="button" id="300">
<description>EPG Guide</description>
<posx>32</posx>
<posy>158</posy>
<width>77</width>
<height>79</height>
<texturefocus>osd_button_pvr_epgFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>Window.IsActive(PVROSDGuide)</usealttexture>
<alttexturefocus>osd_button_pvr_epgFO.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<onclick>XBMC.ActivateWindow(PVROSDGuide)</onclick>
<label>-</label>
<font>-</font>
<onleft>304</onleft>
<onright>301</onright>
<onup>310</onup>
<ondown>308</ondown>
</control>
<control type="togglebutton" id="301">
<description>Rewind</description>
<posx>95</posx>
<posy>149</posy>
<width>71</width>
<height>79</height>
<texturefocus>osd_button_rewFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>Player.Rewinding</usealttexture>
<alttexturefocus>osd_button_rewFO.png</alttexturefocus>
<alttexturenofocus>osd_button_rewSELNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>300</onleft>
<onright>302</onright>
<onup>309</onup>
<ondown>311</ondown>
<onclick>XBMC.PlayerControl(Rewind)</onclick>
</control>
<control type="togglebutton" id="302">
<description>Play</description>
<posx>153</posx>
<posy>123</posy>
<width>100</width>
<height>98</height>
<texturefocus>osd_button_pauseFO.png</texturefocus>
<texturenofocus>osd_button_pauseNF.png</texturenofocus>
<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
<alttexturefocus>osd_button_playFO.png</alttexturefocus>
<alttexturenofocus>osd_button_playNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>301</onleft>
<onright>303</onright>
<onup>306</onup>
<ondown>307</ondown>
<onclick>XBMC.PlayerControl(Play)</onclick>
</control>
<control type="togglebutton" id="303">
<description>Fast Forward</description>
<posx>241</posx>
<posy>122</posy>
<width>64</width>
<height>75</height>
<texturefocus>osd_button_ffFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>Player.Forwarding</usealttexture>
<alttexturefocus>osd_button_ffFO.png</alttexturefocus>
<alttexturenofocus>osd_button_ffSELNF.png</alttexturenofocus>
<label>-</label>
<font>-</font>
<onleft>302</onleft>
<onright>304</onright>
<onup>306</onup>
<ondown>312</ondown>
<onclick>XBMC.PlayerControl(Forward)</onclick>
</control>
<control type="button" id="304">
<description>Teletext</description>
<posx>287</posx>
<posy>112</posy>
<width>71</width>
<height>72</height>
<texturefocus>osd_button_pvr_teletextFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>back</onclick>
<onclick>XBMC.PlayerControl(Teletext)</onclick>
<label>-</label>
<font>-</font>
<onleft>303</onleft>
<onright>300</onright>
<onup>305</onup>
<ondown>308</ondown>
</control>
<control type="togglebutton" id="305">
<description>Channels list</description>
<posx>138</posx>
<posy>16</posy>
<width>74</width>
<height>64</height>
<texturefocus>osd_button_pvr_channelsFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<usealttexture>Window.IsActive(PVROSDChannels)</usealttexture>
<alttexturefocus>osd_button_pvr_channelsFO.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<onclick>XBMC.ActivateWindow(PVROSDChannels)</onclick>
<label>-</label>
<font>-</font>
<onleft>310</onleft>
<onright>304</onright>
<onup>308</onup>
<ondown>306</ondown>
</control>
<control type="button" id="306">
<description>channel up</description>
<posx>147</posx>
<posy>71</posy>
<width>75</width>
<height>62</height>
<texturefocus>osd_button_pvr_channelupFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>XBMC.PlayerControl(Previous)</onclick>
<label>-</label>
<font>-</font>
<onleft>309</onleft>
<onright>303</onright>
<onup>305</onup>
<ondown>302</ondown>
</control>
<control type="button" id="307">
<description>channel down</description>
<posx>180</posx>
<posy>214</posy>
<width>83</width>
<height>69</height>
<texturefocus>osd_button_pvr_channeldownFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>XBMC.PlayerControl(Next)</onclick>
<label>-</label>
<font>-</font>
<onleft>311</onleft>
<onright>312</onright>
<onup>302</onup>
<ondown>308</ondown>
</control>
<control type="button" id="308">
<description>stop</description>
<posx>195</posx>
<posy>268</posy>
<width>84</width>
<height>78</height>
<texturefocus>osd_button_portal.png</texturefocus>
<texturefocus>osd_button_pvr_stopFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<alttexturefocus>osd_button_portal.png</alttexturefocus>
<alttexturenofocus>-</alttexturenofocus>
<usealttexture>Window.IsActive(PVROSDDirector)</usealttexture>
<onclick>XBMC.ActivateWindow(PVROSDDirector)</onclick>
<onclick>XBMC.PlayerControl(Stop)</onclick>
<label>-</label>
<font>-</font>
<onleft>210</onleft>
<onright>215</onright>
<onup>920</onup>
<ondown>918</ondown>
<onleft>300</onleft>
<onright>304</onright>
<onup>307</onup>
<ondown>305</ondown>
</control>
<control type="button" id="311">
<description>Audio Settings</description>
<posx>116</posx>
<posy>224</posy>
<width>71</width>
<height>57</height>
<texturefocus>osd_button_pvr_audioFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>ActivateWindow(OSDAudioSettings)</onclick>
<label>-</label>
<font>-</font>
<onleft>311</onleft>
<onright>307</onright>
<onup>301</onup>
<ondown>311</ondown>
</control>
<control type="button" id="312">
<description>Video Settings</description>
<posx>250</posx>
<posy>194</posy>
<width>55</width>
<height>68</height>
<texturefocus>osd_button_pvr_videoFO.png</texturefocus>
<texturenofocus>-</texturenofocus>
<onclick>ActivateWindow(OSDVideoSettings)</onclick>
<label>-</label>
<font>-</font>
<onleft>307</onleft>
<onright>312</onright>
<onup>303</onup>
<ondown>312</ondown>
</control>
</control>
</control>
</controls>
</window>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
media/osd_panel_pvr.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB