From d187e3ed07311edfbcb6e85b0a9f973f1f98e1e1 Mon Sep 17 00:00:00 2001
From: xhaggi <sascha.woo@gmail.com>
Date: Fri, 27 Jan 2017 11:36:46 +0100
Subject: [estouchy][refactor] use new window id for GUIDialogPVRChannelGuide

---
 addons/skin.estouchy/xml/DialogPVRChannelGuide.xml | 215 +++++++++++++++++++++
 addons/skin.estouchy/xml/DialogPVRGuideOSD.xml     | 215 ---------------------
 addons/skin.estouchy/xml/Includes.xml              |   2 +-
 3 files changed, 216 insertions(+), 216 deletions(-)
 create mode 100644 addons/skin.estouchy/xml/DialogPVRChannelGuide.xml
 delete mode 100644 addons/skin.estouchy/xml/DialogPVRGuideOSD.xml

(limited to 'addons')

diff --git a/addons/skin.estouchy/xml/DialogPVRChannelGuide.xml b/addons/skin.estouchy/xml/DialogPVRChannelGuide.xml
new file mode 100644
index 0000000000..5457d355a3
--- /dev/null
+++ b/addons/skin.estouchy/xml/DialogPVRChannelGuide.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol always="true">11</defaultcontrol>
+	<include>16x9_xPos_Relocation</include>
+	<include>Window_OpenClose_Animation_Zoom</include>
+	<coordinates>
+		<posx>240</posx>
+		<posy>100</posy>
+	</coordinates>
+	<controls>
+		<include>BehindDialogFadeOut</include>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>800</width>
+			<height>60</height>
+			<texture border="5">dialog_header.png</texture>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>60</posy>
+			<width>800</width>
+			<height>720</height>
+			<texture>dialog_back.png</texture>
+		</control>
+		<control type="label">
+			<description>header label</description>
+			<posx>20</posx>
+			<posy>0</posy>
+			<include>WindowTitleCommons</include>
+			<width>700</width>
+			<label>$INFO[VideoPlayer.ChannelName]</label>
+		</control>
+		<control type="group">
+			<posx>730</posx>
+			<posy>0</posy>
+			<include>DialogCloseButtonCommons</include>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>60</posy>
+			<width>750</width>
+			<height>720</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="list" id="11">
+			<posx>0</posx>
+			<posy>60</posy>
+			<width>750</width>
+			<height>720</height>
+			<onleft>60</onleft>
+			<onright>60</onright>
+			<onup>11</onup>
+			<ondown>11</ondown>
+			<viewtype label="535">list</viewtype>
+			<pagecontrol>60</pagecontrol>
+			<scrolltime>200</scrolltime>
+			<itemlayout height="90" width="750">
+				<control type="image">
+					<posx>2</posx>
+					<posy>2</posy>
+					<width>86</width>
+					<height>86</height>
+					<texture background="true">$VAR[PosterThumb]</texture>
+					<aspectratio>keep</aspectratio>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>0</posy>
+					<width>640</width>
+					<height>40</height>
+					<font>font20_title</font>
+					<selectedcolor>selected</selectedcolor>
+					<align>left</align>
+					<aligny>center</aligny>
+					<label>[B]$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label][/B]</label>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>28</posy>
+					<width>640</width>
+					<height>40</height>
+					<font>font22</font>
+					<selectedcolor>selected</selectedcolor>
+					<align>left</align>
+					<aligny>center</aligny>
+					<label>$INFO[ListItem.Title]</label>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>63</posy>
+					<width>100</width>
+					<height>20</height>
+					<font>font14_title</font>
+					<textcolor>blue</textcolor>
+					<selectedcolor>blue</selectedcolor>
+					<align>center</align>
+					<label>$INFO[ListItem.StartTime]</label>
+					<visible>ListItem.HasEpg</visible>
+				</control>
+				<control type="progress">
+					<description>Progress</description>
+					<posx>200</posx>
+					<posy>70</posy>
+					<width>450</width>
+					<height>10</height>
+					<info>ListItem.Progress</info>
+				</control>
+				<control type="label">
+					<posx>650</posx>
+					<posy>63</posy>
+					<width>100</width>
+					<height>20</height>
+					<font>font14_title</font>
+					<textcolor>blue</textcolor>
+					<selectedcolor>blue</selectedcolor>
+					<align>center</align>
+					<label>$INFO[ListItem.EndTime]</label>
+					<visible>ListItem.HasEpg</visible>
+				</control>
+			</itemlayout>
+			<focusedlayout height="90" width="750">
+				<control type="image">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>750</width>
+					<height>90</height>
+					<texture>list_focus.png</texture>
+					<include>VisibleFadeEffect</include>
+				</control>
+				<control type="image">
+					<posx>2</posx>
+					<posy>2</posy>
+					<width>86</width>
+					<height>86</height>
+					<texture background="true">$VAR[PosterThumb]</texture>
+					<aspectratio>keep</aspectratio>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>0</posy>
+					<width>640</width>
+					<height>40</height>
+					<font>font20_title</font>
+					<selectedcolor>selected</selectedcolor>
+					<align>left</align>
+					<aligny>center</aligny>
+					<label>[B]$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label][/B]</label>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>28</posy>
+					<width>640</width>
+					<height>40</height>
+					<font>font22</font>
+					<selectedcolor>selected</selectedcolor>
+					<align>left</align>
+					<aligny>center</aligny>
+					<label>$INFO[ListItem.Title]</label>
+				</control>
+				<control type="label">
+					<posx>100</posx>
+					<posy>63</posy>
+					<width>100</width>
+					<height>20</height>
+					<font>font14_title</font>
+					<textcolor>blue</textcolor>
+					<selectedcolor>blue</selectedcolor>
+					<align>center</align>
+					<label>$INFO[ListItem.StartTime]</label>
+					<visible>ListItem.HasEpg</visible>
+				</control>
+				<control type="progress">
+					<description>Progress</description>
+					<posx>200</posx>
+					<posy>70</posy>
+					<width>450</width>
+					<height>10</height>
+					<info>ListItem.Progress</info>
+				</control>
+				<control type="label">
+					<posx>650</posx>
+					<posy>63</posy>
+					<width>100</width>
+					<height>20</height>
+					<font>font14_title</font>
+					<textcolor>blue</textcolor>
+					<selectedcolor>blue</selectedcolor>
+					<align>center</align>
+					<label>$INFO[ListItem.EndTime]</label>
+					<visible>ListItem.HasEpg</visible>
+				</control>
+			</focusedlayout>
+		</control>
+		<control type="scrollbar" id="60">
+			<posx>770</posx>
+			<posy>90</posy>
+			<width>10</width>
+			<height>660</height>
+			<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
+			<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
+			<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
+			<textureslidernib>blank.png</textureslidernib>
+			<textureslidernibfocus>blank.png</textureslidernibfocus>
+			<onleft>11</onleft>
+			<onright>11</onright>
+			<ondown>60</ondown>
+			<onup>60</onup>
+			<showonepage>false</showonepage>
+			<orientation>vertical</orientation>
+			<animation effect="fade" time="150">Visible</animation>
+			<animation effect="fade" time="150">Hidden</animation>
+		</control>
+	</controls>
+</window>
diff --git a/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml b/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml
deleted file mode 100644
index 5457d355a3..0000000000
--- a/addons/skin.estouchy/xml/DialogPVRGuideOSD.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-	<defaultcontrol always="true">11</defaultcontrol>
-	<include>16x9_xPos_Relocation</include>
-	<include>Window_OpenClose_Animation_Zoom</include>
-	<coordinates>
-		<posx>240</posx>
-		<posy>100</posy>
-	</coordinates>
-	<controls>
-		<include>BehindDialogFadeOut</include>
-		<control type="image">
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>800</width>
-			<height>60</height>
-			<texture border="5">dialog_header.png</texture>
-		</control>
-		<control type="image">
-			<posx>0</posx>
-			<posy>60</posy>
-			<width>800</width>
-			<height>720</height>
-			<texture>dialog_back.png</texture>
-		</control>
-		<control type="label">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>0</posy>
-			<include>WindowTitleCommons</include>
-			<width>700</width>
-			<label>$INFO[VideoPlayer.ChannelName]</label>
-		</control>
-		<control type="group">
-			<posx>730</posx>
-			<posy>0</posy>
-			<include>DialogCloseButtonCommons</include>
-		</control>
-		<control type="image">
-			<posx>0</posx>
-			<posy>60</posy>
-			<width>750</width>
-			<height>720</height>
-			<texture colordiffuse="40000000">panel.png</texture>
-		</control>
-		<control type="list" id="11">
-			<posx>0</posx>
-			<posy>60</posy>
-			<width>750</width>
-			<height>720</height>
-			<onleft>60</onleft>
-			<onright>60</onright>
-			<onup>11</onup>
-			<ondown>11</ondown>
-			<viewtype label="535">list</viewtype>
-			<pagecontrol>60</pagecontrol>
-			<scrolltime>200</scrolltime>
-			<itemlayout height="90" width="750">
-				<control type="image">
-					<posx>2</posx>
-					<posy>2</posy>
-					<width>86</width>
-					<height>86</height>
-					<texture background="true">$VAR[PosterThumb]</texture>
-					<aspectratio>keep</aspectratio>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>0</posy>
-					<width>640</width>
-					<height>40</height>
-					<font>font20_title</font>
-					<selectedcolor>selected</selectedcolor>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>[B]$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label][/B]</label>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>28</posy>
-					<width>640</width>
-					<height>40</height>
-					<font>font22</font>
-					<selectedcolor>selected</selectedcolor>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>$INFO[ListItem.Title]</label>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>63</posy>
-					<width>100</width>
-					<height>20</height>
-					<font>font14_title</font>
-					<textcolor>blue</textcolor>
-					<selectedcolor>blue</selectedcolor>
-					<align>center</align>
-					<label>$INFO[ListItem.StartTime]</label>
-					<visible>ListItem.HasEpg</visible>
-				</control>
-				<control type="progress">
-					<description>Progress</description>
-					<posx>200</posx>
-					<posy>70</posy>
-					<width>450</width>
-					<height>10</height>
-					<info>ListItem.Progress</info>
-				</control>
-				<control type="label">
-					<posx>650</posx>
-					<posy>63</posy>
-					<width>100</width>
-					<height>20</height>
-					<font>font14_title</font>
-					<textcolor>blue</textcolor>
-					<selectedcolor>blue</selectedcolor>
-					<align>center</align>
-					<label>$INFO[ListItem.EndTime]</label>
-					<visible>ListItem.HasEpg</visible>
-				</control>
-			</itemlayout>
-			<focusedlayout height="90" width="750">
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>750</width>
-					<height>90</height>
-					<texture>list_focus.png</texture>
-					<include>VisibleFadeEffect</include>
-				</control>
-				<control type="image">
-					<posx>2</posx>
-					<posy>2</posy>
-					<width>86</width>
-					<height>86</height>
-					<texture background="true">$VAR[PosterThumb]</texture>
-					<aspectratio>keep</aspectratio>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>0</posy>
-					<width>640</width>
-					<height>40</height>
-					<font>font20_title</font>
-					<selectedcolor>selected</selectedcolor>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>[B]$INFO[ListItem.ChannelNumberLabel,,. ]$INFO[ListItem.Label][/B]</label>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>28</posy>
-					<width>640</width>
-					<height>40</height>
-					<font>font22</font>
-					<selectedcolor>selected</selectedcolor>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>$INFO[ListItem.Title]</label>
-				</control>
-				<control type="label">
-					<posx>100</posx>
-					<posy>63</posy>
-					<width>100</width>
-					<height>20</height>
-					<font>font14_title</font>
-					<textcolor>blue</textcolor>
-					<selectedcolor>blue</selectedcolor>
-					<align>center</align>
-					<label>$INFO[ListItem.StartTime]</label>
-					<visible>ListItem.HasEpg</visible>
-				</control>
-				<control type="progress">
-					<description>Progress</description>
-					<posx>200</posx>
-					<posy>70</posy>
-					<width>450</width>
-					<height>10</height>
-					<info>ListItem.Progress</info>
-				</control>
-				<control type="label">
-					<posx>650</posx>
-					<posy>63</posy>
-					<width>100</width>
-					<height>20</height>
-					<font>font14_title</font>
-					<textcolor>blue</textcolor>
-					<selectedcolor>blue</selectedcolor>
-					<align>center</align>
-					<label>$INFO[ListItem.EndTime]</label>
-					<visible>ListItem.HasEpg</visible>
-				</control>
-			</focusedlayout>
-		</control>
-		<control type="scrollbar" id="60">
-			<posx>770</posx>
-			<posy>90</posy>
-			<width>10</width>
-			<height>660</height>
-			<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
-			<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
-			<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
-			<textureslidernib>blank.png</textureslidernib>
-			<textureslidernibfocus>blank.png</textureslidernibfocus>
-			<onleft>11</onleft>
-			<onright>11</onright>
-			<ondown>60</ondown>
-			<onup>60</onup>
-			<showonepage>false</showonepage>
-			<orientation>vertical</orientation>
-			<animation effect="fade" time="150">Visible</animation>
-			<animation effect="fade" time="150">Hidden</animation>
-		</control>
-	</controls>
-</window>
diff --git a/addons/skin.estouchy/xml/Includes.xml b/addons/skin.estouchy/xml/Includes.xml
index 7cc0cfc056..c3e5134050 100644
--- a/addons/skin.estouchy/xml/Includes.xml
+++ b/addons/skin.estouchy/xml/Includes.xml
@@ -2450,7 +2450,7 @@
 		<control type="button">
 			<label>19222</label>
 			<include>MenuButtonCommonValues</include>
-			<onclick>ActivateWindow(PVROSDGuide)</onclick>
+			<onclick>ActivateWindow(pvrchannelguide)</onclick>
 			<visible>VideoPlayer.Content(LiveTV)</visible>
 		</control>
 		<control type="button">
-- 
cgit v1.2.3