From 1bb91d61e9b5ef3edfcce33f867c0e0315637b66 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:41:03 +0100
Subject: [PATCH] various

---
 1080i/DialogAddonInfo.xml                   |  2 +-
 1080i/DialogContextMenu.xml                 | 24 ++-----
 1080i/DialogVideoInfo.xml                   |  7 ++
 1080i/MyPrograms.xml                        | 80 +++++++++++----------
 1080i/SettingsSystemInfo.xml                |  6 +-
 1080i/View_TVShows.xml                      | 50 +++++++++++++
 language/resource.language.en_gb/strings.po |  4 ++
 7 files changed, 110 insertions(+), 63 deletions(-)

diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 498f29c..1675010 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -129,7 +129,7 @@
                  </control>
             </control>
             <!--dialog controls-->
-            <control type="grouplist">
+            <control type="grouplist" id="8000">
                 <visible>!Window.IsVisible(AddonSettings) + !Window.IsActive(TextViewer)</visible>
                 <posx>0</posx>
                 <posy>372</posy>
diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index 4831017..f4ff3ef 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -13,30 +13,14 @@
 			<height>18-row</height>
         </control>
 		<control type="group">
-			<control type="grouplist" id="9004">
-				<visible>!integer.IsGreater(Container(996).NumItems,0)</visible>
-				<posx>col-7-begin</posx>
-	            <posy>8-row</posy>
-	            <itemgap>0</itemgap>
-	            <width>8-col</width>
-	            <height>16-row</height>
-	            <itemgap>0</itemgap>
-				<onleft>996</onleft>
-	            <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
-	            <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
-	            <include condition="window.isactive(pictures)">picturesSideMenu</include>
-	            <include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
-				<include condition="window.isactive(games)">gameSideMenu</include>
-	        </control>
 	        <control type="button" id="1000">
 	            <description>Buttons</description>
-                <texturenofocus colordiffuse="d0000000" diffuse="masks/contextMenu.png">colors/black.png</texturenofocus>
-	            <texturefocus colordiffuse="highlight" diffuse="masks/contextMenu.png">colors/white.png</texturefocus>
-	            <focusedcolor>textActive</focusedcolor>
+                <texturefocus border="24" colordiffuse="ffffffff">UIControls/button.png</texturefocus>
+                <texturenofocus border="24" colordiffuse="ff000000">UIControls/button.png</texturenofocus>
 	            <width>8-col</width>
+                <align>center</align>
+                <textoffsetx>0</textoffsetx>
                 <align>left</align>
-                <textoffsetx>24</textoffsetx>
-                <font>buttonTitle</font>
 	        </control>
 		</control>
         <!--debugging-->
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 27c2e34..f0ac39c 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -151,10 +151,17 @@
                         <thumb></thumb>
                     </item>
                     <item>
+                        <visible>container.content(movies)</visible>
                         <label>$LOCALIZE[180]</label>
                         <label2>$INFO[ListItem.duration(H)]hr $INFO[ListItem.duration(MM)]min</label2>
                         <thumb></thumb>
                     </item>
+                    <item>
+                        <visible>!container.content(movies)</visible>
+                        <label>$LOCALIZE[31256]</label>
+                        <label2>$INFO[ListItem.Property(UnWatchedEpisodes)]</label2>
+                        <thumb></thumb>
+                    </item>
                 </content>
             </control>
             <!--content-->
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 6a5385c..6acce97 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -27,24 +27,24 @@
 			            <onup>50</onup>
 			            <pagecontrol>60</pagecontrol>
 			            <itemlayout width="24-col" height="2-row">
-			                <control type="image">
-			                    <posx>0</posx>
-			                    <posy>3</posy>
-			                    <width>66</width>
-			                    <height>66</height>
-			                    <aspectratio scalediffuse="false">stretch</aspectratio>
-			                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-			                	<colordiffuse>overlay</colordiffuse>
-							</control>
-			                <control type="image">
-			                    <posx>1-col</posx>
-			                    <posy>0</posy>
-			                    <width>23-col</width>
-			                    <height>69</height>
-			                    <aspectratio>stretch</aspectratio>
-			                    <texture border="0">colors/black.png</texture>
-			                    <colordiffuse>overlay</colordiffuse>
-			                </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/black.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
+            					<colordiffuse>overlay</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>1-col</posx>
+                                <posy>0</posy>
+                                <width>23-col</width>
+                                <height>69</height>
+                                <aspectratio>stretch</aspectratio>
+                                <texture>masks/tvChannel.png</texture>
+                                <colordiffuse>d0000000</colordiffuse>
+                            </control>
 			                <control type="label">
 			                    <posx>1-col-indent</posx>
 			                    <posy>0</posy>
@@ -70,27 +70,29 @@
 			                </control>
 			            </itemlayout>
 			            <focusedlayout width="24-col" height="2-row">
-			                <control type="image">
-			                    <posx>0</posx>
-			                    <posy>3</posy>
-			                    <width>66</width>
-			                    <height>66</height>
-			                    <aspectratio scalediffuse="false">stretch</aspectratio>
-			                    <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-			                    <animation type="focus" loop="false" reversible="false">
-			                        <effect type="fade" time="500"/>
-			                        <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
-			                    </animation>
-			                </control>
-			                <control type="image">
-			                    <posx>1-col</posx>
-			                    <posy>0</posy>
-			                    <width>23-col</width>
-			                    <height>2-row</height>
-			                    <aspectratio>stretch</aspectratio>
-			                    <texture border="0">colors/white.png</texture>
-			                    <colordiffuse>highlight</colordiffuse>
-			                </control>
+                            <control type="image">
+                                <posx>0</posx>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
+                                <aspectratio scalediffuse="false">stretch</aspectratio>
+                                <texture fallback="colors/white.png" diffuse="masks/iconEndCapLeft.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <animation type="focus" loop="false" reversible="false">
+                                    <effect type="fade" time="500"/>
+                                    <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                                    <effect type="fade" start="100" end="50" time="0"/>
+                                </animation>
+                                <colordiffuse>highlight</colordiffuse>
+                            </control>
+                            <control type="image">
+                                <posx>1-col</posx>
+                                <posy>0</posy>
+                                <width>23-col</width>
+                                <height>69</height>
+                                <aspectratio>stretch</aspectratio>
+            					<texture border="0">masks/tvChannel.png</texture>
+            					<colordiffuse>highlight</colordiffuse>
+                            </control>
 			                <control type="label">
 			                    <posx>1-col-indent</posx>
 			                    <posy>0</posy>
diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml
index c7eaae6..5165dfc 100644
--- a/1080i/SettingsSystemInfo.xml
+++ b/1080i/SettingsSystemInfo.xml
@@ -96,14 +96,14 @@
                 <width>24-col</width>
                 <height>21-row</height>
                 <ondown>activateWindow(home)</ondown>
-                <itemlayout width="6-col" height="10-row">
+                <itemlayout width="432" height="10-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>6-col-gutter</width>
                         <height>9-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
+                        <texture border="24">dialogBackground.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>overlay</colordiffuse>
                     </control>
@@ -112,7 +112,7 @@
                         <posy>12</posy>
                         <width>384</width>
                         <height>2-row</height>
-                        <texture>colors/white.png</texture>
+                        <texture border="10">masks/menuTitle.png</texture>
                         <colordiffuse>highlight</colordiffuse>
                         <aspectratio>stretch</aspectratio>
                     </control>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index e654a83..5e7dd61 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -323,6 +323,31 @@
 						<texture diffuse="masks/poster.png">$INFO[ListItem.Art(poster)]</texture>
 						<colordiffuse>88FFFFFF</colordiffuse>
 					</control>
+                    <control type="group">
+                        <visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
+                        <posx>96r</posx>
+                        <posy>12</posy>
+    					<control type="image">
+    						<posx>0</posx>
+    						<posy>0</posy>
+    						<width>38</width>
+    						<height>38</height>
+    						<aspectratio>stretch</aspectratio>
+    						<texture diffuse="masks/square.png">colors/white.png</texture>
+    						<colordiffuse>highlight</colordiffuse>
+    					</control>
+            			<control type="label">
+                            <posx>0</posx>
+                            <posy>-2</posy>
+                            <width>38</width>
+                            <height>38</height>
+                            <aligny>center</aligny>
+                            <align>center</align>
+                            <font>smallStrong</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
+                        </control>
+                    </control>
 					<control type="textbox">
 						<visible>!controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
@@ -350,6 +375,31 @@
 	                        <bordersize>6</bordersize>
 							<colordiffuse>ffffffff</colordiffuse>
 						</control>
+                        <control type="group">
+                            <visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
+                            <posx>98r</posx>
+                            <posy>12</posy>
+        					<control type="image">
+        						<posx>0</posx>
+        						<posy>0</posy>
+        						<width>38</width>
+        						<height>38</height>
+        						<aspectratio>stretch</aspectratio>
+        						<texture diffuse="masks/square.png">colors/white.png</texture>
+        						<colordiffuse>highlight</colordiffuse>
+        					</control>
+                			<control type="label">
+                                <posx>0</posx>
+                                <posy>-2</posy>
+                                <width>38</width>
+                                <height>38</height>
+                                <aligny>center</aligny>
+                                <align>center</align>
+                                <font>smallStrong</font>
+                                <textcolor>textActive</textcolor>
+                                <label>$INFO[ListItem.Property(UnWatchedEpisodes)]</label>
+                            </control>
+                        </control>
 						<control type="textbox">
                             <visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 9635a05..b862e03 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -539,3 +539,7 @@ msgstr ""
 msgctxt "#31255"
 msgid "Go to Album"
 msgstr ""
+
+msgctxt "#31256"
+msgid "Unwatched Episodes"
+msgstr ""