[skin.confluence] PVR updates and fixes (#73)

* Update DialogPVRGroupmanager.xml

* Add PVR reminders and other PVR related changes

720p/DialogPVRGroupManager.xml

@@ -84,14 +84,14 @@
 						<left>0</left>
 						<top>75</top>
 						<width>310</width>
-						<height>460</height>
+						<height>550</height>
 						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="list" id="13">
 						<left>5</left>
 						<top>80</top>
 						<width>300</width>
-						<height>450</height>
+						<height>540</height>
 						<onup>13</onup>
 						<ondown>13</ondown>
 						<onleft>9000</onleft>
@@ -106,10 +106,18 @@
 								<height>40</height>
 								<texture border="5">button-nofocus.png</texture>
 							</control>
+							<control type="image">
+								<width>32</width>
+								<height>32</height>
+								<left>5</left>
+								<top>4</top>
+								<texture>$INFO[ListItem.Icon]</texture>
+								<aspectratio>keep</aspectratio>
+							</control>
 							<control type="label">
-								<left>10</left>
+								<left>40</left>
 								<top>0</top>
-								<width>280</width>
+								<width>250</width>
 								<height>40</height>
 								<font>font12</font>
 								<align>left</align>
@@ -136,10 +144,18 @@
 								<texture border="5">button-focus2.png</texture>
 								<visible>Control.HasFocus(13)</visible>
 							</control>
+							<control type="image">
+								<width>32</width>
+								<height>32</height>
+								<left>5</left>
+								<top>4</top>
+								<texture>$INFO[ListItem.Icon]</texture>
+								<aspectratio>keep</aspectratio>
+							</control>
 							<control type="label">
-								<left>10</left>
+								<left>40</left>
 								<top>0</top>
-								<width>280</width>
+								<width>250</width>
 								<height>40</height>
 								<font>font12</font>
 								<align>left</align>
@@ -154,7 +170,7 @@
 						<left>305</left>
 						<top>75</top>
 						<width>25</width>
-						<height>460</height>
+						<height>550</height>
 						<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 						<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 						<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -187,14 +203,14 @@
 						<left>0</left>
 						<top>75</top>
 						<width>310</width>
-						<height>460</height>
+						<height>550</height>
 						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="list" id="11">
 						<left>5</left>
 						<top>85</top>
 						<width>300</width>
-						<height>450</height>
+						<height>540</height>
 						<onup>11</onup>
 						<ondown>11</ondown>
 						<onleft>73</onleft>
@@ -273,7 +289,7 @@
 						<left>305</left>
 						<top>75</top>
 						<width>25</width>
-						<height>460</height>
+						<height>550</height>
 						<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 						<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 						<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -306,14 +322,14 @@
 						<left>0</left>
 						<top>75</top>
 						<width>310</width>
-						<height>460</height>
+						<height>550</height>
 						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="list" id="12">
 						<left>5</left>
 						<top>85</top>
 						<width>300</width>
-						<height>450</height>
+						<height>540</height>
 						<onup>12</onup>
 						<ondown>12</ondown>
 						<onleft>71</onleft>
@@ -392,7 +408,7 @@
 						<left>305</left>
 						<top>75</top>
 						<width>25</width>
-						<height>460</height>
+						<height>550</height>
 						<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 						<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 						<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -410,9 +426,8 @@
 					<left>1070</left>
 					<top>165</top>
 					<width>200</width>
-					<height>225</height>
+					<height>315</height>
 					<itemgap>5</itemgap>
-					<align>center</align>
 					<orientation>vertical</orientation>
 					<onleft>12</onleft>
 					<onright>13</onright>
@@ -442,6 +457,12 @@
 						<include>ButtonInfoDialogsCommonValues</include>
 						<label>31505</label>
 					</control>
+					<control type="button" id="35">
+						<description>Regenerate Group Thumbnails</description>
+						<width>200</width>
+						<include>ButtonInfoDialogsCommonValues</include>
+						<label>13315</label>
+					</control>
 					<control type="togglebutton" id="34">
 						<description>TV/Radio toggle</description>
 						<width>200</width>
@@ -459,7 +480,7 @@
 				</control>
 				<control type="group">
 					<left>1065</left>
-					<top>405</top>
+					<top>495</top>
 					<control type="image">
 						<left>0</left>
 						<top>0</top>
@@ -485,6 +506,15 @@
 						<texture background="true">$INFO[Container(12).ListItem.Icon]</texture>
 						<visible>Control.HasFocus(12) | Control.HasFocus(72)</visible>
 					</control>
+					<control type="image">
+						<left>5</left>
+						<top>5</top>
+						<width>200</width>
+						<height>200</height>
+						<aspectratio>keep</aspectratio>
+						<texture background="true">$INFO[Container(13).ListItem.Icon]</texture>
+						<visible>Control.HasFocus(13) | Control.HasFocus(73)</visible>
+					</control>
 				</control>
 			</control>
 		</control>

720p/DialogPVRInfo.xml

@@ -191,12 +191,13 @@
 				<description>Timer</description>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>19061</label>
+				<visible>Window.IsActive(PVRGuideInfo)</visible>
 			</control>
 			<control type="button" id="4">
 				<description>Find similar</description>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>19003</label>
-				<visible>Window.IsActive(PVRGuideInfo)</visible>
+				<visible>Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRGuideInfo)</visible>
 			</control>
 			<control type="button" id="10">
 				<description>Play programme</description>
@@ -214,7 +215,7 @@
 				<description>Play recording</description>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>19687</label>
-				<visible>Window.IsActive(PVRGuideInfo)</visible>
+				<visible>Window.IsActive(PVRRecordingInfo) | Window.IsActive(PVRGuideInfo)</visible>
 			</control>
 			<control type="button" id="6">
 				<description>Record</description>
@@ -222,6 +223,12 @@
 				<label/>
 				<visible>Window.IsActive(PVRGuideInfo)</visible>
 			</control>
+			<control type="button" id="11">
+				<description>Set reminder</description>
+				<include>ButtonInfoDialogsCommonValues</include>
+				<label>$LOCALIZE[826]</label>
+				<visible>Window.IsActive(PVRGuideInfo)</visible>
+			</control>
 			<control type="button" id="7">
 				<description>OK</description>
 				<include>ButtonInfoDialogsCommonValues</include>

720p/Includes.xml

@@ -555,6 +555,7 @@
 	</variable>
 	<variable name="PVRTimerIcon">
 		<value condition="ListItem.IsRecording">PVR-IsRecording.png</value>
+		<value condition="ListItem.HasReminder">PVR-HasReminder.png</value>
 		<value condition="ListItem.HasTimerSchedule + ListItem.TimerHasError">PVR-HasTimerScheduleError.png</value>
 		<value condition="ListItem.HasTimer + ListItem.TimerHasError">PVR-HasTimerError.png</value>
 		<value condition="ListItem.HasTimerSchedule + ListItem.TimerHasConflict">PVR-HasTimerScheduleConflict.png</value>

720p/VideoFullScreen.xml

@@ -164,7 +164,7 @@
 					<label>$LOCALIZE[31040]</label>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<visible>![VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel]</visible>
+					<visible>![VideoPlayer.Content(LiveTV) + [PVR.IsRecordingPlayingChannel | PVR.IsPlayingActiveRecording]]</visible>
 					<animation effect="slide" start="0,0" end="0,25" time="0" condition="!VideoPlayer.Content(Movies) + !VideoPlayer.Content(Episodes) + !VideoPlayer.Content(MusicVideos) + !VideoPlayer.Content(LiveTV) + !PVR.IsPlayingRecording">conditional</animation>
 				</control>
 				<control type="image" id="1">
@@ -173,7 +173,7 @@
 					<height>25</height>
 					<aspectratio align="center" aligny="center">keep</aspectratio>
 					<texture>PVR-IsRecording.png</texture>
-					<visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
+					<visible>VideoPlayer.Content(LiveTV) + [[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording]</visible>
 				</control>
 				<control type="label" id="1">
 					<description>Heading label</description>
@@ -187,7 +187,7 @@
 					<label>$LOCALIZE[19158]</label>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<visible>VideoPlayer.Content(LiveTV) + PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive</visible>
+					<visible>VideoPlayer.Content(LiveTV) + [[PVR.IsRecordingPlayingChannel + !Player.ChannelPreviewActive] | PVR.IsPlayingActiveRecording]</visible>
 				</control>
 				<control type="label" id="1">
 					<description>Studio label</description>

720p/VideoOSD.xml

@@ -253,7 +253,7 @@
 				<font/>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
-				<usealttexture>PVR.IsRecordingPlayingChannel</usealttexture>
+				<usealttexture>PVR.IsRecordingPlayingChannel | PVR.IsPlayingActiveRecording</usealttexture>
 				<alttexturefocus>OSDRecordOnFO.png</alttexturefocus>
 				<alttexturenofocus>OSDRecordOnNF.png</alttexturenofocus>
 				<onclick>PVR.ToggleRecordPlayingChannel</onclick>

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.7.0" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.7.1" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.14.0"/>
 	</requires>
@@ -143,6 +143,6 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>Added chapter markers to progress bar.</news>
+		<news>- Add support for PVR reminders.[CR]- Fix / add new buttons in PVR information window.[CR]- Update PVR group manager dialog with latest changes.</news>
 	</extension>
 </addon>

changelog.txt

@@ -1,3 +1,9 @@
+[B]4.7.1[/B]
+
+- Add support for PVR reminders
+- Fix / add new buttons in PVR information window
+- Update PVR group manager dialog with latest changes
+
 [B]4.7.0[/B]
 
 - Added chapter markers to progress bar