From a96d9449da95482204b70b20031c6007489dd1f8 Mon Sep 17 00:00:00 2001
From: BigNoid <big.noid1979@gmail.com>
Date: Wed, 4 Jul 2012 21:24:25 +0200
Subject: [PATCH] Incorporated most of Deano316 mod

---
 1080i/Includes_MediaFlags.xml | 85 ++++++++++++++++++-----------------
 1080i/Includes_Viewtypes.xml  | 27 ++++++++++-
 1080i/MyVideoNav.xml          |  2 +-
 1080i/Viewtype_Landscape.xml  | 69 +++-------------------------
 4 files changed, 75 insertions(+), 108 deletions(-)

diff --git a/1080i/Includes_MediaFlags.xml b/1080i/Includes_MediaFlags.xml
index e895509615..2d21585cdf 100644
--- a/1080i/Includes_MediaFlags.xml
+++ b/1080i/Includes_MediaFlags.xml
@@ -36,20 +36,11 @@
                 <animation effect="slide" start="0" end="-680" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
                 <animation effect="slide" start="0" end="64" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
                 <animation effect="slide" start="0" end="1050" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
-                <visible>!ListItem.IsFolder</visible>
-            </control>
-            <control type="image" id="76">
-                <posx>165</posx>
-                <posy>987</posy>
-                <include>AudioFlagsVars</include>
-                <texture fallback="flags/studios/default-studio.png">$INFO[ListItem.Studio,flags/studios/,.png]</texture>
-                <animation effect="slide" start="0" end="99" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
-                <animation effect="slide" start="0" end="-645" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
-                <animation effect="slide" start="0" end="1050" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                <animation effect="slide" start="0" end="1425" reversible="true" condition="[Control.IsVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + Container.Content(movies)]">Conditional</animation>
                 <visible>!ListItem.IsFolder</visible>
             </control>
             <control type="group">
-                <visible>[Container.Content(tvshows) | Container.Content(seasons)] + !IsEmpty(ListItem.TVShowTitle)</visible>
+                <visible>[[Container.Content(tvshows) | Container.Content(seasons)] + !IsEmpty(ListItem.TVShowTitle)] | [Control.IsVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + Container.Content(movies)]</visible>
                 <control type="image">
                     <posx>120</posx>
                     <posy>987</posy>
@@ -58,6 +49,7 @@
                     <animation effect="slide" start="0" end="-68" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
                     <animation effect="slide" start="0" end="-812" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
                     <animation effect="slide" start="0" end="1395" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-60" reversible="true" condition="Control.isVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)]">Conditional</animation>
                 </control>
                 <control type="image">
                     <description>Rating Flags</description>
@@ -65,40 +57,50 @@
                     <posy>987</posy>
                     <include>AudioFlagsVars</include>
                     <animation effect="slide" start="0" end="-2205" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-1320" reversible="true" condition="Control.isVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + Container.Content(movies)">Conditional</animation>
                     <texture fallback="flags/rating/MPAA_NR_Certificate_US.png">$VAR[RatingFlagVar,flags/rating/,.png]</texture>
                     <visible>!Control.IsVisible(512)</visible>
                 </control>
             </control>
-            <control type="image">
-                <description>Rating Flags</description>
-                <posx>315</posx>
-                <posy>987</posy>
-                <include>AudioFlagsVars</include>
-                <visible>!Control.IsVisible(516)</visible>
-                <animation effect="slide" start="0" end="138" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
-                <animation effect="slide" start="0" end="-604" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
-                <texture fallback="flags/rating/MPAA_NR_Certificate_US.png">$VAR[RatingFlagVar,flags/rating/,.png]</texture>
-                <visible>!ListItem.IsFolder</visible>
-            </control>
-            <control type="image">
-                <posx>1470</posx>
-                <posy>987</posy>
-                <include>AudioFlagsVars</include>
-                <texture>$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]</texture>
-                <animation effect="slide" start="0" end="-1568" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
-                <animation effect="slide" start="0" end="-824" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
-                <animation effect="slide" start="0" end="-105" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
-                <visible>!ListItem.IsFolder</visible>
-            </control>
-            <control type="image">
-                <posx>1620</posx>
-                <posy>987</posy>
-                <include>AudioFlagsVars</include>
-                <texture>$INFO[ListItem.VideoResolution,flags/resolution/,.png]</texture>
-                <animation effect="slide" start="0" end="-784" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
-                <animation effect="slide" start="0" end="-1528" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
-                <animation effect="slide" start="0" end="-105" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
-                <visible>!ListItem.IsFolder</visible>
+            <control type="group">
+                <visible>!ListItem.IsFolder + ![Control.IsVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + Container.Content(movies)]</visible>
+                <control type="image" id="76">
+                    <posx>165</posx>
+                    <posy>987</posy>
+                    <include>AudioFlagsVars</include>
+                    <texture fallback="flags/studios/default-studio.png">$INFO[ListItem.Studio,flags/studios/,.png]</texture>
+                    <animation effect="slide" start="0" end="99" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-645" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
+                    <animation effect="slide" start="0" end="1050" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                </control>
+                <control type="image">
+                    <description>Rating Flags</description>
+                    <posx>315</posx>
+                    <posy>987</posy>
+                    <include>AudioFlagsVars</include>
+                    <visible>!Control.IsVisible(516)</visible>
+                    <animation effect="slide" start="0" end="138" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-604" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
+                    <texture fallback="flags/rating/MPAA_NR_Certificate_US.png">$VAR[RatingFlagVar,flags/rating/,.png]</texture>
+                </control>
+                <control type="image">
+                    <posx>1470</posx>
+                    <posy>987</posy>
+                    <include>AudioFlagsVars</include>
+                    <texture>$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]</texture>
+                    <animation effect="slide" start="0" end="-1568" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-824" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-105" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                </control>
+                <control type="image">
+                    <posx>1620</posx>
+                    <posy>987</posy>
+                    <include>AudioFlagsVars</include>
+                    <texture>$INFO[ListItem.VideoResolution,flags/resolution/,.png]</texture>
+                    <animation effect="slide" start="0" end="-784" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-1528" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
+                    <animation effect="slide" start="0" end="-105" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                </control>
             </control>
             <control type="image">
                 <description>Audio Flags</description>
@@ -107,6 +109,7 @@
                 <animation effect="slide" start="0" end="-746" reversible="true" condition="Control.IsVisible(512)">Conditional</animation>
                 <animation effect="slide" start="0" end="-1490" reversible="true" condition="Control.IsVisible(514)">Conditional</animation>
                 <animation effect="slide" start="0" end="-105" reversible="true" condition="Control.IsVisible(516)">Conditional</animation>
+                <animation effect="slide" start="0" end="-45" reversible="true" condition="[Control.IsVisible(503) + [Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + Container.Content(movies)]">Conditional</animation>
                 <include>AudioFlagsVars</include>
                 <texture>$VAR[AudioFlagVar,flags/audio/,.png]</texture>
                 <visible>!ListItem.IsFolder</visible>
diff --git a/1080i/Includes_Viewtypes.xml b/1080i/Includes_Viewtypes.xml
index d91d3bbfb2..cce2a0f7af 100644
--- a/1080i/Includes_Viewtypes.xml
+++ b/1080i/Includes_Viewtypes.xml
@@ -46,6 +46,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue1Var]</label>
                 </control>
                 <control type="label">
@@ -64,6 +66,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue2Var]</label>
                 </control>
                 <control type="label">
@@ -82,6 +86,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue3Var]</label>
                 </control>
                 <control type="label">
@@ -114,6 +120,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue4Var]</label>
                     <visible>IsEmpty(ListItem.Top250)</visible>
                 </control>
@@ -133,6 +141,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue5Var]</label>
                 </control>
                 <control type="label">
@@ -151,6 +161,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white2</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue6Var]</label>
                 </control>
                 <control type="textbox">
@@ -355,6 +367,8 @@
                     <width>420</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue1Var]</label>
                 </control>
                 <control type="label">
@@ -373,6 +387,8 @@
                     <width>420</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[FanartPanelValue2Var]</label>
                 </control>
                 <control type="label">
@@ -391,6 +407,8 @@
                     <width>420</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[PosterPanelValue3Var]</label>
                 </control>
                 <control type="label">
@@ -409,7 +427,7 @@
                     <width>422</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
-                    <scrollspeed>50</scrollspeed>
+                    <scrollspeed>20</scrollspeed>
                     <pauseatend>3000</pauseatend>
                     <scrollout>false</scrollout>
                     <label fallback="312577">$VAR[PosterPanelValue4Var]</label>
@@ -430,6 +448,8 @@
                     <width>300</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[PosterPanelValue5Var]</label>
                 </control>
                 <control type="label">
@@ -448,6 +468,8 @@
                     <width>420</width>
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
+                    <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="312577">$VAR[PosterPanelValue6Var]</label>
                 </control>
                 <control type="label">
@@ -467,6 +489,7 @@
                     <font>Font_Reg18</font>
                     <textcolor>white</textcolor>
                     <scroll>true</scroll>
+                    <scrollspeed>20</scrollspeed>
                     <label fallback="31452">$VAR[PosterPanelValue7Var]</label>
                 </control>
                 <control type="textbox">
@@ -672,7 +695,7 @@
             <aligny>center</aligny>
             <font>Font_ShowcaseMainLabel2_Caps</font>
             <scroll>true</scroll>
-            <scrollspeed>50</scrollspeed>
+            <scrollspeed>30</scrollspeed>
             <textcolor>floor</textcolor>
             <shadowcolor>floorshadow</shadowcolor>
             <label>[UPPERCASE]$VAR[FirstLabelVar][/UPPERCASE]</label>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index dcce9460e2..07022a8c72 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -145,7 +145,7 @@
             </control>
         </control>
         <control type="group">
-            <visible>Control.IsVisible(508) | [Control.IsVisible(503) + ![[Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + [Container.Content(tvshows) | Container.Content(movies)]]] | Control.IsVisible(504) | Control.IsVisible(501) | Control.IsVisible(500) | Control.IsVisible(512) | Control.IsVisible(516) | Control.IsVisible(514)</visible>
+            <visible>Control.IsVisible(508) | Control.IsVisible(503) | Control.IsVisible(504) | Control.IsVisible(501) | Control.IsVisible(500) | Control.IsVisible(512) | Control.IsVisible(516) | Control.IsVisible(514)</visible>
             <animation effect="slide" start="0" end="705" time="0" easing="inout" tween="cubic" condition="Control.IsVisible(514)">Conditional</animation>
             <include>FloorFlags</include>
         </control>
diff --git a/1080i/Viewtype_Landscape.xml b/1080i/Viewtype_Landscape.xml
index 0d71e0ba01..033322063b 100644
--- a/1080i/Viewtype_Landscape.xml
+++ b/1080i/Viewtype_Landscape.xml
@@ -235,52 +235,6 @@
             <visible>Control.IsVisible(503)</visible>
             <include condition="!Skin.HasSetting(showcasewrap)">lsfixed</include>
             <include condition="Skin.HasSetting(showcasewrap)">lswrap</include>
-            <control type="group">
-                <visible>[[Skin.HasSetting(landscapeonelogo) | Skin.HasSetting(landscapelogo)] + [Container.Content(tvshows) | Container.Content(movies)]]</visible>
-                <posy>987</posy>
-                <control type="image">
-                    <posx>60</posx>
-                    <posy>0</posy>
-                    <include>AudioFlagsVars</include>
-                    <texture fallback="flags/studios/default-studio.png">$INFO[ListItem.Studio,flags/studios/,.png]</texture>
-                </control>
-                <control type="group">
-                <animation effect="slide" start="0" end="1380" reversible="true" condition="Container.Content(tvshows)">Conditional</animation>
-                    <control type="image">
-                        <posy>1</posy>
-                        <width>112</width>
-                        <posx>345</posx>
-                        <include>AudioFlagsVars</include>
-                        <texture>flags/posters/imdb.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>351</posx>
-                        <posy>27</posy>
-                        <width>135</width>
-                        <height>38</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>Font_Bold24</font>
-                        <textcolor>floor</textcolor>
-                        <label fallback="?">$INFO[ListItem.Rating]</label>
-                    </control>
-                </control>
-                <control type="image">
-                    <posx>1725</posx>
-                    <posy>0</posy>
-                    <include>AudioFlagsVars</include>
-                    <texture>$VAR[AudioFlagVar,flags/audio/,.png]</texture>
-                    <visible>!ListItem.IsFolder</visible>
-                </control>
-                <control type="image">
-                    <description>Audio Flags</description>
-                    <posx>1440</posx>
-                    <posy>0</posy>
-                    <include>AudioFlagsVars</include>
-                    <texture>$INFO[ListItem.VideoResolution,flags/resolution/,.png]</texture>
-                    <visible>!ListItem.IsFolder</visible>
-                </control>
-            </control>
             <control type="group">
                 <control type="label">
                     <posx>510</posx>
@@ -291,7 +245,7 @@
                     <include>Animation_CommonFade</include>
                     <font>Font_ShowcaseMainLabel2_Caps</font>
                     <scroll>true</scroll>
-                    <scrollspeed>50</scrollspeed>
+                    <scrollspeed>30</scrollspeed>
                     <textcolor>floor</textcolor>
                     <shadowcolor>floorshadow</shadowcolor>
                     <label>[UPPERCASE]$INFO[ListItem.Label][/UPPERCASE]</label>
@@ -307,7 +261,7 @@
                     <include>Animation_CommonFade</include>
                     <font>Font_ShowcaseMainLabel2_Caps</font>
                     <scroll>true</scroll>
-                    <scrollspeed>50</scrollspeed>
+                    <scrollspeed>30</scrollspeed>
                     <textcolor>floor</textcolor>
                     <shadowcolor>floorshadow</shadowcolor>
                     <label>[UPPERCASE]$INFO[ListItem.Title][/UPPERCASE]</label>
@@ -316,32 +270,19 @@
                 </control>
                 <control type="label">
                     <posx>510</posx>
-                    <posy>1040</posy>
+                    <posy>1030</posy>
                     <width>900</width>
                     <align>center</align>
                     <aligny>center</aligny>
                     <include>Animation_CommonFade</include>
-                    <font>Font_Info</font>
+                    <font>Font_Bold22</font>
                     <scroll>true</scroll>
-                    <scrollspeed>50</scrollspeed>
+                    <scrollspeed>30</scrollspeed>
                     <textcolor>FFe1e1e1</textcolor>
                     <shadowcolor>black</shadowcolor>
                     <label>$VAR[LandscapeLogoLabelVar]</label>
                     <visible>[Skin.HasSetting(landscapelogo) | Skin.HasSetting(landscapeonelogo)] + [Container.Content(tvshows) | Container.Content(movies)]  + !Control.HasFocus(61)</visible>
                 </control>
-                <!--    <control type="label">
-          <posx>510</posx>
-          <posy>1040</posy>
-          <width>900</width>
-          <align>center</align>
-          <aligny>center</aligny>
-          <include>Animation_CommonFade</include>
-          <font>Font_Info</font>
-          <textcolor>floor</textcolor>
-          <shadowcolor>floorshadow</shadowcolor>
-          <label>$INFO[ListItem.Label2][LOWERCASE]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[16101]: ,)][/LOWERCASE]</label>
-          <visible>Skin.HasSetting(landscapelogo) + Container.Content(tvshows) + Skin.HasSetting(showcaseinfoontv) + !Control.HasFocus(61)</visible>
-        </control>-->
             </control>
         </control>
     </include>