[PVR][Estuary] Guide window: Add channel group selector.

3 files changed, 131 insertions, 34 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 214e63ca08..38f031b7e2 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -11074,16 +11074,16 @@ msgctxt "#19296"
 msgid "No PVR add-on enabled"
 msgstr ""
 
-#. 'timeline' label used in pvr guide window
+#. 'Viewtype' label for vertical channel layout, used in pvr guide window
 #: addons/skin.estuary/xml/MyPVRGuide.xml
 msgctxt "#19297"
-msgid "Vertical"
+msgid "Vertical channels"
 msgstr ""
 
-#. 'timeline' label used in pvr guide window
+#. 'Viewtype' label for horizontal channel layout, used in pvr guide window
 #: addons/skin.estuary/xml/MyPVRGuide.xml
 msgctxt "#19298"
-msgid "Horizontal"
+msgid "Horizontal channels"
 msgstr ""
 
 #. generic "expiration" label used in different places
@@ -11093,7 +11093,19 @@ msgctxt "#19299"
 msgid "Expires"
 msgstr ""
 
-#empty strings from id 19300 to 19498
+#. 'Viewtype' label for vertical channel layout without channel group selctor, used in pvr guide window
+#: addons/skin.estuary/xml/MyPVRGuide.xml
+msgctxt "#19300"
+msgid "Vertical channels, no group selector"
+msgstr ""
+
+#. 'Viewtype' label for horizontal channel layout without channel group selctor, used in pvr guide window
+#: addons/skin.estuary/xml/MyPVRGuide.xml
+msgctxt "#19301"
+msgid "Horizontal channels, no group selector"
+msgstr ""
+
+#empty strings from id 19302 to 19498
 
 #. label for epg genre value
 #: xbmc/epg/Epg.cpp
diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml
index 0f594edfd1..d3f5fa6337 100644
--- a/addons/skin.estuary/xml/Includes_PVR.xml
+++ b/addons/skin.estuary/xml/Includes_PVR.xml
@@ -257,7 +257,7 @@
 		<definition>
 			<control type="epggrid" id="$PARAM[control_id]">
 				<left>0</left>
-				<top>0</top>
+				<top>$PARAM[control_top]</top>
 				<right>20</right>
 				<bottom>340</bottom>
 				<orientation>$PARAM[control_orientation]</orientation>
@@ -267,8 +267,8 @@
 				<rulerunit>6</rulerunit>
 				<onleft>9000</onleft>
 				<onright>60</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
+				<onup>$PARAM[control_onup_id]</onup>
+				<ondown>$PARAM[control_id]</ondown>
 				<viewtype label="$PARAM[viewtype_label]">list</viewtype>
 				<progresstexture border="$PARAM[progress_texture_border]" colordiffuse="button_focus">$PARAM[progress_texture]</progresstexture>
 				<rulerdatelayout width="1700" height="45" condition="$PARAM[has_rulerdate_layout]">
diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml
index 08a7471253..8f412da98b 100644
--- a/addons/skin.estuary/xml/MyPVRGuide.xml
+++ b/addons/skin.estuary/xml/MyPVRGuide.xml
@@ -2,7 +2,7 @@
 <window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
-	<views>50,51</views>
+	<views>50,51,52,53</views>
 	<menucontrol>9000</menucontrol>
 	<controls>
 		<include>DefaultBackground</include>
@@ -10,7 +10,7 @@
 			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<control type="group">
 				<description>Guide Timeline</description>
-				<visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
+				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | Control.IsVisible(53)</visible>
 				<include>OpenClose_Right</include>
 				<include>Visible_Right</include>
 				<control type="group">
@@ -23,30 +23,115 @@
 						<bottom>336</bottom>
 						<texture colordiffuse="E6FFFFFF">dialogs/dialog-bg-nobo.png</texture>
 					</control>
-					<include content="EpgGrid">
-						<param name="control_id" value="50"/>
-						<param name="control_orientation" value="vertical"/>
-						<param name="viewtype_label" value="19297"/>
-						<param name="progress_texture_border" value="0,60,18,14"/>
-						<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
-						<param name="has_rulerdate_layout" value="false"/>
-						<param name="ruler_width" value="1400"/>
-						<param name="ruler_label_width" value="365"/>
-						<param name="channel_width" value="350"/>
-						<param name="scrollbar_top" value="47"/>
-					</include>
-					<include content="EpgGrid">
-						<param name="control_id" value="51"/>
-						<param name="control_orientation" value="horizontal"/>
-						<param name="viewtype_label" value="19298"/>
-						<param name="progress_texture_border" value="5,10,5,10"/>
-						<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
-						<param name="has_rulerdate_layout" value="true"/>
-						<param name="ruler_width" value="150"/>
-						<param name="ruler_label_width" value="150"/>
-						<param name="channel_width" value="310"/>
-						<param name="scrollbar_top" value="105"/>
-					</include>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>100%</width>
+						<height>44</height>
+						<texture colordiffuse="60FFFFFF">colors/white50.png</texture>
+					</control>
+					<control type="wraplist" id="11">
+						<top>0</top>
+						<left>0</left>
+						<width>100%</width>
+						<onup>63</onup>
+						<ondown>63</ondown>
+						<orientation>horizontal</orientation>
+						<scrolltime>200</scrolltime>
+						<focusposition>3</focusposition>
+						<visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
+						<itemlayout height="44" width="300">
+							<control type="label">
+								<left>-140</left>
+								<width>280</width>
+								<align>center</align>
+								<aligny>center</aligny>
+								<label>$INFO[ListItem.Label]</label>
+								<textcolor>grey</textcolor>
+							</control>
+						</itemlayout>
+						<focusedlayout height="44" width="300">
+							<control type="image">
+								<top>2</top>
+								<left>-148</left>
+								<width>296</width>
+								<height>42</height>
+								<texture colordiffuse="button_focus">lists/focus.png</texture>
+								<visible>Control.HasFocus(11)</visible>
+							</control>
+							<control type="image">
+								<left>-150</left>
+								<width>300</width>
+								<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+							</control>
+							<control type="label">
+								<left>-140</left>
+								<width>280</width>
+								<align>center</align>
+								<aligny>center</aligny>
+								<scroll>true</scroll>
+								<label>$INFO[ListItem.Label]</label>
+							</control>
+						</focusedlayout>
+					</control>
+					<control type="group" id="63">
+						<include content="EpgGrid">
+							<param name="control_id" value="50"/>
+							<param name="control_orientation" value="vertical"/>
+							<param name="control_top" value="55"/>
+							<param name="control_onup_id" value="11"/>
+							<param name="viewtype_label" value="19298"/>
+							<param name="progress_texture_border" value="0,60,18,14"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
+							<param name="has_rulerdate_layout" value="false"/>
+							<param name="ruler_width" value="1400"/>
+							<param name="ruler_label_width" value="365"/>
+							<param name="channel_width" value="350"/>
+							<param name="scrollbar_top" value="47"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="51"/>
+							<param name="control_orientation" value="horizontal"/>
+							<param name="control_top" value="55"/>
+							<param name="control_onup_id" value="11"/>
+							<param name="viewtype_label" value="19297"/>
+							<param name="progress_texture_border" value="5,10,5,10"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
+							<param name="has_rulerdate_layout" value="true"/>
+							<param name="ruler_width" value="150"/>
+							<param name="ruler_label_width" value="150"/>
+							<param name="channel_width" value="310"/>
+							<param name="scrollbar_top" value="105"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="52"/>
+							<param name="control_orientation" value="vertical"/>
+							<param name="control_top" value="0"/>
+							<param name="control_onup_id" value="52"/>
+							<param name="viewtype_label" value="19301"/>
+							<param name="progress_texture_border" value="0,60,18,14"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
+							<param name="has_rulerdate_layout" value="false"/>
+							<param name="ruler_width" value="1400"/>
+							<param name="ruler_label_width" value="365"/>
+							<param name="channel_width" value="350"/>
+							<param name="scrollbar_top" value="47"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="53"/>
+							<param name="control_orientation" value="horizontal"/>
+							<param name="control_top" value="0"/>
+							<param name="control_onup_id" value="53"/>
+							<param name="viewtype_label" value="19300"/>
+							<param name="progress_texture_border" value="5,10,5,10"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
+							<param name="has_rulerdate_layout" value="true"/>
+							<param name="ruler_width" value="150"/>
+							<param name="ruler_label_width" value="150"/>
+							<param name="channel_width" value="310"/>
+							<param name="scrollbar_top" value="105"/>
+						</include>
+					</control>
 				</control>
 				<control type="group">
 					<bottom>0</bottom>