From ee26c8e3e886a99b4074678c86b3c05f33a4f3c1 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sun, 24 Sep 2017 12:30:00 +0100
Subject: [PATCH] testing

---
 1080i/AddonBrowser.xml        |  4 +--
 1080i/DialogAddonInfo.xml     | 10 +++---
 1080i/DialogAddonSettings.xml | 62 ++++++++++-----------------------
 1080i/Home.xml                |  4 +--
 1080i/Includes.xml            |  2 +-
 1080i/Includes_variables.xml  |  4 ++-
 1080i/MyPrograms.xml          | 64 ++++++++++++-----------------------
 1080i/SettingsProfile.xml     | 12 +++++--
 1080i/View_Seasons.xml        | 27 +++++++++++++--
 changelog.txt                 |  2 +-
 10 files changed, 87 insertions(+), 104 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 2b58878..0b0229f 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -304,9 +304,9 @@
                         <posy>577</posy>
                         <width>8-col</width>
                         <height>141</height>
-                        <texture>colors/white.png</texture>
+                        <texture>colors/black.png</texture>
                         <aspectratio>stretch</aspectratio>
-                        <colordiffuse>highlight</colordiffuse>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>24</posx>
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 150a045..7341369 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -110,8 +110,8 @@
                 </control>
                 <control type="label">
                     <description>Addon Title</description>
-                    <posx>2-col-indent</posx>
-                    <posy>6</posy>
+                    <posx>2-col</posx>
+                    <posy>12</posy>
                     <width>10-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -119,11 +119,11 @@
                     <label>$INFO[ListItem.addonname]$INFO[ListItem.addonversion, (,)]</label>
                 </control>
                 <control type="label">
-                    <posx>2-col-indent</posx>
+                    <posx>2-col</posx>
                     <posy>84</posy>
                     <width>9-col</width>
                     <font>buttonTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <textcolor>textDisabled</textcolor>
                     <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,]</label>
                 </control>
                 <control type="textbox" id="400">
@@ -132,7 +132,7 @@
                     <font>textbox</font>
                     <width>12-col-gutter</width>
                     <height>7-row</height>
-                    <label>$INFO[ListItem.AddonDescription]</label>
+                    <label fallback="31205">$INFO[ListItem.AddonDescription]</label>
                     <autoscroll>false</autoscroll>
                     <pagecontrol>61</pagecontrol>
                 </control>
diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml
index 5acb117..3f5ed19 100644
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@@ -5,51 +5,25 @@
         <include>globalBackground</include>
         <!--configuration options-->
         <control type="group">
-            <posx>col-2-begin</posx>
-            <posy>row-2-begin</posy>
+            <posx>col-4-begin</posx>
+            <posy>row-4-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <!--content provider title / info-->
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>22-col</width>
+                <width>18-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-            </control>
+            </control>  
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>22-col</width>
-                <height>10-row</height>
-                <aspectratio aligny="center">scale</aspectratio>
-                <texture fallback="colors/offblack.png">$INFO[ListItem.art(fanart)]</texture>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>22-col</width>
-                <height>10-row</height>
-                <aspectratio aligny="center">scale</aspectratio>
-                <texture>vignette.png</texture>
-            </control>
-            <control type="image">
-                <posx>12</posx>
-                <posy>3-row</posy>
-                <width>4-col-gutter</width>
-                <height>4-col-gutter</height>
-                <aspectratio>stretch</aspectratio>
-                <texture>$INFO[System.AddonIcon(ListItem.Addonid)]</texture>
-                <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>12-row</posy>
-                <width>22-col</width>
-                <height>13-row</height>
+                <width>18-col</width>
+                <height>20-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -57,7 +31,7 @@
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
-                <width>23-col</width>
+                <width>17-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
@@ -67,9 +41,9 @@
             <!--subnav-->
             <control type="grouplist" id="9">
                 <posx>0</posx>
-                <posy>12-row</posy>
+                <posy>2-row</posy>
                 <width>4-col</width>
-                <height>12-row</height>
+                <height>20-row</height>
                 <onleft>9000</onleft>
                 <onright>2</onright>
                 <orientation>vertical</orientation>
@@ -77,28 +51,28 @@
             <!--options area-->
             <control type="image">
                 <posx>4-col</posx>
-                <posy>12-row</posy>
-                <width>14-col</width>
-                <height>13-row</height>
+                <posy>2-row</posy>
+                <width>10-col</width>
+                <height>20-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="grouplist" id="2">
                 <posx>4-col</posx>
-                <posy>12-row</posy>
-                <width>14-col</width>
-                <height>13-row</height>
+                <posy>2-row</posy>
+                <width>10-col</width>
+                <height>20-row</height>
                 <onleft>9</onleft>
                 <onright>9001</onright>
                 <orientation>vertical</orientation>
             </control>
             <!--OK / Cancel-->
             <control type="panel" id="9001">
-                <posx>18-col</posx>
-                <posy>12-row</posy>
+                <posx>14-col</posx>
+                <posy>2-row</posy>
                 <width>4-col</width>
-                <height>6-row</height>
+                <height>20-row</height>
                 <orientation>vertical</orientation>
                 <onleft>2</onleft>
                 <itemlayout width="6-col" height="2-row">
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 25a7e08..c5cbee9 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -43,7 +43,7 @@
 					<width>4-col-textbox</width>
 					<height>105</height>
 					<texture>colors/black.png</texture>
-					<colordiffuse>overlay</colordiffuse>
+					<colordiffuse>77000000</colordiffuse>
 					<aspectratio>stretch</aspectratio>
 				</control>
 				<control type="textbox">
@@ -154,7 +154,7 @@
             <posy>row-8-begin</posy>
             <control type="label">
                 <posx>0</posx>
-                <posy>-36</posy>
+                <posy>-48</posy>
                 <width>24-col</width>
                 <height>2-row</height>
                 <align>center</align>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index f1819d2..90a0c8a 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -167,7 +167,7 @@
 			<control type="label">
 	            <posx>0</posx>
 	            <posy>0</posy>
-	            <width>12-col</width>
+	            <width>18-col</width>
 	            <font>pageTitle</font>
 	            <label>$VAR[listTitle]</label>
 	            <textcolor>textActive</textcolor>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 8d0b504..338aa5d 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -25,6 +25,7 @@
 		<value condition="Window.isactive(TVchannels) | Window.isactive(TVGuide)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
 		<value condition="Window.isactive(RadioChannels)">$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
 		<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
+		<value condition="Window.isactive(programs)">$LOCALIZE[10506]</value>
 	</variable>
     <variable name="listSubTitle">
         <value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
@@ -32,12 +33,13 @@
 		<value condition="Window.isactive(Weather)">$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</value>
 		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
 		<value condition="Window.isactive(TVRecordings)">$INFO[container.numitems] $LOCALIZE[31165]</value>
+		<value condition="Window.isactive(programs)">$INFO[container.Numitems,, $LOCALIZE[31145]]</value>
     </variable>
     <!--list view item detail / subheader-->
     <variable name="itemDetail">
         <value condition="Container.Content(movies)">$INFO[Listitem.duration,, $LOCALIZE[31018]]</value>
         <value condition="Container.Content(tvshows) + !isempty(listitem.property(totalseasons))">[B]$INFO[ListItem.Property(TotalSeasons)][/B] $LOCALIZE[31188] • [B]$INFO[ListItem.Property(NumEpisodes)][/B] $LOCALIZE[31189]</value>
-        <value condition="Container.Content(seasons)">$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[16101]]</value>
+        <value condition="Container.Content(seasons)">$INFO[ListItem.Property(TotalEpisodes)] $LOCALIZE[31189]</value>
         <value condition="Container.Content(artists)">$INFO[ListItem.Property(Artist_Genre)]</value>
         <value/>
     </variable>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index e286763..ed1d586 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -33,10 +33,20 @@
                                 <width>4-col-gutter</width>
                                 <height>4-col-gutter</height>
                                 <aspectratio>stretch</aspectratio>
-                                <texture border="6">DefaultAlbumCover.png</texture>
-                                <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
+                                <texture border="6">colors/black.png</texture>
+                                <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                                 <bordersize>6</bordersize>
-                                <colordiffuse>overlay</colordiffuse>
+								<colordiffuse>overlay</colordiffuse>
+                            </control>
+							<control type="image">
+                                <posx>0</posx>
+                                <posy>0</posy>
+                                <width>4-col-gutter</width>
+                                <height>4-col-gutter</height>
+                                <aspectratio>stretch</aspectratio>
+                                <texture>$INFO[Listitem.thumb]</texture>
+                                <bordersize>6</bordersize>
+		                        <colordiffuse>ffffffff</colordiffuse>
                             </control>
                             <control type="label">
                                 <posx>12</posx>
@@ -58,17 +68,6 @@
                                 <textcolor>textDisabled</textcolor>
                                 <label>$INFO[ListItem.AddonSummary]</label>
                             </control>
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <height>4-col-gutter</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="6">$INFO[Listitem.thumb]</texture>
-                                <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                                <bordersize>6</bordersize>
-                                <colordiffuse>ffFFFFFF</colordiffuse>
-                            </control>
                         </itemlayout>
                         <focusedlayout width="4-col" height="348">
                             <control type="group">
@@ -79,10 +78,10 @@
                                     <width>4-col-gutter</width>
                                     <height>4-col-gutter</height>
                                     <aspectratio>stretch</aspectratio>
-                                    <texture border="6">DefaultAlbumCover.png</texture>
-                                    <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-                                    <bordersize>6</bordersize>
-                                    <colordiffuse>ff666666</colordiffuse>
+                                    <texture border="6">colors/black.png</texture>
+		                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+		                            <bordersize>6</bordersize>
+		                            <colordiffuse>FF000000</colordiffuse>
                                 </control>
                                 <control type="image">
                                     <posx>0</posx>
@@ -90,9 +89,9 @@
                                     <width>4-col-gutter</width>
                                     <height>4-col-gutter</height>
                                     <aspectratio>stretch</aspectratio>
-                                    <texture border="6">$INFO[Listitem.thumb]</texture>
-                                    <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+                                    <texture>$INFO[Listitem.thumb]</texture>
                                     <bordersize>6</bordersize>
+		                            <colordiffuse>ffffffff</colordiffuse>
                                 </control>
                                 <control type="label">
                                     <posx>12</posx>
@@ -131,31 +130,10 @@
                     <onback>9999</onback>
                 </control>
             </control>
-            <!--Folder titles-->
+			<!--page header-->
             <control type="group">
-                <!--source title-->
-                <control type="label">
-                    <posx>col-1-begin</posx>
-                    <posy>row-1-begin</posy>
-                    <width>24-col</width>
-                    <align>left</align>
-                    <font>pageTitle</font>
-                    <label>10506</label>
-                    <textcolor>textActive</textcolor>
-                </control>
-                <!--source subtitle-->
-                <control type="label">
-                    <posx>col-1-begin</posx>
-                    <posy>96</posy>
-                    <width>24-col</width>
-                    <align>left</align>
-                    <font>regular</font>
-                    <label>$INFO[container.Numitems,, $LOCALIZE[31145]]</label>
-                    <textcolor>textActive</textcolor>
-                </control>
+				<include>pageHeader</include>    
             </control>
-            <!--dateTime-->
-            <include>dateTime</include>
         </control>
         <!--mini window-->
         <include>miniVideoPlayer</include>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index 654d18d..ea97e9d 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -58,6 +58,15 @@
                 <texture>colors/black.png</texture>
                 <colordiffuse>textboxInactive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+            </control>
+			<control type="image">
+                <posx>0</posx>
+                <posy>12-row</posy>
+                <width>8-col</width>
+                <height>10-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
              <control type="label">
                 <posx>0</posx>
@@ -95,9 +104,8 @@
                         <width>69</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture fallback="colors/black.png">$INFO[listitem.icon]</texture>
+                        <texture fallback="colors/offblack.png">$INFO[listitem.icon]</texture>
                         <bordersize>0</bordersize>
-                        <colordiffuse>ffffffff</colordiffuse>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index fccfe3e..65f4862 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -23,17 +23,28 @@
                 <control type="group">
                     <visible>!Substring(Container.folderpath,plugin)</visible>
                     <posx>col-1-begin</posx>
-                    <posy>row-9-begin</posy>
+                    <posy>row-4-begin</posy>
 					<control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>24-col</width>
-                        <height>8-row</height>
+                        <height>3-row</height>
                         <font>veryLargeLight</font>
                         <textcolor>66ffffff</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <wrapmultiline>true</wrapmultiline>
-                        <label>$INFO[container.foldername]</label>
+                        <label>$INFO[container.showtitle]</label>
+                    </control>
+					<control type="textbox">
+                        <posx>0</posx>
+                        <posy>4-row</posy>
+                        <width>10-col</width>
+                        <height>198</height>
+                        <font>textbox</font>
+                        <textcolor>66ffffff</textcolor>
+                        <shadowcolor>-</shadowcolor>
+						<autoscroll delay="3000" time="1000" repeat="10000"></autoscroll>
+                        <label>$INFO[container.showplot]</label>
                     </control>
                 </control>
                 <!--overlay-->
@@ -75,6 +86,16 @@
                             <colordiffuse>overlay</colordiffuse>
                         </control>
 						<control type="image">
+							<visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
+							<posx>6</posx>
+							<posy>0</posy>
+							<width>252</width>
+							<height>6</height>
+							<aspectratio>stretch</aspectratio>
+							<texture border="6">colors/white.png</texture>
+							<colordiffuse>highlight</colordiffuse>
+						</control>
+						<control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>4-col-gutter</width>
diff --git a/changelog.txt b/changelog.txt
index 199b28f..9e25de2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,7 +4,7 @@
 DONE - set ondown in movie view etc to select first item in grid
 - recent tvshow episode listing not working 
 
-- Add progress bar to resumable content
+DONE - Add progress bar to resumable content
 
 [V1.2.4]
 - [UPDATED] French language file