[Estuary] Rework PVR channels OSD dialog.

2 files changed, 25 insertions, 141 deletions

diff --git a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
index 6d1f1b4a83..992982e827 100644
--- a/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
+++ b/addons/skin.estuary/xml/DialogPVRChannelsOSD.xml
@@ -9,162 +9,41 @@
 				<depth>DepthOSD</depth>
 				<include>OpenClose_Left</include>
 				<include content="ContentPanel">
-					<param name="width" value="941" />
+					<param name="width" value="1042" />
 				</include>
 				<control type="fixedlist" id="11">
 					<left>0</left>
-					<width>875</width>
-					<height>100%</height>
+					<top>100</top>
+					<width>970</width>
+					<bottom>0</bottom>
 					<onleft>PreviousChannelGroup</onleft>
 					<onright>60</onright>
 					<onup>11</onup>
 					<ondown>11</ondown>
-					<pagecontrol>60</pagecontrol>
 					<movement>4</movement>
-					<focusposition>5</focusposition>
+					<focusposition>4</focusposition>
+					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<focusedlayout height="90" width="875">
-						<control type="image">
-							<left>0</left>
-							<right>0</right>
-							<bottom>0</bottom>
-							<texture colordiffuse="button_focus">lists/focus.png</texture>
-							<visible>Control.hasFocus(11)</visible>
-						</control>
-						<control type="image">
-							<right>20</right>
-							<top>10</top>
-							<width>80</width>
-							<height>70</height>
-							<aspectratio align="right">keep</aspectratio>
-							<texture>$INFO[listitem.icon]</texture>
-						</control>
-						<control type="progress">
-							<left>105</left>
-							<top>58</top>
-							<width>50</width>
-							<height>12</height>
-							<midtexture border="3">progress/texturebg_white.png</midtexture>
-							<visible>ListItem.HasEpg</visible>
-							<info>ListItem.Progress</info>
-						</control>
-						<control type="image">
-							<right>110</right>
-							<top>25</top>
-							<width>40</width>
-							<height>40</height>
-							<texture>$VAR[PVRStatusImageVar]</texture>
-						</control>
-						<control type="label">
-							<left>105</left>
-							<top>8</top>
-							<height>90</height>
-							<right>120</right>
-							<aligny>top</aligny>
-							<font>font14</font>
-							<animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
-							<label>$INFO[ListItem.Label]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="label">
-							<left>165</left>
-							<top>46</top>
-							<height>90</height>
-							<right>120</right>
-							<aligny>top</aligny>
-							<font>font12</font>
-							<label>$INFO[ListItem.Title]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="label">
-							<left>12</left>
-							<top>0</top>
-							<height>90</height>
-							<width>75</width>
-							<align>center</align>
-							<aligny>center</aligny>
-							<font>font32_title</font>
-							<label>$INFO[ListItem.ChannelNumberLabel]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-					</focusedlayout>
-					<itemlayout height="90" width="875">
-						<control type="image">
-							<right>20</right>
-							<top>10</top>
-							<width>80</width>
-							<height>70</height>
-							<aspectratio align="right">keep</aspectratio>
-							<texture>$INFO[listitem.icon]</texture>
-						</control>
-						<control type="progress">
-							<left>105</left>
-							<top>58</top>
-							<width>50</width>
-							<height>12</height>
-							<colordiffuse>88FFFFFF</colordiffuse>
-							<visible>ListItem.HasEpg</visible>
-							<info>ListItem.Progress</info>
-						</control>
-						<control type="image">
-							<right>110</right>
-							<top>25</top>
-							<width>40</width>
-							<height>40</height>
-							<texture>$VAR[PVRStatusImageVar]</texture>
-						</control>
-						<control type="label">
-							<left>105</left>
-							<top>8</top>
-							<height>90</height>
-							<right>120</right>
-							<aligny>top</aligny>
-							<font>font14</font>
-							<label>$INFO[ListItem.Label]</label>
-							<animation effect="slide" start="0,0" end="0,14" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="label">
-							<left>165</left>
-							<top>46</top>
-							<height>90</height>
-							<right>120</right>
-							<aligny>top</aligny>
-							<font>font12</font>
-							<label>$INFO[ListItem.Title]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-							<textcolor>grey</textcolor>
-						</control>
-						<control type="label">
-							<left>12</left>
-							<top>0</top>
-							<height>90</height>
-							<width>75</width>
-							<align>center</align>
-							<aligny>center</aligny>
-							<font>font32_title</font>
-							<label>$INFO[ListItem.ChannelNumberLabel]</label>
-							<textcolor>grey</textcolor>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-					</itemlayout>
+					<include content="PVRListItemLayouts">
+						<param name="list_id" value="11" />
+						<param name="label1" value="$INFO[ListItem.Label]" />
+						<param name="has_status_icon" value="true" />
+					</include>
 				</control>
 				<control type="scrollbar" id="60">
-					<left>869</left>
+					<left>970</left>
+					<top>100</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>0</bottom>
 					<onleft>11</onleft>
-					<texturesliderbackground />
 					<onright>NextChannelGroup</onright>
-					<ondown>61</ondown>
-					<onup>61</onup>
-					<animation effect="zoom" start="100,100" end="50,100" center="881,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation>
-					<orientation>vertical</orientation>
+					<texturesliderbackground />
+					<animation effect="zoom" start="100,100" end="50,100" center="982,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation>
 				</control>
 				<control type="image">
 					<left>0</left>
 					<bottom>0</bottom>
-					<width>880</width>
+					<width>970</width>
 					<height>115</height>
 					<texture flipy="true">frame/InfoBar.png</texture>
 				</control>
@@ -174,18 +53,18 @@
 				<include>Animation_TopSlide</include>
 				<control type="image">
 					<left>0</left>
-					<width>880</width>
+					<width>970</width>
 					<height>110</height>
 					<texture>frame/InfoBar.png</texture>
 				</control>
 				<control type="label" id="2">
 					<description>header label</description>
 					<textoffsetx>40</textoffsetx>
-					<width>830</width>
+					<width>970</width>
 					<height>70</height>
 					<font>font45</font>
 					<aligny>center</aligny>
-					<label>&lt; $INFO[VideoPlayer.ChannelGroup] &gt;</label>
+					<label>$VAR[BreadcrumbsPVRChannelsOSDVar]</label>
 					<shadowcolor>black</shadowcolor>
 				</control>
 			</control>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index a7975b157f..52b007d2a9 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -444,6 +444,11 @@
 		<value condition="Window.IsActive(TVSearch)">$LOCALIZE[19020] / $LOCALIZE[137]</value>
 		<value>$LOCALIZE[19021] / $LOCALIZE[137]</value>
 	</variable>
+	<variable name="BreadcrumbsPVRChannelsOSDVar">
+		<value condition="PVR.IsPlayingTV">$LOCALIZE[19020] / $LOCALIZE[19019] / $INFO[VideoPlayer.ChannelGroup]</value>
+		<value condition="PVR.IsPlayingRadio">$LOCALIZE[19021] / $LOCALIZE[19019] / $INFO[VideoPlayer.ChannelGroup]</value>
+		<value>$LOCALIZE[19019] / $INFO[VideoPlayer.ChannelGroup]</value>
+	</variable>
 	<variable name="BreadcrumbsGameVar">
 		<value>$LOCALIZE[15016]</value>
 	</variable>