From ffeb54c4f731cbca20746207cc50a83fbbb732e9 Mon Sep 17 00:00:00 2001
From: jurialmunkey <jurialmunkey@kodi.tv>
Date: Wed, 17 Jul 2019 20:25:26 +1000
Subject: [PATCH] pvr info update

---
 1080i/DialogPVRInfo.xml         | 256 ++++++++++++++++----------------
 1080i/Includes_Defs.xml         |   2 +-
 1080i/Includes_Labels.xml       |   7 +-
 1080i/Includes_Object.xml       |  22 ++-
 1080i/Includes_View_50_List.xml |   7 +-
 addon.xml                       |   2 +-
 changelog.txt                   |   3 +
 7 files changed, 162 insertions(+), 137 deletions(-)

diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml
index d1f548d8..d946de29 100644
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@@ -2,142 +2,140 @@
 <window id="2003">
     <defaultcontrol always="true">9000</defaultcontrol>
     <controls>
-        <include>Global_Overlay</include>
+
+        <!-- Top Info -->
         <control type="group">
-            <include content="Dialog_Standard_Group">
-                <param name="width" value="1400" />
-                <param name="height" value="650" />
+            <animation effect="fade" condition="Window.IsVisible(Home.xml)" time="1" delay="350" start="0" end="100">WindowOpen</animation>
+            <control type="group">
+                <visible>Window.IsVisible(fullscreenvideo)</visible>
+                <include>Global_Background</include>
+            </control>
+            <include content="Topbar">
+                <param name="info_hide" value="false" />
             </include>
+        </control>
 
-            <control type="label" id="2">
-                <include>Dialog_Standard_Header</include>
-                <label>$INFO[ListItem.EpgEventTitle]$INFO[ListItem.EpisodeName, - ,]</label>
-            </control>
-            <control type="grouplist">
-                <left>30</left>
-                <top>100</top>
-                <right>60</right>
-                <include>Dialog_Info_Details_Grouplist</include>
-                <!-- Start Time -->
-                <control type="group">
-                    <height>50</height>
-                    <control type="label">
-                        <left>0</left>
-                        <width>160</width>
-                        <align>right</align>
-                        <textcolor>dialog_fg_30</textcolor>
-                        <font>font_small</font>
-                        <label>19126</label>
-                        <aligny>top</aligny>
-                    </control>
-                    <control type="label">
-                        <left>176</left>
-                        <textcolor>dialog_fg_70</textcolor>
-                        <font>font_small</font>
-                        <aligny>top</aligny>
-                        <label fallback="19055">$INFO[ListItem.StartDate] - $INFO[ListItem.StartTime]</label>
-                    </control>
-                </control>
-                <!-- End Time -->
-                <control type="group">
-                    <height>50</height>
-                    <control type="label">
-                        <left>0</left>
-                        <width>160</width>
-                        <align>right</align>
-                        <textcolor>dialog_fg_30</textcolor>
-                        <font>font_small</font>
-                        <label>19127</label>
-                        <aligny>top</aligny>
-                    </control>
-                    <control type="label">
-                        <left>176</left>
-                        <textcolor>dialog_fg_70</textcolor>
-                        <font>font_small</font>
-                        <aligny>top</aligny>
-                        <label fallback="19055">$INFO[ListItem.EndDate] - $INFO[ListItem.EndTime]</label>
-                    </control>
-                </control>
-                <!-- Channel Name -->
-                <control type="group">
-                    <height>50</height>
-                    <control type="label">
-                        <left>0</left>
-                        <width>160</width>
-                        <align>right</align>
-                        <textcolor>dialog_fg_30</textcolor>
-                        <font>font_small</font>
-                        <label>19029</label>
-                        <aligny>top</aligny>
-                    </control>
-                    <control type="label">
-                        <left>176</left>
-                        <textcolor>dialog_fg_70</textcolor>
-                        <font>font_small</font>
-                        <aligny>top</aligny>
-                        <label fallback="19055">$INFO[ListItem.ChannelName]$INFO[ListItem.ChannelNumber, (,)]</label>
-                    </control>
-                </control>
-                <!-- Plot -->
-                <control type="group">
-                    <height>250</height>
-                    <control type="label">
-                        <left>0</left>
-                        <width>160</width>
-                        <align>right</align>
-                        <textcolor>dialog_fg_30</textcolor>
-                        <font>font_small</font>
-                        <label>21821</label>
-                        <aligny>top</aligny>
-                    </control>
-                    <control type="textbox">
-                        <left>176</left>
-                        <textcolor>dialog_fg_70</textcolor>
-                        <font>font_plotbox</font>
-                        <aligny>top</aligny>
-                        <label fallback="19055">$INFO[ListItem.Plot]</label>
-                    </control>
-                </control>
-            </control>
-            <!-- Buttons -->
+        <!-- Main Group -->
+        <control type="group">
+            <top>view_top</top>
+            <left>view_pad</left>
+            <right>view_pad</right>
+            <visible allowhiddenfocus="true">!$EXP[Exp_HideFurniture]</visible>
+            <include>Animation_FadeInOut</include>
             <control type="grouplist" id="9000">
-                <left>30</left>
-                <right>30</right>
-                <align>center</align>
-                <bottom>20</bottom>
-                <height>item_list_height</height>
-                <orientation>horizontal</orientation>
-                <itemgap>14</itemgap>
-                <control type="button" id="4">
-                    <label>19003</label>
-                    <include>Dialog_Info_Buttons</include>
-                    <visible>Window.IsActive(PVRGuideInfo)</visible>
-                </control>
-                <control type="button" id="5">
-                    <label>19165</label>
-                    <include>Dialog_Info_Buttons</include>
-                    <visible>Window.IsActive(PVRGuideInfo)</visible>
-                </control>
-                <control type="button" id="6">
-                    <include>Dialog_Info_Buttons</include>
-                    <visible>Window.IsActive(PVRGuideInfo)</visible>
-                </control>
-                <control type="button" id="8">
-                    <label>19687</label>
-                    <include>Dialog_Info_Buttons</include>
-                    <visible>Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo)</visible>
-                </control>
-                <control type="button" id="10">
-                    <label>$LOCALIZE[19190]</label>
-                    <include>Dialog_Info_Buttons</include>
-                    <visible>Window.IsActive(PVRGuideInfo)</visible>
-                </control>
-                <control type="button" id="7">
-                    <label>186</label>
-                    <include>Dialog_Info_Buttons</include>
+                <top>-15</top>
+                <left>-15</left>
+                <right>-15</right>
+                <height>view_height</height>
+                <orientation>vertical</orientation>
+                <itemgap>0</itemgap>
+                <scrolltime tween="quadratic">400</scrolltime>
+                <control type="group" id="3000">
+                    <height>view_height</height>
+                    <control type="group">
+                        <top>15</top>
+                        <left>15</left>
+                        <right>15</right>
+                        <height>view_list_height</height>
+                        <!-- Poster -->
+                        <control type="group">
+                            <include>Animation_Left_Delay</include>
+                            <include content="View_50_Poster">
+                                <param name="include" value="Defs_Null" />
+                                <param name="visible" value="true" />
+                                <param name="height" value="654" />
+                                <param name="width" value="654" />
+                                <param name="bordersize" value="90" />
+                                <param name="aspectratio" value="keep" />
+                                <param name="diffuse" value="diffuse/square-big.png" />
+                            </include>
+                            <include content="View_50_Info">
+                                <param name="label" value="$INFO[ListItem.ChannelName]" />
+                                <param name="label2" value="$INFO[ListItem.ChannelNumberLabel,Channel ,]" />
+                            </include>
+                        </control>
+
+                        <!-- Info -->
+                        <control type="group">
+                            <top>-15</top>
+                            <left>669</left>
+                            <include>Animation_Right_Delay</include>
+                            <control type="grouplist">
+                                <orientation>vertical</orientation>
+                                <usecontrolcoords>true</usecontrolcoords>
+                                <itemgap>0</itemgap>
+                                <include content="Object_Info_Title">
+                                    <param name="label" value="$VAR[Label_MainTitle]" />
+                                </include>
+                                <include content="Object_Info_Line">
+                                    <param name="label" value="$VAR[Label_SubTitle]" />
+                                </include>
+                                <include content="Object_Info_Plot">
+                                    <param name="maxheight" value="360" />
+                                </include>
+                                <control type="group">
+                                    <height>16</height>
+                                </control>
+                                <include>Object_Info_Details_PVR</include>
+                            </control>
+                            <control type="grouplist" id="300">
+                                <onup>50</onup>
+                                <include>Defs_ButtonList</include>
+                                <!-- Switch -->
+                                <include content="Object_Info_Button">
+                                    <param name="width" value="128" />
+                                    <param name="id" value="5" />
+                                    <param name="groupid" value="8005" />
+                                    <param name="label" value="$LOCALIZE[19165]" />
+                                    <param name="icon" value="special://skin/extras/icons/signpost.png" />
+                                    <param name="visible" value="Control.IsVisible(5) + Window.IsActive(PVRGuideInfo)" />
+                                </include>
+                                <!-- Switch -->
+                                <include content="Object_Info_Button">
+                                    <param name="width" value="128" />
+                                    <param name="id" value="6" />
+                                    <param name="groupid" value="8006" />
+                                    <param name="label" value="$INFO[Control.GetLabel(6)]" />
+                                    <param name="icon" value="special://skin/extras/icons/alarm.png" />
+                                    <param name="visible" value="Control.IsVisible(6) + Window.IsActive(PVRGuideInfo)" />
+                                </include>
+                                <!-- Switch -->
+                                <include content="Object_Info_Button">
+                                    <param name="width" value="128" />
+                                    <param name="id" value="8" />
+                                    <param name="groupid" value="8008" />
+                                    <param name="label" value="Play" />
+                                    <param name="icon" value="special://skin/extras/icons/database.png" />
+                                    <param name="visible" value="Control.IsVisible(8) + [Window.IsActive(PVRGuideInfo) | Window.IsActive(PVRRecordingInfo)]" />
+                                </include>
+                                <!-- Switch -->
+                                <include content="Object_Info_Button">
+                                    <param name="width" value="128" />
+                                    <param name="id" value="10" />
+                                    <param name="groupid" value="8010" />
+                                    <param name="label" value="Play" />
+                                    <param name="icon" value="special://skin/extras/icons/play3.png" />
+                                    <param name="visible" value="Control.IsVisible(10) + Window.IsActive(PVRGuideInfo)" />
+                                </include>
+                                <!-- Similar -->
+                                <include content="Object_Info_Button">
+                                    <param name="width" value="128" />
+                                    <param name="id" value="4" />
+                                    <param name="groupid" value="8004" />
+                                    <param name="label" value="Similar" />
+                                    <param name="icon" value="special://skin/extras/icons/search.png" />
+                                    <param name="visible" value="Control.IsVisible(4) + Window.IsActive(PVRGuideInfo)" />
+                                </include>
+                            </control>
+                        </control>
+                    </control>
                 </control>
             </control>
         </control>
+
+       
+        <include>Object_PlotOverlay</include>
+
     </controls>
 
 </window>
diff --git a/1080i/Includes_Defs.xml b/1080i/Includes_Defs.xml
index bfa307d7..5cc73510 100644
--- a/1080i/Includes_Defs.xml
+++ b/1080i/Includes_Defs.xml
@@ -193,7 +193,7 @@
     </include>
 
     <include name="Defs_InfoDialog_Visible">
-        <visible>!Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(DialogMusicInfo.xml) + !Window.IsVisible(DialogAddonInfo.xml) + !Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) + !Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) + !Window.IsVisible(1140)</visible>
+        <visible>!Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(DialogMusicInfo.xml) + !Window.IsVisible(DialogAddonInfo.xml) + !Window.IsVisible(script-script.extendedinfo-DialogVideoInfo.xml) + !Window.IsVisible(script-script.extendedinfo-DialogInfo.xml) + !Window.IsVisible(1140) + !Window.IsVisible(DialogPVRInfo.xml)</visible>
     </include>
 
     <!-- Options Menu -->
diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml
index 89bbed6f..277887e6 100644
--- a/1080i/Includes_Labels.xml
+++ b/1080i/Includes_Labels.xml
@@ -109,6 +109,7 @@
         <value condition="Window.IsVisible(MyPVRSearch.xml)">[CAPITALIZE]$LOCALIZE[10704][/CAPITALIZE]</value>
         <value condition="Window.IsVisible(FileManager.xml)">[CAPITALIZE]$LOCALIZE[7][/CAPITALIZE]</value>
         <value condition="Window.IsVisible(Home.xml)">$LOCALIZE[10000]</value>
+        <value condition="Window.IsVisible(DialogPVRInfo.xml)">$LOCALIZE[19180]</value>
     </variable>
 
     <variable name="Label_OSD_Time">
@@ -296,11 +297,11 @@
 
         <value condition="Container.Content(images) + !String.IsEmpty(ListItem.Size)">$INFO[ListItem.PictureDate ,[COLOR=main_fg_100],[/COLOR]  |  ]$INFO[ListItem.PictureResolution ,[COLOR=main_fg_100],[/COLOR]  |  ]$INFO[ListItem.Size,[COLOR=main_fg_100],[/COLOR]]</value>
 
-        <value condition="Container.Content(seasons) + !String.IsEmpty(ListItem.Episode)">$INFO[ListItem.Property(WatchedEpisodes),$LOCALIZE[16102] , $LOCALIZE[20163] ]$INFO[ListItem.Episode,, $LOCALIZE[20453]]</value>
+        <value condition="Container.Content(seasons) + !String.IsEmpty(ListItem.Episode)">$INFO[ListItem.Property(WatchedEpisodes),[COLOR=main_fg_100]$LOCALIZE[16102] , $LOCALIZE[20163][/COLOR] ]$INFO[ListItem.Episode,[COLOR=main_fg_100], $LOCALIZE[20453][/COLOR]]</value>
 
-        <value condition="Container.Content(episodes)">$INFO[ListItem.Studio,,  ]$INFO[ListItem.Premiered]</value>
+        <value condition="Container.Content(episodes)">$INFO[ListItem.Studio,[COLOR=main_fg_100],[/COLOR]  ]$INFO[ListItem.Premiered,[COLOR=main_fg_100],[/COLOR]]</value>
 
-        <value condition="!String.IsEmpty(ListItem.Genre)">$INFO[ListItem.Genre]</value>
+        <value condition="!String.IsEmpty(ListItem.Genre)">$INFO[ListItem.Genre,[COLOR=main_fg_100],[/COLOR]]</value>
 
         <value>[COLOR=main_fg_100]$LOCALIZE[19055][/COLOR]</value>
     </variable>
diff --git a/1080i/Includes_Object.xml b/1080i/Includes_Object.xml
index 9c120bdf..ab8ce2ce 100644
--- a/1080i/Includes_Object.xml
+++ b/1080i/Includes_Object.xml
@@ -607,6 +607,26 @@
         </include>
     </include>
 
+    <include name="Object_Info_Details_PVR">
+        <include content="Object_Info_TextPairs">
+            <param name="pad" value="24" />
+            <param name="name" value="Date" />
+            <param name="label" value="ListItem.StartDate" />
+        </include>
+        <include content="Object_Info_TextPairs">
+            <param name="pad" value="24" />
+            <param name="name" value="Time" />
+            <param name="label" value="ListItem.StartTime" />
+            <param name="label2" value="$INFO[ListItem.EndTime,  -  ,]" />
+        </include>
+        <!-- <include content="Object_Info_TextPairs">
+            <param name="pad" value="24" />
+            <param name="name" value="Channel" />
+            <param name="label" value="ListItem.ChannelName" />
+            <param name="label2" value="$INFO[ListItem.ChannelNumberLabel,  -  Ch.,]" />
+        </include> -->
+    </include>
+
     <include name="Object_Info_Details">
         <include content="Object_Info_TextPairs">
             <param name="pad" value="32" />
@@ -1112,7 +1132,7 @@
                     <aligny>top</aligny>
                     <font>font_tiny</font>
                     <textcolor>main_fg_70</textcolor>
-                    <label>$INFO[$PARAM[label]]</label>
+                    <label>$INFO[$PARAM[label]]$PARAM[label2]</label>
                     <height>30</height>
                     <haspath>$PARAM[haspath]</haspath>
                 </control>
diff --git a/1080i/Includes_View_50_List.xml b/1080i/Includes_View_50_List.xml
index 84a93058..5786006e 100644
--- a/1080i/Includes_View_50_List.xml
+++ b/1080i/Includes_View_50_List.xml
@@ -925,6 +925,8 @@
     <include name="View_50_Info">
         <param name="height" default="654" />
         <param name="width" default="654" />
+        <param name="label" default="$VAR[Label_MainTitle]" />
+        <param name="label2" default="$VAR[Label_SubTitle]" />
         <definition>
             <control type="group">
                 <left>-15</left>
@@ -943,13 +945,13 @@
                         <height>50</height>
                         <font>font_title_small</font>
                         <textcolor>main_fg_100</textcolor>
-                        <label>$VAR[Label_MainTitle]</label>
+                        <label>$PARAM[label]</label>
                     </control>
                     <control type="label">
                         <height>40</height>
                         <aligny>top</aligny>
                         <align>center</align>
-                        <label>$VAR[Label_SubTitle]</label>
+                        <label>$PARAM[label2]</label>
                         <textcolor>main_fg_100</textcolor>
                         <font>font_small</font>
                     </control>
@@ -988,6 +990,7 @@
                         <param name="diffuse" value="$PARAM[diffuse]" />
                         <param name="fadetime" value="$PARAM[fadetime]" />
                         <param name="visible" value="$PARAM[iconvisible]" />
+                        <param name="bordersize" value="$PARAM[bordersize]" />
                     </include>
                 </control>
             </control>
diff --git a/addon.xml b/addon.xml
index 94ce4f22..0494ea9a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.38-alpha4">
+<addon id="skin.arctic.zephyr.2" name="Arctic Zephyr 2" provider-name="jurialmunkey" version="0.9.39-alpha1">
     <requires>
         <import addon="xbmc.gui" version="5.14.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />
diff --git a/changelog.txt b/changelog.txt
index 18647cea..375adcad 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+0.9.39
+- Match PVR Info with other info dialogs
+
 0.9.38
 - Re-add extended info button in osd
 - Fix for single PVR info in multiwidget layout