Skip to content

Commit

Permalink
Fixed Panel Info for Vertical Menu when Middlemenu setting is still on
Browse files Browse the repository at this point in the history
  • Loading branch information
magnumdoomguy committed Mar 18, 2016
1 parent e99be21 commit ee16e0e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions 1080i/includes_widgetspanel1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down
14 changes: 7 additions & 7 deletions 1080i/includes_widgetspanel2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down Expand Up @@ -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 -->
Expand Down

0 comments on commit ee16e0e

Please sign in to comment.