[PVR][Estuary] PVRInfoPanel: Cleanup and use same code for all pvr windows. (channels, recordings, timers, timer rules, search).

5 files changed, 179 insertions, 245 deletions

diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml
index 26cbd3a79b..6059b23c5b 100644
--- a/addons/skin.estuary/xml/Includes_PVR.xml
+++ b/addons/skin.estuary/xml/Includes_PVR.xml
@@ -102,45 +102,134 @@
 		</control>
 	</include>
 	<include name="PVRInfoPanel">
-		<control type="label">
-			<top>120</top>
-			<width>540</width>
-			<height>262</height>
-			<font>font45</font>
-			<label>$INFO[ListItem.ChannelName]</label>
-		</control>
-		<control type="image">
-			<left>520</left>
-			<top>120</top>
-			<width>270</width>
-			<height>220</height>
-			<aspectratio align="right">keep</aspectratio>
-			<texture fallback="DefaultTVShows.png">$INFO[Listitem.Icon]</texture>
-			<fadetime>200</fadetime>
-		</control>
-		<control type="label">
-			<top>240</top>
-			<width>540</width>
-			<height>262</height>
-			<textcolor>grey</textcolor>
-			<font>font36_title</font>
-			<label>$INFO[ListItem.EpgEventTitle]</label>
-		</control>
-		<control type="textbox">
-			<top>380</top>
-			<width>820</width>
-			<bottom>75</bottom>
-			<label>[B]$INFO[ListItem.EpisodeName,,[CR]][/B]$INFO[ListItem.Plot]</label>
+		<control type="group">
+			<visible>!ListItem.IsFolder</visible>
+			<control type="image">
+				<left>0</left>
+				<top>120</top>
+				<width>200</width>
+				<height>200</height>
+				<aspectratio align="right">keep</aspectratio>
+				<texture fallback="DefaultTVShows.png">$INFO[Listitem.Icon]</texture>
+				<fadetime>200</fadetime>
+			</control>
+			<control type="group">
+				<top>120</top>
+				<left>240</left>
+				<width>590</width>
+				<control type="label">
+					<height>262</height>
+					<font>font45</font>
+					<label>$INFO[ListItem.ChannelName]</label>
+				</control>
+				<control type="label">
+					<top>60</top>
+					<height>200</height>
+					<wrapmultiline>true</wrapmultiline>
+					<label>$INFO[ListItem.Date,[COLOR grey]$LOCALIZE[552]:[/COLOR] ,[CR]]$INFO[ListItem.Duration,[COLOR grey]$LOCALIZE[180]:[/COLOR] ,[CR]]$VAR[ExpirationDateTimeLabel]</label>
+				</control>
+				<control type="group">
+					<visible>Integer.IsGreater(ListItem.Progress,0)</visible>
+					<top>150</top>
+					<height>262</height>
+					<control type="label">
+						<label>$INFO[ListItem.StartTime]</label>
+					</control>
+					<control type="label">
+						<align>right</align>
+						<label>$INFO[ListItem.EndTime]</label>
+					</control>
+					<control type="progress">
+						<top>50</top>
+						<height>12</height>
+						<colordiffuse>88FFFFFF</colordiffuse>
+						<info>ListItem.Progress</info>
+					</control>
+				</control>
+			</control>
+			<control type="label">
+				<top>390</top>
+				<width>830</width>
+				<height>262</height>
+				<font>font36_title</font>
+				<label>$INFO[ListItem.Title]</label>
+				<visible>!PVR.HasEpg</visible>
+			</control>
+			<control type="label">
+				<top>390</top>
+				<width>830</width>
+				<height>262</height>
+				<font>font36_title</font>
+				<label>$INFO[ListItem.EpgEventTitle]</label>
+				<visible>PVR.HasEpg</visible>
+			</control>
+			<control type="label">
+				<top>435</top>
+				<width>830</width>
+				<height>70</height>
+				<label>[I]$INFO[ListItem.EpisodeName][/I]</label>
+			</control>
+			<control type="textbox">
+				<top>490</top>
+				<width>830</width>
+				<bottom>75</bottom>
+				<label>$INFO[ListItem.Plot]</label>
+				<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
+			</control>
+			<control type="textbox">
+				<top>530</top>
+				<width>830</width>
+				<height>340</height>
+				<align>center</align>
+				<font>font27</font>
+				<textcolor>80FFFFFF</textcolor>
+				<label>$LOCALIZE[19055]</label>
+				<visible>String.IsEmpty(Listitem.Plot) + String.IsEmpty(Listitem.Genre)</visible>
+			</control>
 		</control>
-		<control type="textbox">
-			<top>510</top>
-			<width>790</width>
-			<height>362</height>
-			<align>center</align>
-			<font>font27</font>
-			<textcolor>80FFFFFF</textcolor>
-			<label>$LOCALIZE[19055]</label>
-			<visible>String.IsEmpty(Listitem.Plot) + String.IsEmpty(Listitem.Genre)</visible>
+		<control type="group">
+			<visible>ListItem.IsFolder</visible>
+			<top>180</top>
+			<control type="label">
+				<top>10</top>
+				<width>830</width>
+				<height>262</height>
+				<label>$LOCALIZE[19076] ($INFO[Container(5000).NumItems,[B],[/B] $LOCALIZE[31036]])</label>
+				<font>font37</font>
+				<visible>!ListItem.IsParentFolder</visible>
+			</control>
+			<control type="group">
+				<left>-10</left>
+				<top>60</top>
+				<visible>!ListItem.IsParentFolder</visible>
+				<control type="panel" id="5000">
+					<top>20</top>
+					<width>830</width>
+					<bottom>100</bottom>
+					<orientation>vertical</orientation>
+					<focusedlayout height="100" width="780">
+						<control type="label">
+							<left>10</left>
+							<height>90</height>
+							<width>830</width>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Date,[COLOR grey],[/COLOR][CR]]$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+					</focusedlayout>
+					<itemlayout height="100" width="780">
+						<control type="label">
+							<left>10</left>
+							<height>90</height>
+							<width>830</width>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Date,[COLOR grey],[/COLOR][CR]]$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+					</itemlayout>
+					<content sortby="date" sortorder=$PARAM[folder_sortorder]>$INFO[ListItem.FilenameAndPath]</content>
+				</control>
+			</control>
 		</control>
 	</include>
 	<include name="PVRChannelNumberInput">
diff --git a/addons/skin.estuary/xml/MyPVRChannels.xml b/addons/skin.estuary/xml/MyPVRChannels.xml
index efc9fc6838..266d2ed8a5 100644
--- a/addons/skin.estuary/xml/MyPVRChannels.xml
+++ b/addons/skin.estuary/xml/MyPVRChannels.xml
@@ -20,12 +20,12 @@
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
 					<orientation>vertical</orientation>
 					<onleft>9000</onleft>
-					<onright>60</onright>
+					<onright>73</onright>
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<viewtype label="List">list</viewtype>
 					<preloaditems>1</preloaditems>
-					<pagecontrol>60</pagecontrol>
+					<pagecontrol>73</pagecontrol>
 					<focusedlayout height="90">
 						<control type="image">
 							<left>0</left>
@@ -163,12 +163,12 @@
 					<scrolltime tween="cubic" easing="out">500</scrolltime>
 					<orientation>vertical</orientation>
 					<onleft>9000</onleft>
-					<onright>60</onright>
+					<onright>73</onright>
 					<onup>51</onup>
 					<ondown>51</ondown>
 					<viewtype label="List">list</viewtype>
 					<preloaditems>1</preloaditems>
-					<pagecontrol>60</pagecontrol>
+					<pagecontrol>73</pagecontrol>
 					<focusedlayout height="70">
 						<control type="image">
 							<left>0</left>
@@ -278,112 +278,48 @@
 			</control>
 			<control type="group">
 				<depth>DepthContentPanel</depth>
+				<include>OpenClose_Right</include>
 				<width>870</width>
 				<right>0</right>
-				<include>OpenClose_Right</include>
 				<include content="ContentPanel">
-					<param name="left" value="-68" />
+					<param name="left" value="-72" />
 					<param name="width" value="970" />
 					<param name="top" value="-20" />
 					<param name="flipx" value="true" />
 				</include>
-				<control type="scrollbar" id="60">
-					<left>-48</left>
+				<control type="scrollbar" id="73">
+					<left>-50</left>
 					<top>list_y_offset</top>
 					<width>12</width>
 					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
-					<animation effect="zoom" start="100,100" end="50,100" center="-48,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(60)">conditional</animation>
-				</control>
-				<control type="group">
-					<left>0</left>
-					<top>202</top>
-					<control type="progress">
-						<top>125</top>
-						<width>520</width>
-						<height>12</height>
-						<colordiffuse>88FFFFFF</colordiffuse>
-						<visible>ListItem.HasEpg</visible>
-						<info>ListItem.Progress</info>
-					</control>
-					<control type="label">
-						<top>82</top>
-						<width>560</width>
-						<height>262</height>
-						<label>$INFO[ListItem.StartTime]</label>
-					</control>
-					<control type="label">
-						<top>82</top>
-						<width>520</width>
-						<height>262</height>
-						<align>right</align>
-						<label>$INFO[ListItem.EndTime]</label>
-					</control>
-					<control type="label">
-						<top>-80</top>
-						<width>540</width>
-						<height>262</height>
-						<font>font45</font>
-						<label>$INFO[ListItem.ChannelName]</label>
-					</control>
-					<control type="label">
-						<top>20</top>
-						<width>540</width>
-						<height>625</height>
-						<label>$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label>
-					</control>
-					<control type="label">
-						<top>-20</top>
-						<width>540</width>
-						<height>625</height>
-						<label>[B]$INFO[ListItem.EpgEventTitle,,[CR]][/B]</label>
-					</control>
-				</control>
-				<control type="image">
-					<left>540</left>
-					<top>122</top>
-					<width>240</width>
-					<height>220</height>
-					<aspectratio align="right">keep</aspectratio>
-					<texture fallback="DefaultTVShows.png">$INFO[Listitem.Icon]</texture>
-					<fadetime>200</fadetime>
-				</control>
-				<control type="textbox">
-					<top>382</top>
-					<width>820</width>
-					<bottom>114</bottom>
-					<label>[B]$INFO[ListItem.EpisodeName,,[CR]][/B]$INFO[ListItem.Plot]</label>
-				</control>
-				<control type="textbox">
-					<top>612</top>
-					<width>800</width>
-					<height>362</height>
-					<align>center</align>
-					<font>font27</font>
-					<textcolor>80FFFFFF</textcolor>
-					<label>$LOCALIZE[19055]</label>
-					<visible>String.IsEmpty(Listitem.Plot)</visible>
+					<animation effect="zoom" start="100,100" end="50,100" center="-50,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation>
 				</control>
+				<include>PVRInfoPanel</include>
 			</control>
-			<include>PVRChannelNumberInput</include>
 			<include content="TopBar">
 				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRChannelsVar]" />
 			</include>
 			<include content="BottomBar">
 				<param name="info_visible" value="true" />
 			</include>
-			<control type="textbox">
-				<bottom>15</bottom>
-				<width>800</width>
-				<right>40</right>
-				<height>80</height>
-				<align>right</align>
-				<visible>!String.isempty(ListItem.NextTitle)</visible>
-				<label>$INFO[ListItem.NextTitle,[COLOR grey]$LOCALIZE[19031]:[CR][/COLOR]] $INFO[ListItem.NextStartTime]</label>
+			<control type="label">
+				<right>20</right>
 				<include>OpenClose_Right</include>
+				<bottom>10</bottom>
+				<width>850</width>
+				<height>60</height>
+				<visible>!String.isempty(ListItem.NextTitle)</visible>
+				<label>[COLOR grey]$LOCALIZE[19031]:[/COLOR] $INFO[ListItem.NextStartTime]: $INFO[ListItem.NextTitle]</label>
+				<shadowcolor>black</shadowcolor>
+				<align>right</align>
+				<aligny>center</aligny>
+				<wrapmultiline>true</wrapmultiline>
+				<font>font27</font>
 			</control>
+			<include>PVRChannelNumberInput</include>
 			<include>MediaMenuMouseOverlay</include>
 			<control type="group">
 				<include>MediaMenuCommon</include>
diff --git a/addons/skin.estuary/xml/MyPVRRecordings.xml b/addons/skin.estuary/xml/MyPVRRecordings.xml
index 38a87c300a..3b9d5d1ed3 100644
--- a/addons/skin.estuary/xml/MyPVRRecordings.xml
+++ b/addons/skin.estuary/xml/MyPVRRecordings.xml
@@ -13,7 +13,7 @@
 				<control type="fixedlist" id="50">
 					<left>0</left>
 					<top>list_y_offset</top>
-					<right>860</right>
+					<right>918</right>
 					<bottom>list_y_offset</bottom>
 					<onleft>9000</onleft>
 					<onright>73</onright>
@@ -91,118 +91,27 @@
 			<control type="group">
 				<depth>DepthContentPanel</depth>
 				<include>OpenClose_Right</include>
+				<width>870</width>
 				<right>0</right>
-				<width>820</width>
 				<include content="ContentPanel">
-					<param name="left" value="-62" />
+					<param name="left" value="-72" />
 					<param name="width" value="970" />
 					<param name="top" value="-20" />
 					<param name="flipx" value="true" />
 				</include>
 				<control type="scrollbar" id="73">
-					<left>-40</left>
+					<left>-50</left>
 					<top>list_y_offset</top>
 					<width>12</width>
 					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
-					<animation effect="zoom" start="100,100" end="50,100" center="-40,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation>
-				</control>
-				<control type="group">
-					<visible>!ListItem.IsFolder</visible>
-					<top>180</top>
-					<control type="label">
-						<left>170</left>
-						<top>57</top>
-						<width>560</width>
-						<height>262</height>
-						<wrapmultiline>true</wrapmultiline>
-						<label>$INFO[ListItem.Date,[COLOR grey]$LOCALIZE[552]:[/COLOR] ,[CR]]$INFO[ListItem.Duration,[COLOR grey]$LOCALIZE[180]:[/COLOR] ,[CR]]$VAR[ExpirationDateTimeLabel]</label>
-					</control>
-					<control type="label">
-						<left>170</left>
-						<top>10</top>
-						<width>560</width>
-						<height>262</height>
-						<font>font36_title</font>
-						<label>$INFO[ListItem.ChannelName]</label>
-					</control>
-					<control type="image">
-						<left>-20</left>
-						<top>15</top>
-						<width>150</width>
-						<height>120</height>
-						<fadetime>200</fadetime>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[ListItem.Icon]</texture>
-					</control>
-					<control type="label">
-						<top>195</top>
-						<width>750</width>
-						<height>262</height>
-						<font>font36_title</font>
-						<label>$INFO[ListItem.Title]</label>
-					</control>
-					<control type="label">
-						<top>240</top>
-						<width>750</width>
-						<height>70</height>
-						<label>[I]$INFO[ListItem.EpisodeName][/I]</label>
-					</control>
-					<control type="textbox">
-						<top>284</top>
-						<width>750</width>
-						<bottom>95</bottom>
-						<align>justify</align>
-						<label>$INFO[ListItem.Plot]</label>
-						<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(autoscroll)</autoscroll>
-					</control>
-				</control>
-				<control type="group">
-					<visible>ListItem.IsFolder</visible>
-					<top>180</top>
-					<control type="label">
-						<top>10</top>
-						<width>560</width>
-						<height>262</height>
-						<label>$LOCALIZE[19076] ($INFO[Container(5000).NumItems,[B],[/B] $LOCALIZE[31036]])</label>
-						<font>font37</font>
-						<visible>ListItem.IsFolder + !ListItem.IsParentFolder</visible>
-					</control>
-					<control type="group">
-						<left>-10</left>
-						<top>60</top>
-						<visible>ListItem.IsFolder + !ListItem.IsParentFolder</visible>
-						<control type="panel" id="5000">
-							<top>20</top>
-							<width>780</width>
-							<bottom>200</bottom>
-							<orientation>vertical</orientation>
-							<focusedlayout height="100" width="780">
-								<control type="label">
-									<left>10</left>
-									<height>90</height>
-									<width>780</width>
-									<aligny>center</aligny>
-									<label>$INFO[ListItem.Date,[COLOR grey],[/COLOR][CR]]$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
-									<shadowcolor>text_shadow</shadowcolor>
-								</control>
-							</focusedlayout>
-							<itemlayout height="100" width="780">
-								<control type="label">
-									<left>10</left>
-									<height>90</height>
-									<width>$PARAM[width]</width>
-									<aligny>center</aligny>
-									<label>$INFO[ListItem.Date,[COLOR grey],[/COLOR][CR]]$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
-									<shadowcolor>text_shadow</shadowcolor>
-								</control>
-							</itemlayout>
-							<content sortby="date" sortorder="descending">$INFO[ListItem.FilenameAndPath]</content>
-						</control>
-					</control>
+					<animation effect="zoom" start="100,100" end="50,100" center="-50,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation>
 				</control>
+				<include content="PVRInfoPanel">
+					<param name="folder_sortorder" value="descending" />
+				</include>
 			</control>
 			<include content="TopBar">
 				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsPVRRecordingsVar]" />
@@ -212,24 +121,23 @@
 			</include>
 			<control type="group">
 				<depth>DepthBars</depth>
-				<right>0</right>
-				<width>820</width>
+				<right>20</right>
+				<width>850</width>
 				<include>OpenClose_Right</include>
 				<bottom>0</bottom>
 				<height>60</height>
 				<control type="label">
-					<description>Disk usage text</description>
-					<width>550</width>
+					<right>220</right>
+					<width>610</width>
 					<height>20</height>
 					<label>$INFO[PVR.backenddiskspace]</label>
 					<shadowcolor>black</shadowcolor>
 					<align>right</align>
-					<font>font30_title</font>
+					<font>font27</font>
 					<visible>!Integer.IsGreater(PVR.backenddiskspaceprogr,100)</visible>
 				</control>
 				<control type="progress">
-					<description>Disk usage bar</description>
-					<left>570</left>
+					<right>0</right>
 					<top>17</top>
 					<width>200</width>
 					<height>12</height>
diff --git a/addons/skin.estuary/xml/MyPVRSearch.xml b/addons/skin.estuary/xml/MyPVRSearch.xml
index cdf314621c..c244593ca4 100644
--- a/addons/skin.estuary/xml/MyPVRSearch.xml
+++ b/addons/skin.estuary/xml/MyPVRSearch.xml
@@ -20,10 +20,10 @@
 					<onup>50</onup>
 					<ondown>50</ondown>
 					<onleft>9000</onleft>
-					<onright>77</onright>
+					<onright>73</onright>
 					<movement>2</movement>
 					<focusposition>3</focusposition>
-					<pagecontrol>77</pagecontrol>
+					<pagecontrol>73</pagecontrol>
 					<scrolltime>200</scrolltime>
 					<itemlayout height="100">
 						<control type="label">
@@ -119,24 +119,24 @@
 			</control>
 			<control type="group">
 				<depth>DepthContentPanel</depth>
+				<include>OpenClose_Right</include>
 				<width>870</width>
 				<right>0</right>
-				<include>OpenClose_Right</include>
 				<include content="ContentPanel">
-					<param name="left" value="-68" />
+					<param name="left" value="-72" />
 					<param name="width" value="970" />
 					<param name="top" value="-20" />
 					<param name="flipx" value="true" />
 				</include>
-				<control type="scrollbar" id="77">
-					<left>-45</left>
-					<top>0</top>
+				<control type="scrollbar" id="73">
+					<left>-50</left>
+					<top>list_y_offset</top>
 					<width>12</width>
-					<height>100%</height>
+					<bottom>list_y_offset</bottom>
 					<onleft>50</onleft>
 					<onright>50</onright>
 					<orientation>vertical</orientation>
-					<animation effect="zoom" start="100,100" end="50,100" center="-45,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(77)">conditional</animation>
+					<animation effect="zoom" start="100,100" end="50,100" center="-50,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation>
 				</control>
 				<include>PVRInfoPanel</include>
 			</control>
diff --git a/addons/skin.estuary/xml/MyPVRTimers.xml b/addons/skin.estuary/xml/MyPVRTimers.xml
index fd7c10294b..cd941c6225 100644
--- a/addons/skin.estuary/xml/MyPVRTimers.xml
+++ b/addons/skin.estuary/xml/MyPVRTimers.xml
@@ -12,7 +12,7 @@
 				<control type="fixedlist" id="50">
 					<left>0</left>
 					<top>list_y_offset</top>
-					<right>860</right>
+					<right>918</right>
 					<bottom>list_y_offset</bottom>
 					<onup>50</onup>
 					<ondown>50</ondown>
@@ -139,7 +139,7 @@
 			<control type="group">
 				<depth>DepthContentPanel</depth>
 				<include>OpenClose_Right</include>
-				<width>810</width>
+				<width>870</width>
 				<right>0</right>
 				<include content="ContentPanel">
 					<param name="left" value="-72" />
@@ -157,7 +157,9 @@
 					<orientation>vertical</orientation>
 					<animation effect="zoom" start="100,100" end="50,100" center="-50,0" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(73)">conditional</animation>
 				</control>
-				<include>PVRInfoPanel</include>
+				<include content="PVRInfoPanel">
+					<param name="folder_sortorder" value="ascending" />
+				</include>
 			</control>
 		</control>
 		<include content="TopBar">
@@ -168,10 +170,9 @@
 		</include>
 		<control type="label">
 			<right>20</right>
-			<description>Disk usage text</description>
 			<include>OpenClose_Right</include>
 			<bottom>10</bottom>
-			<width>800</width>
+			<width>850</width>
 			<height>60</height>
 			<label>$INFO[PVR.NextTimer]</label>
 			<shadowcolor>black</shadowcolor>