REMOVED: TitleMod

ADDED: Youtrailer script in video info window (optional) ADDED: Trailers Link in MainMenu (need to set path in options first) ADDED: playlist link in mainmenu when music is playing CHANGED: scroll times FIXED: shadow for nowplaying in home when focussing weather ADDED: cover for nowplayingwidget some more small fixes
temmi2000 · Feb 11, 2010 · cfd971a · cfd971a
1 parent 4ffbebf
commit cfd971a
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 155 deletions.
diff --git a/720p/Customisation.xml b/720p/Customisation.xml
@@ -304,6 +304,12 @@
 				<onclick>Skin.SetFile(startuplocation,.m3u,Q:\UserData\playlists\music\)</onclick>
 				<visible>Skin.HasSetting(startplay)</visible>
 			</control>	
+			<control type="radiobutton" id="405">
+				<include>Objects_SettingsDefaultRadioButton</include>
+				<label>USE YOUTRAILER SCRIPT FOR TRAILER IN MOVIE INFO</label>
+				<onclick>Skin.ToggleSetting(youtrailer)</onclick>
+				<selected>Skin.HasSetting(youtrailer)</selected>
+			</control>
 		</control>
 		<control type="grouplist" id="16">
 			<include>Objects_SettingsControlAreaVars</include>

diff --git a/720p/Customisation2.xml b/720p/Customisation2.xml
@@ -389,12 +389,6 @@
  				<selected>Skin.HasSetting(mediamenuslide)</selected>
 			</control>	
 			<control type="radiobutton" id="1111">		
-				<include>Objects_SettingsDefaultRadioButton</include>
- 				<label>32009</label>
- 				<onclick>Skin.ToggleSetting(notitlemodtv)</onclick>
- 				<selected>Skin.HasSetting(notitlemodtv)</selected>
-			</control>
-			<control type="radiobutton" id="1112">		
 				<include>Objects_SettingsDefaultRadioButton</include>
  				<label>32010</label>
  				<onclick>Skin.ToggleSetting(showcasefixedlist)</onclick>

diff --git a/720p/Customisation3.xml b/720p/Customisation3.xml
@@ -902,6 +902,13 @@
 				<onclick>Skin.ToggleSetting(animation_bg)</onclick>
 				<selected>Skin.HasSetting(animation_bg)</selected>
 			</control>
+			<control type="button" id="515">
+				<include>Objects_SettingsDefaultRadioButton</include>
+				<label>Path To Apple Movie Trailers Script</label>
+				<label2>$INFO[Skin.String(trailerpath)]</label2>
+				<onclick>Skin.SetFile(trailerpath,.py)</onclick>
+				<visible>!Skin.HasSetting(notrailers)</visible>
+			</control>
 		</control>
 		<control type="grouplist" id="12">
 			<include>Objects_SettingsControlAreaVars</include>

diff --git a/720p/DialogAlbumInfo.xml b/720p/DialogAlbumInfo.xml
@@ -227,7 +227,7 @@
 				<height>262</height>
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
-				<autoscroll delay="3000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<label fallback="31424">$INFO[ListItem.Property(Album_Description)]</label>
 				<include>Colour_OffWhite</include>
 			</control>
@@ -340,7 +340,7 @@
 				<height>380</height>
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
-				<autoscroll delay="3000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<label fallback="31415">$INFO[ListItem.Property(Artist_Description)]</label>
 				<include>Colour_OffWhite</include>
 			</control>

diff --git a/720p/DialogSongInfo.xml b/720p/DialogSongInfo.xml
@@ -201,7 +201,7 @@
 				<height>262</height>
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
-				<autoscroll delay="3000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<label fallback="31428">$INFO[ListItem.Comment]</label>
 				<include>Colour_OffWhite</include>
 			</control>

diff --git a/720p/DialogVideoInfo.xml b/720p/DialogVideoInfo.xml
@@ -254,28 +254,35 @@
 				<item id="4">
 					<label>31409</label>
 					<onclick>SendClick(2003,11)</onclick>
-					<visible>!IsEmpty(ListItem.Trailer) + Container.Content(movies)</visible>
+					<visible>!IsEmpty(ListItem.Trailer) + Container.Content(movies) + !Skin.HasSetting(youtrailer)</visible>
 				</item>
 				<item id="5">
+					<label>TRAILER</label>
+					<onclick>RunScript(special://home/scripts/YouTrailer/default.py,1)</onclick>
+					<onclick>Action(FullScreen)</onclick>
+					<visible>!Skin.HasSetting(kioskininfo) + Container.Content(movies) + Skin.HasSetting(youtrailer)</visible>
+					<description>Trailers</description>
+				</item>
+				<item id="6">
 					<label>314122</label>
 					<visible>Container.Content(movies)</visible>
 					<onclick>Playlist.Clear</onclick>
 					<onclick>Dialog.Close(MovieInformation)</onclick>
 					<onclick>RunScript(special://home/scripts/Home Theater Experience/default.py)</onclick>
 				</item>
-				<item id="6">
+				<item id="7">
 					<label>31410</label>
 					<onclick>SendClick(2003,6)</onclick>
 					<visible>!Skin.HasSetting(kioskininfo)</visible>
 					<description>Refresh</description>
 				</item>
-				<item id="7">
+				<item id="8">
 					<label>13405</label>
 					<onclick>SendClick(2003,10)</onclick>
 					<visible>!Skin.HasSetting(kioskininfo)</visible>
 					<description>Get Thumb</description>
 				</item>
-				<item id="8">
+				<item id="9">
 					<label>20413</label>
 					<onclick>SendClick(2003,12)</onclick>
 					<visible>!Skin.HasSetting(kioskininfo) + !Container.Content(episodes) + !Container.Content(seasons)</visible>
@@ -516,7 +523,7 @@
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
 				<label fallback="31414">$INFO[ListItem.Plot]</label>
-				<autoscroll delay="6000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<include>Colour_OffWhite</include>
 				<!-- castmod prevents it from showing when cast container shows -->
 				<visible>!Control.IsVisible(50)</visible>
@@ -656,7 +663,7 @@
 				<height>212</height>
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
-				<autoscroll delay="7000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<label fallback="31414">$INFO[ListItem.Plot]</label>
 				<include>Colour_OffWhite</include>
 				<visible>!Control.IsVisible(50)</visible>
@@ -802,7 +809,7 @@
 				<height>212</height>
 				<align>left</align>
 				<font>Font_FSInfoPlot</font>
-				<autoscroll delay="7000" time="1000" repeat="10000">Skin.HasSetting(allowscroll)</autoscroll>
+				<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 				<label fallback="31414">$INFO[ListItem.Plot]</label>
 				<include>Colour_OffWhite</include>
 				<visible>!Control.IsVisible(50)</visible>

diff --git a/720p/Font.xml b/720p/Font.xml
@@ -566,12 +566,6 @@
 			<size>22</size>
 			<linespacing>0.9</linespacing>
 		</font>
-		<font>
-			<name>Font_Vitals</name>
-			<filename>aeon_settings.ttf</filename>
-			<size>21</size>
-			<linespacing>2.4</linespacing>
-		</font>
 		<!-- Wall -->
 		<font>
 			<name>Font_WallLabelMain</name>
@@ -594,12 +588,6 @@
 			<size>14</size>
 			<linespacing>1.28</linespacing>
 		</font>
-		<font>
-			<name>Font_WallTitleMod</name>
-			<filename>aeon_rss.ttf</filename>
-			<size>17</size>
-			<shadow>55000000</shadow>
-		</font>
 		<!-- OSD -->
 		<font>
 			<name>Font_OSDSeek</name>
@@ -670,12 +658,7 @@
 		</font>
 <!--Title Mod-->
 		<font>
-			<name>Font_MultiplexTitleMod</name>
-			<filename>scoutcond.ttf</filename>
-			<size>28</size>			
-		</font>
-		<font>
-			<name>Font_MultiplexTitleModBig</name>
+			<name>Font_ListPlaylist</name>
 			<filename>scoutcond.ttf</filename>
 			<size>50</size>			
 		</font>

diff --git a/720p/Home.xml b/720p/Home.xml
@@ -64,7 +64,7 @@
 			<visible>control.HasFocus(510) + Container(300).HasFocus(6)</visible>
 		</control>
 		<control type="image"><!--Audio unten-->
-			<visible>Player.HasAudio + !Skin.HasSetting(lowermainmenu) +[[Skin.HasSetting(lowerwidgets) + !Control.HasFocus(510)] | [!Skin.HasSetting(lowerwidgets) + Control.HasFocus(510)]]</visible>
+			<visible>Player.HasAudio + !Skin.HasSetting(lowermainmenu) +[[Skin.HasSetting(lowerwidgets) + !Control.HasFocus(510)] | [!Skin.HasSetting(lowerwidgets) + [Control.HasFocus(510) | Container(300).HasFocus(10)]]]</visible>
 			<posx>0</posx>
 			<posy>360</posy>
 			<width>1280</width>
@@ -85,7 +85,7 @@
 			<include>Animation_OpenCloseBackgroundShade</include>
 		</control>
 		<control type="image"><!--Audio oben-->
-			<visible>Player.HasAudio + [[!Skin.HasSetting(lowermainmenu) +[[Skin.HasSetting(lowerwidgets) + Control.HasFocus(510)] | [!Skin.HasSetting(lowerwidgets) + !Control.HasFocus(510)]]] | [Skin.HasSetting(lowermainmenu) + Control.HasFocus(510)]]</visible>
+			<visible>Player.HasAudio + !Container(300).HasFocus(10) + [[!Skin.HasSetting(lowermainmenu) +[[Skin.HasSetting(lowerwidgets) + Control.HasFocus(510)] | [!Skin.HasSetting(lowerwidgets) + !Control.HasFocus(510)]]] | [Skin.HasSetting(lowermainmenu) + Control.HasFocus(510)]]</visible>
 			<posx>0</posx>
 			<posy>-4</posy>
 			<width>1280</width>

diff --git a/720p/Includes_Backgrounds.xml b/720p/Includes_Backgrounds.xml
@@ -67,6 +67,12 @@
 		<imagepath>special://skin/media/backdrops/default_movies/</imagepath>
 		<info>Skin.String(CustomMovies)</info>
 	</include>
+	<include name="BackgroundVarsTrailers">
+		<icon>special://skin/media/backdrops/default_movies/</icon>
+		<thumb>$INFO[Skin.String(CustomTrailers)]</thumb>
+		<imagepath>special://skin/media/backdrops/default_movies/</imagepath>
+		<info>Skin.String(CustomTrailers)</info>
+	</include>
 	<include name="BackgroundVarsTV">
 		<icon>special://skin/media/backdrops/default_tvshows/</icon>
 		<thumb>$INFO[Skin.String(CustomTV)]</thumb>

diff --git a/720p/Includes_Furniture.xml b/720p/Includes_Furniture.xml
@@ -538,13 +538,13 @@
 			<posx>0</posx>
 			<posy>0</posy>
 			<control type="image">
-				<width>451</width>
+				<width>481</width>
 				<height>32</height>
 				<texture flipy="true" flipx="true">common/timepanel_mid.png</texture>
 			</control>
 			<control type="progress" id="20">
 				<description>Progressbar</description>
-				<posx>250</posx>
+				<posx>280</posx>
 				<posy>2</posy>
 				<width>176</width>
 				<height>13</height>
@@ -556,39 +556,39 @@
 				<info>Player.Progress</info>
 			</control>
 			<control type="label">				
-				<posx>70</posx>
+				<posx>90</posx>
 				<posy>-2</posy>
-				<width>170</width>
+				<width>180</width>
 				<height>18</height>
 				<font>Font_NowPlaying</font>
 				<textcolor>a8FFFFFF</textcolor>
 				<scroll>true</scroll>
 				<label>[UPPERCASE][COLOR a8FFFFFF]$INFO[MusicPlayer.Artist][/COLOR][/UPPERCASE]</label>
 			</control>
 			<control type="label">				
-				<posx>72</posx>
+				<posx>92</posx>
 				<posy>14</posy>
-				<width>170</width>
+				<width>180</width>
 				<height>18</height>
 				<font>Font_NowPlaying</font>
 				<textcolor>a8FFFFFF</textcolor>
 				<scroll>true</scroll>
 				<label>[UPPERCASE][COLOR FFFFFFFF]$INFO[MusicPlayer.Title][/COLOR][/UPPERCASE]</label>
 			</control>
 			<control type="label">				
-				<posx>72</posx>
+				<posx>92</posx>
 				<posy>-2</posy>
-				<width>170</width>
+				<width>180</width>
 				<height>18</height>
 				<font>Font_NowPlaying</font>
 				<textcolor>a8FFFFFF</textcolor>
 				<scroll>true</scroll>
 				<label>[UPPERCASE][COLOR FFFFFFFF]$INFO[Videoplayer.TVShowTitle][/COLOR][/UPPERCASE]</label>
 			</control>
 			<control type="label">				
-				<posx>72</posx>
+				<posx>92</posx>
 				<posy>6</posy>
-				<width>170</width>
+				<width>180</width>
 				<height>18</height>
 				<font>Font_NowPlaying</font>
 				<textcolor>a8FFFFFF</textcolor>
@@ -598,7 +598,7 @@
 			</control>
 			<control type="label">
 				<description>Current time</description>
-				<posx>230</posx>
+				<posx>260</posx>
 				<posy>14</posy>
 				<width>200</width>
 				<height>20</height>
@@ -618,12 +618,28 @@
 			<animation effect="fade" time="400" start="0" end="100" delay="500" condition="!ControlGroup(7000).HasFocus" revertible="false">Conditional</animation>
 			<visible>Player.HasMedia + !Control.IsVisible(560)</visible>
 			<aspectratio>keep</aspectratio>
-			<width>50</width>
-			<height>50</height>
-			<posx>10</posx><!-- 112 -->
+			<width>58</width>
+			<height>58</height>
+			<posx>22</posx><!-- 112 -->
 			<posy>2</posy><!-- -143 -->
 			<texture fallback="backdrops/artist_fanart/default/default.png">backdrops/artist_fanart/cd/$INFO[MusicPlayer.Artist]-$INFO[MusicPlayer.Album].png</texture>
 			<aspectratio align="bottom">keep</aspectratio>
+		</control>
+			<control type="image">
+			<description>COVER</description>
+			<animation effect="slide" start="-104,0" end="0,0" time="700" tween="cubic" easing="out" delay="700">WindowOpen</animation>
+			<animation effect="slide" start="0,0" end="-104,0" time="700" tween="cubic" easing="in" delay="700">WindowClose</animation>
+			<animation effect="slide" start="-104,0" end="0,0" time="700" tween="cubic" easing="inout" delay="300">VisibleChange</animation>
+			<animation effect="fade" time="400" start="100" end="0" condition="ControlGroup(7000).HasFocus" revertible="false">Conditional</animation>
+			<animation effect="fade" time="400" start="0" end="100" delay="500" condition="!ControlGroup(7000).HasFocus" revertible="false">Conditional</animation>
+			<visible>Player.HasMedia + !Control.IsVisible(560)</visible>
+			<aspectratio>keep</aspectratio>
+			<width>60</width>
+			<height>60</height>
+			<posx>4</posx><!-- 112 -->
+			<posy>2</posy><!-- -143 -->
+			<texture fallback="defaultmusicbig.png" diffuse="thumbs/cdcover_mask2.png">$INFO[MusicPlayer.Cover]</texture>
+			<aspectratio align="bottom">keep</aspectratio>
 		</control>	
 	</include>
 	<include name="Furniture_DarkGradient">
@@ -679,70 +695,6 @@
 			<visible>Skin.HasSetting(debug) + !Skin.HasSetting(debuginfo)</visible>
 		</control>
 	</include>
-	<!-- TitleMod -->
-	<include name="TitleModVars">
-		<width>1070</width>
-		<posy>9</posy>
-		<font>Font_MultiplexTitleMod</font>
-		<aligny>bottom</aligny>
-		<textcolor>FFFFFFFF</textcolor>
-		<shadowcolor>ff000000</shadowcolor>
-	</include>
-	<include name="TitleModVarsBig">
-		<width>1070</width>
-		<posy>-8</posy>
-		<aligny>bottom</aligny>
-		<font>Font_MultiplexTitleModBig</font>
-		<textcolor>FFFFFFFF</textcolor>
-		<shadowcolor>ff000000</shadowcolor>
-	</include>
-	<include name="TitleModMovies">
-		<control type="label">
-			<include>TitleModVars</include>
-			<posx>105</posx>
-			<align>center</align>
-			<label>$INFO[ListItem.Tagline]</label>
-		</control>
-	</include>
-	<include name="TitleModTV">
-		<control type="group">
-
-			<!-- Title TV Shows-->
-			<control type="label">
-				<include>TitleModVarsBig</include>
-				<posx>1175</posx>
-				<align>right</align>
-				<label>$INFO[ListItem.TVShowTitle]</label>
-				<visible>Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)</visible>
-			</control>
-
-			<!-- Title TV Seasons-->
-
-			<control type="label">
-				<include>TitleModVars</include>
-				<posx>105</posx>
-				<align>left</align>
-				<label>$LOCALIZE[31432] $INFO[ListItem.Season]</label>
-				<visible>Container.Content(seasons) + !IsEmpty(ListItem.Title)</visible>
-			</control>
-			<control type="label">
-				<include>TitleModVars</include>
-				<posx>105</posx>
-				<align>left</align>
-				<label>$LOCALIZE[20366]</label>
-				<visible>Container.Content(seasons) + IsEmpty(ListItem.Title)</visible>
-			</control>
-
-			<!-- Title TV Episodes-->
-			<control type="label">
-				<include>TitleModVars</include>
-				<posx>105</posx>
-				<align>left</align>
-				<label>$INFO[ListItem.Season].$INFO[ListItem.Episode]: $INFO[ListItem.Title]</label>
-				<visible>Container.Content(episodes)</visible>
-			</control>
-		</control>
-	</include>
 	<include name="FilemanagerPanelExtents">
 		<width>620</width>
 		<height>647</height>

diff --git a/720p/Includes_LowList.xml b/720p/Includes_LowList.xml
@@ -584,7 +584,7 @@
 		<width>450</width>
 		<font>Font_MultiplexPlotSmall</font>
 		<textcolor>d0ffffff</textcolor>
-		<autoscroll delay="8000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
+		<autoscroll delay="6000" time="2000" repeat="8000">Skin.HasSetting(allowscroll)</autoscroll>
 		<include>Animation_VisibleChange200</include>
 	</include>
 	<include name="LowList_TallTextBox">