From ee16e0e24582ec23da703a6d49612c0a49ffe983 Mon Sep 17 00:00:00 2001
From: magnumdoomguy <lawrence.popa@mohawkcollege.ca>
Date: Fri, 18 Mar 2016 00:54:33 -0400
Subject: [PATCH] Fixed Panel Info for Vertical Menu when Middlemenu setting is
 still on

---
 1080i/includes_widgetspanel1.xml |  8 ++++----
 1080i/includes_widgetspanel2.xml | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/1080i/includes_widgetspanel1.xml b/1080i/includes_widgetspanel1.xml
index 4c81e8eb5..228df89e7 100644
--- a/1080i/includes_widgetspanel1.xml
+++ b/1080i/includes_widgetspanel1.xml
@@ -209,7 +209,7 @@
 				<width>1472</width>
 				<height>342</height>
 				<texture border="40">$VAR[HomeWidgetBackgroundVar]</texture>
-				<visible>[[!Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [!Skin.HasSetting(Widget.OnDeck.Movies.Fanart) + Container(11001).ListItem.Type(movie) + Control.IsVisible(11001)] | [[IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork)) + Container(11001).ListItem.Type(episode) + Control.IsVisible(11001)]] + [!Control.HasFocus(11001) | [Control.HasFocus(11001) + Skin.HasSetting(middlemainmenu)]]</visible>
+				<visible>[[!Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [!Skin.HasSetting(Widget.OnDeck.Movies.Fanart) + Container(11001).ListItem.Type(movie) + Control.IsVisible(11001)] | [[IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork)) + Container(11001).ListItem.Type(episode) + Control.IsVisible(11001)]] + [!Control.HasFocus(11001) | [Control.HasFocus(11001) + Skin.HasSetting(middlemainmenu) + !Skin.HasSetting(Homemenu.Vertical)]]</visible>
 			</control>
 			<control type="image">
 				<posx>224</posx>
@@ -233,7 +233,7 @@
 				<width>1472</width>
 				<height>308</height>
 				<texture border="40">$VAR[HomeWidgetBackgroundVar]</texture>
-				<visible>[[IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork)) + Container(11000).ListItem.Type(photo) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork)) + Container(11000).ListItem.Type(album) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [Skin.HasSetting(Widget.OnDeck.Movies.Fanart) + Container(11001).ListItem.Type(movie) + Control.IsVisible(11001)] | [![IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [!IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork)) + Container(11001).ListItem.Type(episode) + Control.IsVisible(11001)] | [!IsEmpty(Skin.String(Widget.Channels.Artwork)) + Control.IsVisible(11002)] | Control.IsVisible(11003)] + [!Control.HasFocus(11001) | [Control.HasFocus(11001) + Skin.HasSetting(middlemainmenu)]]</visible>
+				<visible>[[IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork)) + Container(11000).ListItem.Type(photo) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork)) + Container(11000).ListItem.Type(album) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [Skin.HasSetting(Widget.OnDeck.Movies.Fanart) + Container(11001).ListItem.Type(movie) + Control.IsVisible(11001)] | [![IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode) + Control.IsVisible(11000) + !Control.IsVisible(11001)] | [!IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork)) + Container(11001).ListItem.Type(episode) + Control.IsVisible(11001)] | [!IsEmpty(Skin.String(Widget.Channels.Artwork)) + Control.IsVisible(11002)] | Control.IsVisible(11003)] + [!Control.HasFocus(11001) | [Control.HasFocus(11001) + Skin.HasSetting(middlemainmenu) + !Skin.HasSetting(Homemenu.Vertical)]]</visible>
 			</control>
 			<control type="image">
 				<posx>224</posx>
@@ -262,7 +262,7 @@
 								
 			<!-- Panel Info (Portrait) -->
 			<control type="group">
-				<visible>Control.HasFocus(11001) + [[Container(11001).ListItem.Type(movie) + !Skin.HasSetting(Widget.OnDeck.Movies.Fanart)] | [Container(11001).ListItem.Type(episode) + IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork))]] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11001) + [[Container(11001).ListItem.Type(movie) + !Skin.HasSetting(Widget.OnDeck.Movies.Fanart)] | [Container(11001).ListItem.Type(episode) + IsEmpty(Skin.String(Widget.OnDeck.TV.Artwork))]] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,648" condition="Control.IsVisible(11001) + Skin.HasSetting(Homemenu.Vertical)">Conditional</animation>
 						
 				<!-- Movie Poster -->
@@ -894,7 +894,7 @@
 			
 			<!-- Panel Info (Landscape) -->
 			<control type="group">
-				<visible>Control.HasFocus(11001) + [[Container(11001).ListItem.Type(movie) + Skin.HasSetting(Widget.OnDeck.Movies.Fanart)] | [Container(11001).ListItem.Type(episode) + [StringCompare(Skin.String(Widget.OnDeck.TV.Artwork),Thumbnail) | StringCompare(Skin.String(Widget.OnDeck.TV.Artwork),Fanart)]]] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11001) + [[Container(11001).ListItem.Type(movie) + Skin.HasSetting(Widget.OnDeck.Movies.Fanart)] | [Container(11001).ListItem.Type(episode) + [StringCompare(Skin.String(Widget.OnDeck.TV.Artwork),Thumbnail) | StringCompare(Skin.String(Widget.OnDeck.TV.Artwork),Fanart)]]] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,580" condition="Skin.HasSetting(Homemenu.Vertical)">Conditional</animation>
 			
 				<!-- Fanart Movies -->
diff --git a/1080i/includes_widgetspanel2.xml b/1080i/includes_widgetspanel2.xml
index c98284385..fd141cf88 100644
--- a/1080i/includes_widgetspanel2.xml
+++ b/1080i/includes_widgetspanel2.xml
@@ -12,7 +12,7 @@
 				<width>1472</width>
 				<height>342</height>
 				<texture border="40">$VAR[HomeWidgetBackgroundVar]</texture>
-				<visible>[[!Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie)] | [[IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode)]] + [!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu)]]</visible>
+				<visible>[[!Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie)] | [[IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode)]] + [!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu) + !Skin.HasSetting(Homemenu.Vertical)]]</visible>
 			</control>
 			<control type="image">
 				<posx>224</posx>
@@ -36,7 +36,7 @@
 				<width>1472</width>
 				<height>308</height>
 				<texture border="40">$VAR[HomeWidgetBackgroundVar]</texture>
-				<visible>[[Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie)] | [![IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode)] | [Container(11000).ListItem.Type(album) + StringCompare(Skin.String(Widget.RecentlyAdded.Music.Artwork),Fanart)] | [Container(11000).ListItem.Type(photo) + !IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork))]] + [[!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu)]] | [Container(11000).ListItem.Type(photo) + !IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork))]]</visible>
+				<visible>[[Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart) + Container(11000).ListItem.Type(movie)] | [![IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)] + Container(11000).ListItem.Type(episode)] | [Container(11000).ListItem.Type(album) + StringCompare(Skin.String(Widget.RecentlyAdded.Music.Artwork),Fanart)] | [Container(11000).ListItem.Type(photo) + !IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork))]] + [[!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu) + !Skin.HasSetting(Homemenu.Vertical)]] | [Container(11000).ListItem.Type(photo) + !IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork))]]</visible>
 			</control>
 			<control type="image">
 				<posx>224</posx>
@@ -60,7 +60,7 @@
 				<width>1472</width>
 				<height>324</height>
 				<texture border="40">$VAR[HomeWidgetBackgroundVar]</texture>
-				<visible>[IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork)) + Container(11000).ListItem.Type(photo)] | [IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork)) + Container(11000).ListItem.Type(album) + [!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu)]]]</visible>
+				<visible>[IsEmpty(Skin.String(Widget.RecentlyAdded.Photo.Artwork)) + Container(11000).ListItem.Type(photo)] | [IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork)) + Container(11000).ListItem.Type(album) + [!Control.HasFocus(11000) | [Control.HasFocus(11000) + Skin.HasSetting(middlemainmenu) + !Skin.HasSetting(Homemenu.Vertical)]]]</visible>
 			</control>
 			<control type="image">
 				<posx>224</posx>
@@ -81,7 +81,7 @@
 						
 			<!-- Panel Info (Portrait) -->
 			<control type="group">
-				<visible>Control.HasFocus(11000) + [[Container(11000).ListItem.Type(movie) + !Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart)] | [Container(11000).ListItem.Type(episode) + [IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)]]] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11000) + [[Container(11000).ListItem.Type(movie) + !Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart)] | [Container(11000).ListItem.Type(episode) + [IsEmpty(Skin.String(Widget.RecentlyAdded.TV.Artwork)) |  StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Season Poster)]]] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,648" condition="[Control.IsVisible(11001) + !Skin.HasSetting(Homemenu.Vertical)] | [!Control.IsVisible(11001) + Skin.HasSetting(Homemenu.Vertical)]">Conditional</animation>
 				
 				<!-- Movie Poster -->
@@ -704,7 +704,7 @@
 			
 			<!-- Panel Info (Landscape) -->
 			<control type="group">
-				<visible>Control.HasFocus(11000) + [[Container(11000).ListItem.Type(movie) + Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart)] | [Container(11000).ListItem.Type(episode) + [StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Thumbnail) | StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Fanart)]]] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11000) + [[Container(11000).ListItem.Type(movie) + Skin.HasSetting(Widget.RecentlyAdded.Movies.Fanart)] | [Container(11000).ListItem.Type(episode) + [StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Thumbnail) | StringCompare(Skin.String(Widget.RecentlyAdded.TV.Artwork),Fanart)]]] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,580" condition="[Control.IsVisible(11001) + !Skin.HasSetting(Homemenu.Vertical)] | [!Control.IsVisible(11001) + Skin.HasSetting(Homemenu.Vertical)]">Conditional</animation>
 							
 				<!-- Fanart Movies -->
@@ -1278,7 +1278,7 @@
 			
 			<!-- Panel Info (Landscape Music) -->
 			<control type="group">
-				<visible>Control.HasFocus(11000) + [Container(11000).ListItem.Type(album) + StringCompare(Skin.String(Widget.RecentlyAdded.Music.Artwork),Fanart)] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11000) + [Container(11000).ListItem.Type(album) + StringCompare(Skin.String(Widget.RecentlyAdded.Music.Artwork),Fanart)] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,580" condition="[Control.IsVisible(11001) + !Skin.HasSetting(Homemenu.Vertical)] | [!Control.IsVisible(11001) + Skin.HasSetting(Homemenu.Vertical)]">Conditional</animation>
 											
 				<!-- Fanart Movies -->
@@ -1442,7 +1442,7 @@
 			
 			<!-- Panel Info (Square) -->
 			<control type="group">
-				<visible>Control.HasFocus(11000) + [Container(11000).ListItem.Type(album) + IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork))] + !Skin.HasSetting(middlemainmenu)</visible>
+				<visible>Control.HasFocus(11000) + [Container(11000).ListItem.Type(album) + IsEmpty(Skin.String(Widget.RecentlyAdded.Music.Artwork))] + [!Skin.HasSetting(middlemainmenu) | [Skin.HasSetting(middlemainmenu) + Skin.HasSetting(Homemenu.Vertical)]]</visible>
 				<animation effect="slide" end="0,612" condition="Skin.HasSetting(Homemenu.Vertical)">Conditional</animation>
 							
 				<!-- Poster -->