From f9ccc7b34b4ad677a5aad07c52de2053e090a053 Mon Sep 17 00:00:00 2001
From: jurialmunkey <jurial_munkey@hotmail.com>
Date: Thu, 8 Jan 2015 19:36:52 +1100
Subject: [PATCH] pvrosdguide

---
 1080i/DialogPVRGuideOSD.xml  | 124 +++++++++++++++++++++++++++++++++++
 1080i/DialogSeekBar.xml      |   8 +--
 1080i/Includes_Header.xml    |   7 +-
 1080i/Includes_OSD.xml       |   6 +-
 1080i/SkinSettings.xml       |  11 ++++
 1080i/VideoOSD.xml           |   1 +
 changelog.txt                |   1 +
 language/English/strings.po  |   4 ++
 language/English/strings.po~ |   8 +++
 9 files changed, 159 insertions(+), 11 deletions(-)
 create mode 100644 1080i/DialogPVRGuideOSD.xml

diff --git a/1080i/DialogPVRGuideOSD.xml b/1080i/DialogPVRGuideOSD.xml
new file mode 100644
index 0000000..a475d1e
--- /dev/null
+++ b/1080i/DialogPVRGuideOSD.xml
@@ -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>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index b725c64..904a4a9 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -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>
 
@@ -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>
@@ -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"/>
diff --git a/1080i/Includes_Header.xml b/1080i/Includes_Header.xml
index 8ffb2e2..aa18bec 100644
--- a/1080i/Includes_Header.xml
+++ b/1080i/Includes_Header.xml
@@ -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">
@@ -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>
@@ -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>
diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
index 67dce1a..d53f25d 100644
--- a/1080i/Includes_OSD.xml
+++ b/1080i/Includes_OSD.xml
@@ -97,7 +97,7 @@
             <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">
@@ -105,9 +105,7 @@
             <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">
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index fb8ec11..00a3cc9 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -817,6 +817,16 @@
                     <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>
@@ -824,6 +834,7 @@
                     <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>
                 
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 5a2d975..be7e321 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -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"/>
diff --git a/changelog.txt b/changelog.txt
index ecbef0e..0c44299 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -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
diff --git a/language/English/strings.po b/language/English/strings.po
index 836d58f..4fb9143 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -751,3 +751,7 @@ msgstr ""
 msgctxt "#31285"
 msgid "Premiere Date"
 msgstr ""
+
+msgctxt "#31286"
+msgid "Disable clock"
+msgstr ""
diff --git a/language/English/strings.po~ b/language/English/strings.po~
index a7d533a..b63739c 100644
--- a/language/English/strings.po~
+++ b/language/English/strings.po~
@@ -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 ""