rollback

jeroenpardon · Feb 7, 2015 · 0d1a867 · 0d1a867
1 parent e033cb9
commit 0d1a867
Show file tree

Hide file tree

Showing 28 changed files with 244 additions and 3,408 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,4 @@
 /720p/script-skinshortcuts-includes.xml
 /Build.command
 720p/custom_Test.xml
-shortcuts/overrides2.xml
-720p/custom_Test(alt).xml
+shortcuts/overrides2.xml
diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
@@ -14,6 +14,7 @@
 		</control>
 		<control type="grouplist" id="500">
 			<left>460</left>
+			<top>0</top>
 			<width>352</width>
 			<height>screen_Height</height>
 			<onup>500</onup>

diff --git a/720p/DialogContextMenu.xml b/720p/DialogContextMenu.xml
@@ -1,66 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol>1000</defaultcontrol>
-    <include>transition_Dialog</include>
-    <coordinates>
-        <system>1</system>
-        <left>0</left>
-        <top>0</top>
-        <origin x="485" y="100" />
-    </coordinates>
-    <controls>
-        <control type="image" id="999">
-            <width>310</width>
-            <height>536</height>
-            <include>dialog_Menu</include>
-        </control>
-        <control type="image">
-            <left>4</left>
-            <top>18</top>
-            <width>302</width>
-            <include>dialog_Separator</include>
-        </control>
-        <control type="grouplist" id="996">
-            <left>4</left>
-            <top>18</top>
-            <width>302</width>
-            <height min="40" max="500">auto</height>
-            <itemgap>0</itemgap>
-            <!--trailer-->
-            <control type="button" id="997">
-                <width>302</width>
-                <label>$LOCALIZE[20410]</label>
-                <onclick>PlayMedia($ESCINFO[ListItem.Trailer])</onclick>
-                <include>dialog_ControlCommons</include>
-                <visible>Container.Content(movies) + !IsEmpty(ListItem.Trailer)</visible>
-            </control>
-            <!--default button-->
-            <control type="button" id="1000">
-                <width>302</width>
-                <include>dialog_ControlCommons</include>
-            </control>
-            <!--extended info
-            <control type="button" id="1100">
-                <include>dialog_ControlCommons</include>
-                <label>ExtendedInfo</label>
-                <onclick>RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[ListItem.DBID],name=$INFO[ListItem.Title])</onclick>
-            </control>
-            <control type="button" id="1000">
-                <width>302</width>
-                <label>extinfo</label>
-                <onclick>RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[ListItem.Label])</onclick>
-                <include>dialog_ControlCommons</include>
-            </control>
-            -->
-            <!--Trakt
-            <control type="button" id="1033">
-                <width>302</width>
-                <label>Trakt.tv</label>
-                <onclick>RunScript(script.trakt,action=contextmenu)</onclick>
-                <include>dialog_ControlCommons</include>
-                <visible>System.HasAddon(script.trakt)</visible>
-            </control>
-            -->
-        </control>
-    </controls>
+	<defaultcontrol>1000</defaultcontrol>
+	<include>transition_Dialog</include>
+	<coordinates>
+		<system>1</system>
+		<left>0</left>
+		<top>0</top>
+		<origin x="485" y="100" />
+	</coordinates>
+	<controls>
+		<control type="image" id="999">
+			<width>310</width>
+			<height>536</height>
+			<include>dialog_Menu</include>
+		</control>
+		<control type="image">
+			<left>4</left>
+			<top>18</top>
+			<width>302</width>
+			<include>dialog_Separator</include>
+		</control>
+		<control type="grouplist" id="996">
+			<left>4</left>
+			<top>18</top>
+			<width>302</width>
+			<height min="40" max="500">auto</height>
+			<itemgap>0</itemgap>
+			<control type="button" id="997">
+				<width>302</width>
+				<label>$LOCALIZE[20410]</label>
+				<onclick>PlayMedia($ESCINFO[ListItem.Trailer])</onclick>
+				<include>dialog_ControlCommons</include>
+				<visible>Container.Content(movies) + !IsEmpty(ListItem.Trailer)</visible>
+			</control>
+		</control>
+		<!--default button-->
+		<control type="button" id="1000">
+			<left>9</left>
+			<width>335</width>
+			<include>dialog_ControlCommons</include>
+		</control>
+	</controls>
 </window>
diff --git a/720p/Home.xml b/720p/Home.xml
@@ -134,5 +134,16 @@
 			</animation>
 			<visible>Window.Previous(startup)</visible>
 		</control>
+
+
+		<control type="label">
+				<width>1060</width>
+				<label>111$INFO[Container(9271).ListItem(1).Label]</label>
+				<font>regular_Small-U</font>
+				<textcolor>Color1</textcolor>
+				<include>fadeinout</include>
+			</control>
+
+
 	</controls>
 </window>
diff --git a/720p/HomeMenu.xml b/720p/HomeMenu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<includes>  
+<includes>	
 	<include name="home_Menu-vertical">
 		<control type="group">
 			<animation effect="Slide" time="250" start="0" end="-320" tween="Quadratic" easing="Out" reversible="false" condition="ControlGroup(9200).HasFocus()">Conditional</animation>
@@ -70,9 +70,6 @@
 					<onright condition="StringCompare(Container(9000).ListItem.Property(Widget),NowPlaying)">9251</onright>
 					<onright condition="StringCompare(Container(9000).ListItem.Property(Widget),Weather)">9261</onright>
 					<onright condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies) + !Container(9270).IsUpdating">9270</onright>
-					<!--
-					<onright condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingShows) + !Container(9271).IsUpdating">9271</onright>
-					-->
 					<onleft>RunScript(script.skinshortcuts,type=hidesubmenu&amp;mainmenuID=9000)</onleft>
 					<onback>RunScript(script.skinshortcuts,type=hidesubmenu&amp;mainmenuID=9000)</onback>
 					<pagecontrol>80</pagecontrol>
@@ -233,7 +230,6 @@
 						<onup condition="StringCompare(Container(9000).ListItem.Property(widgetType),playlist)">9240</onup>
 						<onup condition="StringCompare(Container(9000).ListItem.Property(Widget),NowPlaying)">9251</onup>
 						<onup condition="StringCompare(Container(9000).ListItem.Property(Widget),Weather)">9261</onup>
-						<onup condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies) + !Container(9270).IsUpdating">9270</onup>
 						<ondown>9100</ondown>
 						<focusposition>2</focusposition>
 						<movement>2</movement>

diff --git a/720p/IncludesAddons.xml b/720p/IncludesAddons.xml
@@ -169,24 +169,4 @@
 			</control>
 		</focusedlayout>
 	</include>
-
-
-
-	<include name="trailers-ContainerCommons">
-		<top>80</top>
-		<width>970</width>
-		<height>720</height>
-		<onleft>500</onleft>
-		<onright>70</onright>
-		<pagecontrol>70</pagecontrol>
-		<preloaditems>2</preloaditems>
-		<orientation>vertical</orientation>
-		<include>global_ListScroll</include>
-		<include>transition_Content</include>
-		<include>fadeinout</include>
-	</include>
-
-
-
-
 </includes>
diff --git a/720p/IncludesHome.xml b/720p/IncludesHome.xml
@@ -235,18 +235,15 @@
 						<visible>StringCompare(Container(9000).ListItem.Property(Widget),Weather)</visible>
 					</control>
 				</control>
+
 				<control type="list" id="9270">
 					<content>plugin://script.extendedinfo?info=trendingmovies</content>
+					<onclick>PlayMedia($ESCINFO[ListItem.Trailer])</onclick>
 					<include>widget_ContainerCommons</include>
 					<visible>StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies)</visible>
 				</control>
-				<!--
-				<control type="list" id="9271">
-					<content>plugin://script.extendedinfo?info=trendingshows</content>
-					<include>widget_ContainerCommons</include>
-					<visible>StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingShows)</visible>
-				</control>
-				-->
+
+
 			</control>
 		</control>
 	</include>

diff --git a/720p/Settings.xml b/720p/Settings.xml
@@ -17,7 +17,7 @@
 				<onup>50</onup>
 				<ondown>50</ondown>
 				<include>global_ListScroll</include>
-				<include>transition_Content</include>   
+				<include>transition_Content</include>	
 				<itemlayout width="550" height="100">
 					<control type="image">
 						<width>94</width>
@@ -81,7 +81,7 @@
 						<include>detail_Sub</include>
 					</control>
 				</focusedlayout>
-				<content>
+			 	<content>
 					<item id="1">
 						<label>$LOCALIZE[157]</label>
 						<icon>DefaultMovies.png</icon>

diff --git a/720p/SettingsScreenCalibration.xml b/720p/SettingsScreenCalibration.xml
@@ -10,7 +10,7 @@
 		<control type="image">
 			<include>screen_Dimensions</include>
 			<texture>black.png</texture>
-		</control>  
+		</control>	
 		<!--top left mover-->
 		<control type="mover" id="8">
 			<width>128</width>

diff --git a/720p/SettingsSystemInfo.xml b/720p/SettingsSystemInfo.xml
@@ -180,7 +180,7 @@
 							<include>settings_Listbutton</include>
 						</control>
 					</control>
-				</control>              
+				</control>				
 				<control type="grouplist">
 					<itemgap>2</itemgap>
 					<visible>Control.HasFocus(195)</visible>

diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
@@ -311,7 +311,7 @@
 					</control>
 				</control>
 
-			<!--VIEW SETTINGS-->                    
+			<!--VIEW SETTINGS-->					
 				<control type="grouplist" id="700">
 					<width>850</width>
 					<height>598</height>
@@ -501,7 +501,7 @@
 					</control>
 				</control>
 
-			<!--SKIN CREDITS-->         
+			<!--SKIN CREDITS-->			
 				<control type="grouplist" id="1000">
 					<width>850</width>
 					<height>598</height>

diff --git a/720p/SmartPlaylistEditor.xml b/720p/SmartPlaylistEditor.xml
@@ -195,7 +195,7 @@
 						<include>dialog_SectionSeparator</include>
 					</control>
 					<control type="group" id="9002">
-						<top>40</top>   
+						<top>40</top>	
 						<control type="spincontrolex" id="16">
 							<width>642</width>
 							<label>$LOCALIZE[21424]</label>

diff --git a/720p/Variables.xml b/720p/Variables.xml
@@ -58,7 +58,6 @@
 		<value condition="StringCompare(Container(9000).ListItem.Property(widgetType),playlist)">$LOCALIZE[31033] [B]$INFO[Container(9240).CurrentPage][/B] $LOCALIZE[20163] [B]$INFO[Container(9240).NumItems][/B]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),Weather)">$INFO[Container(9261).ListItem(0).Property(ExtendedInfo1)]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies)">$LOCALIZE[31033] [B]$INFO[Container(9270).CurrentPage][/B] $LOCALIZE[20163] [B]$INFO[Container(9270).NumItems][/B]</value>
-		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingShows)">$LOCALIZE[31033] [B]$INFO[Container(9280).CurrentPage][/B] $LOCALIZE[20163] [B]$INFO[Container(9271).NumItems][/B]</value>
 	</variable>
 
 	<variable name="widget:Header.Info">
@@ -82,10 +81,7 @@
 		<value condition="StringCompare(Container(9000).ListItem.Property(widgetType),playlist)">$INFO[Container(9240).ListItem(0).Title]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),NowPlaying)">$INFO[MusicPlayer.Title]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),Weather)">$INFO[Container(9261).ListItem(0).Label]</value>
-		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies) + Container(9270).IsUpdating">$LOCALIZE[31710]...</value>
-		<!--<value condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingShows) + Container(9271).IsUpdating">$LOCALIZE[31710]...</value>-->
-		<value condition="SubString(Container(9000).ListItem.Property(Widget),Trakt)">Trakt.tv</value>
-
+		<value condition="StringCompare(Container(9000).ListItem.Property(Widget),TraktTrendingMovies)">Trakt.tv</value>
 	</variable>
 
 	<variable name="widget:Item.Title">
@@ -96,6 +92,8 @@
 	</variable>
 
 	<variable name="widget:Item.Info">
+		<value>$INFO[ListItem.Property(Trailer)]</value>
+
 		<value condition="StringCompare(Container(9000).ListItem.Property(widgetType),music)">$INFO[ListItem.Genre]$INFO[ListItem.Year, • ]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(widgetType),episodes)">$INFO[ListItem.Season,$LOCALIZE[20373] ]$INFO[ListItem.Episode, - $LOCALIZE[20359] ]$INFO[ListItem.Studio, • ]</value>
 		<value condition="StringCompare(Container(9000).ListItem.Property(widgetType),movies)">$INFO[ListItem.Genre]$INFO[ListItem.Director, • ]$INFO[ListItem.Studio, • ]$INFO[ListItem.Year, • ]$INFO[ListItem.RatingandVotes, • ]</value>

diff --git a/720p/ViewBanner.xml b/720p/ViewBanner.xml
@@ -10,7 +10,7 @@
 		<control type="group">
 			<left>7</left>
 			<top>7</top>
-			<control type="image">  
+			<control type="image">	
 				<width>558</width>
 				<height>103</height>
 				<texture background="true">thumbs/default_Banner.png</texture>
@@ -40,7 +40,7 @@
 	</include>
 	<include name="view_Banner">
 		<control type="panel" id="54">
-			<viewtype label="31110">wide</viewtype>     
+			<viewtype label="31110">wide</viewtype> 	
 			<left>35</left>
 			<top>90</top>
 			<width>572</width>
@@ -77,7 +77,7 @@
 			<include>transition_Content</include>
 			<include>transition_Info</include>
 			<visible>Control.IsVisible(54) + [Container.Content(tvshows) | [Container.Content(movies) + Skin.HasSetting(banner.movies.enable)]]</visible>
-			<control type="grouplist">  
+			<control type="grouplist">	
 				<itemgap>0</itemgap>
 				<control type="label" id="1">
 					<width>550</width>
@@ -136,7 +136,7 @@
 		<control type="group">
 			<left>7</left>
 			<top>7</top>
-			<control type="image">  
+			<control type="image">	
 				<width>590</width>
 				<height>109</height>
 				<texture background="true">thumbs/default_Banner.png</texture>

diff --git a/720p/ViewGallery.xml b/720p/ViewGallery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-<!--STRIP LAYOUT--> 
+<!--STRIP LAYOUT-->	
 	<include name="view_Gallery">
 		<!--content detail-->
 		<control type="group">
@@ -211,7 +211,7 @@
 					</control>
 				</focusedlayout>
 			</control>
-			<!--frame-->                                                                
+			<!--frame-->																
 			<control type="image">
 				<left>255</left>
 				<top>129</top>
@@ -260,7 +260,7 @@
 			<include>art_DefaultIcon</include>
 		</control>
 	</include>
-	<include name="view_GalleryFull">                                                                                                                   
+	<include name="view_GalleryFull">																													
 		<control type="wraplist" id="531">
 			<viewtype label="31111">biginfo</viewtype>
 			<include>screen_Dimensions</include>
@@ -306,7 +306,7 @@
 					<include>osd_Title</include>
 				</control>
 				<control type="label">
-					<top>25</top>       
+					<top>25</top>		
 					<width>1150</width>
 					<label>$VAR[media:Info]</label>
 					<include>osd_Sub</include>