Skip to content
This repository has been archived by the owner on Feb 20, 2022. It is now read-only.

Commit

Permalink
pvrosdguide
Browse files Browse the repository at this point in the history
  • Loading branch information
jurialmunkey committed Jan 8, 2015
1 parent 67239f0 commit f9ccc7b
Show file tree
Hide file tree
Showing 9 changed files with 159 additions and 11 deletions.
124 changes: 124 additions & 0 deletions 1080i/DialogPVRGuideOSD.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Foundation -->
<window>
<defaultcontrol always="true">11</defaultcontrol>

<controls>

<control type="group">
<visible>!Window.IsActive(DialogPVRGuideInfo.xml)</visible>
<include>Animation.SlideOpen.Right</include>
<control type="image">
<posx>-1</posx>
<posy>-1</posy>
<width>668</width>
<height>1082</height>
<texture colordiffuse="PanelBG" border="5">common/white.png</texture>
<bordertexture colordiffuse="PosterBorder" border="5">common/border-inner.png</bordertexture>
<bordersize>1</bordersize>
<animation effect="fade" start="100" end="90" condition="true">Conditional</animation>
</control>
<control type="image">
<posx>562</posx>
<posy>28</posy>
<width>64</width>
<height>64</height>
<texture>$INFO[VideoPlayer.Thumb]</texture>
</control>
<control type="label">
<posx>33</posx>
<posy>10</posy>
<width>400</width>
<align>left</align>
<textcolor>PanelFG</textcolor>
<font>Font-SettingsCategory</font>
<label>$INFO[VideoPlayer.ChannelName]</label>
</control>
<control type="label">
<posx>33</posx>
<posy>43</posy>
<width>400</width>
<align>left</align>
<textcolor>PanelFG</textcolor>
<font>Font-ListInfo</font>
<label>$INFO[System.Time,, ]$INFO[System.Date]</label>
</control>

<control type="list" id="11">
<posx>11</posx>
<posy>120</posy>
<height>980</height>
<width>645</width>
<orientation>vertical</orientation>
<itemlayout height="120" width="645">
<control type="image">
<width>645</width>
<height>109</height>
<texture>common/selected.png</texture>
<aspectratio aligny="top">center</aspectratio>
<animation effect="fade" start="100" end="10" condition="true">Conditional</animation>
<visible>ListItem.IsPlaying</visible>
<colordiffuse>PanelFG</colordiffuse>
</control>
<control type="label">
<left>22</left>
<right>22</right>
<posy>5</posy>
<align>left</align>
<textcolor>PanelFG-NF</textcolor>
<selectedcolor>PanelFG-NF</selectedcolor>
<font>Font-SettingsCategory</font>
<label>$INFO[ListItem.Title]</label>
</control>
<control type="label">
<posy>40</posy>
<left>22</left>
<right>22</right>
<align>left</align>
<font>Font-ListInfo</font>
<textcolor>PanelFG-NF</textcolor>
<selectedcolor>PanelFG-NF</selectedcolor>
<label>$INFO[ListItem.StartTime,, ]</label>
</control>
</itemlayout>
<focusedlayout height="120" width="645">
<control type="image">
<width>645</width>
<height>109</height>
<texture colordiffuse="PosterBorder" border="5">common/border-inner.png</texture>
</control>
<control type="image">
<width>645</width>
<height>109</height>
<texture>common/selected.png</texture>
<aspectratio aligny="top">center</aspectratio>
<animation effect="fade" start="100" end="10" condition="true">Conditional</animation>
<visible>ListItem.IsPlaying</visible>
</control>
<control type="label">
<left>22</left>
<right>22</right>
<posy>5</posy>
<align>left</align>
<textcolor>Selected</textcolor>
<selectedcolor>Selected</selectedcolor>
<font>Font-SettingsCategory</font>
<label>$INFO[ListItem.Title]</label>
</control>
<control type="label">
<posy>40</posy>
<left>22</left>
<right>22</right>
<align>left</align>
<font>Font-ListInfo</font>
<textcolor>Selected</textcolor>
<selectedcolor>Selected</selectedcolor>
<label>$INFO[ListItem.StartTime,, ]</label>
</control>
</focusedlayout>

</control>
</control>
</controls>

</window>
8 changes: 4 additions & 4 deletions 1080i/DialogSeekBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<include>Animation.FadeOut</include>
<texture colordiffuse="Background">common/white.png</texture>
<animation effect="fade" start="100" end="90" condition="true">Conditional</animation>
<visible>Window.IsVisible(DialogSelect.xml)</visible>
<visible>Window.IsVisible(DialogSelect.xml) | Window.IsVisible(DialogPVRGuideInfo.xml)</visible>
</control>
<control type="group">
<animation effect="fade" start="0" end="100" time="250">VisibleChange</animation>
<visible>!Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Player.ShowInfo | Window.IsActive(DialogPVRGuideInfo.xml) | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsActive(VideoOSDSettings.xml) | Window.IsActive(VideoOSDBookmarks.xml) | Window.IsActive(DialogKaiToast.xml)]</visible>
<visible>!Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(DialogPVRGuideOSD.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Player.ShowInfo | Window.IsActive(DialogPVRGuideInfo.xml) | Window.IsActive(DialogFullScreenInfo.xml) | Window.IsActive(VideoOSDSettings.xml) | Window.IsActive(VideoOSDBookmarks.xml) | Window.IsActive(DialogKaiToast.xml)]</visible>
<include>GlobalVignette</include>
</control>

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

<control type="group">
<visible>!Window.IsVisible(DialogPVRChannelsOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(musicosd) | Window.IsActive(videoosd) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml)]</visible>
<visible>!Window.IsVisible(DialogPVRChannelsOSD.xml) + !Window.IsVisible(DialogPVRGuideOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(musicosd) | Window.IsActive(videoosd) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml)]</visible>
<animation effect="fade" start="0" end="100" time="200">Visible</animation>
<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
<posy>1080</posy>
Expand Down Expand Up @@ -563,7 +563,7 @@
</control>

<control type="group">
<visible>!Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml)]</visible>
<visible>!Window.IsVisible(DialogSlider.xml) + !Window.IsVisible(DialogPVRChannelsOSD.xml) + !Window.IsVisible(DialogPVRGuideOSD.xml) + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Player.ShowInfo | Window.IsActive(DialogFullScreenInfo.xml)] | Window.IsActive(DialogPVRGuideInfo.xml)</visible>
<animation type="Visible">
<effect type="slide" start="0,-24" end="0" time="200"/>
<effect type="fade" start="0" end="100" time="200"/>
Expand Down
7 changes: 4 additions & 3 deletions 1080i/Includes_Header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
<control type="group">
<posx>400r</posx>
<visible>!Window.IsActive(DialogExtendedProgressBar.xml)</visible>
<visible>!Skin.HasSetting(disable.clockheader)</visible>
<include>Animation.HeaderDialog</include>
<animation effect="slide" start="0" end="92" condition="Skin.HasSetting(disable.weatherheader)">Conditional</animation>
<control type="label">
Expand Down Expand Up @@ -362,7 +363,7 @@
<visible>!Skin.HasSetting(disable.weatherheader)</visible>
</control>
<control type="label">
<posx>220</posx>
<posx>270</posx>
<posy>25</posy>
<width>300</width>
<height>100</height>
Expand All @@ -371,9 +372,9 @@
<aligny>top</aligny>
<label>$INFO[System.Time(hh:mm)]</label>
<textcolor>$VAR[TopBarMainLabel]</textcolor>
<animation effect="slide" start="0" end="50" condition="IsEmpty(Control.GetLabel(9999))">Conditional</animation>
<animation effect="slide" start="0" end="-58" condition="!IsEmpty(Control.GetLabel(9998))">Conditional</animation>
</control>
<control type="label" id="9999">
<control type="label" id="9998">
<posx>270</posx>
<posy>71</posy>
<width>100</width>
Expand Down
6 changes: 2 additions & 4 deletions 1080i/Includes_OSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,15 @@
<label>19019</label>
<include>DefOSDControls</include>
<include>DefOSDUpDown</include>
<onclick>ActivateWindowAndFocus(mypvr,32,0,11,0)</onclick>
<onclick>ActivateWindow(TVChannels)</onclick>
</control>

<control type="button" id="5">
<description>EPG</description>
<label>19032</label>
<include>DefOSDControls</include>
<include>DefOSDUpDown</include>
<onclick>ActivateWindow(mypvr)</onclick>
<onclick>SetFocus(31)</onclick>
<onclick>SetFocus(10)</onclick>
<onclick>ActivateWindow(TVGuide)</onclick>
</control>

<control type="button" id="6">
Expand Down
11 changes: 11 additions & 0 deletions 1080i/SkinSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -817,13 +817,24 @@
<texturefocus border="12" colordiffuse="PosterHighlight">common/white.png</texturefocus>
</control>

<control type="radiobutton" id="821" description="Disable Clock">
<label>31286</label>
<align>left</align>
<font>Font-ListInfo</font>
<onclick>Skin.ToggleSetting(disable.clockheader)</onclick>
<selected>!Skin.HasSetting(disable.clockheader)</selected>
<visible>ControlGroup(3).HasFocus(35)</visible>
<texturefocus border="12" colordiffuse="PosterHighlight">common/white.png</texturefocus>
</control>

<control type="radiobutton" id="808" description="Disable Weather in Clock">
<label>31177</label>
<align>left</align>
<font>Font-ListInfo</font>
<onclick>Skin.ToggleSetting(disable.weatherheader)</onclick>
<selected>!Skin.HasSetting(disable.weatherheader)</selected>
<visible>ControlGroup(3).HasFocus(35)</visible>
<enable>!Skin.HasSetting(disable.clockheader)</enable>
<texturefocus border="12" colordiffuse="PosterHighlight">common/white.png</texturefocus>
</control>

Expand Down
1 change: 1 addition & 0 deletions 1080i/VideoOSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<posy>8</posy>
<!--<animation effect="slide" end="0,-280" time="200" condition="!IsEmpty(Window(seekbar).Property(fullscreeninfo)) + [Window.IsActive(videoosd) | Window.IsActive(DialogFullScreenInfo.xml)]">Conditional</animation>-->
<visible>!Window.IsVisible(DialogPVRChannelsOSD.xml)</visible>
<visible>!Window.IsVisible(DialogPVRGuideOSD.xml)</visible>
<animation type="WindowOpen" reversible="false">
<effect type="slide" start="0,64" end="0" time="200"/>
<effect type="fade" start="0" end="100" delay="150" time="200"/>
Expand Down
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[B]1.1.9[/B]
Add more hub option presets
Add OSD PVR Guide

[B]1.1.8[/B]
Kaitoast changes
Expand Down
4 changes: 4 additions & 0 deletions language/English/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -751,3 +751,7 @@ msgstr ""
msgctxt "#31285"
msgid "Premiere Date"
msgstr ""

msgctxt "#31286"
msgid "Disable clock"
msgstr ""
8 changes: 8 additions & 0 deletions language/English/strings.po~
Original file line number Diff line number Diff line change
Expand Up @@ -747,3 +747,11 @@ msgstr ""
msgctxt "#31284"
msgid "Show extended info at bottom of screen"
msgstr ""

msgctxt "#31285"
msgid "Premiere Date"
msgstr ""

msgctxt "#31286"
msgid "Disable Clock"
msgstr ""

0 comments on commit f9ccc7b

Please sign in to comment.