From 9efa28f46ce7283916294416459676acc8481ed4 Mon Sep 17 00:00:00 2001 From: Jezz_X Date: Fri, 12 Oct 2012 07:52:45 +1100 Subject: Changed: [Confluence] to use all the new ListItem.Art stuff --- addons/skin.confluence/720p/DialogAlbumInfo.xml | 2 +- addons/skin.confluence/720p/DialogVideoInfo.xml | 157 ++------------------- .../720p/IncludesBackgroundBuilding.xml | 3 +- addons/skin.confluence/720p/MusicVisualisation.xml | 6 +- addons/skin.confluence/720p/VideoFullScreen.xml | 4 +- addons/skin.confluence/720p/ViewsFileMode.xml | 33 ++++- addons/skin.confluence/720p/ViewsVideoLibrary.xml | 115 +++++++++++---- .../720p/custom_SkinSetting_1111.xml | 12 -- addons/skin.confluence/language/English/strings.po | 4 - 9 files changed, 135 insertions(+), 201 deletions(-) (limited to 'addons') diff --git a/addons/skin.confluence/720p/DialogAlbumInfo.xml b/addons/skin.confluence/720p/DialogAlbumInfo.xml index cff6982f01..b59bf43b17 100644 --- a/addons/skin.confluence/720p/DialogAlbumInfo.xml +++ b/addons/skin.confluence/720p/DialogAlbumInfo.xml @@ -72,7 +72,7 @@ 0 675 380 - $INFO[ListItem.Property(Fanart_Image)] + $INFO[ListItem.Art(fanart)] button-nofocus.png 4 keep diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml index f7625315e1..41a6b0b70a 100644 --- a/addons/skin.confluence/720p/DialogVideoInfo.xml +++ b/addons/skin.confluence/720p/DialogVideoInfo.xml @@ -73,7 +73,7 @@ 0 675 380 - $INFO[ListItem.Property(Fanart_Image)] + $INFO[ListItem.Art(fanart)] button-nofocus.png 4 keep @@ -331,154 +331,21 @@ - [Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)] + !Control.HasFocus(12) + Container.Content(TVShows) + !Control.HasFocus(12) 90 210 VisibleFadeEffect - 177 - 10 - 675 - 124 + 0 + 0 + 270 + 380 stretch button-nofocus.png 4 $INFO[ListItem.Icon] + IsEmpty(ListItem.Art(poster)) - - 177 - 10 - 400 - 100 - stretch - GlassOverlay.png - AAFFFFFF - - - 95 - 160 - 840 - 180 - 49 - 49 - 9000 - 61 - - - 200 - - - 165 - 0 - 160 - 30 - font13 - right - center - blue - selected - ListItem.Label - - - 175 - 0 - 665 - 30 - font13 - left - center - white - white - ListItem.Label2 - - - - - 0 - 0 - 840 - 30 - Control.HasFocus(49) - MenuItemFO.png - VisibleFadeEffect - - - 165 - 0 - 160 - 30 - font13 - right - center - blue - selected - ListItem.Label - - - 175 - 0 - 665 - 30 - font13 - left - center - white - white - ListItem.Label2 - - - - - - $INFO[listitem.episode] [COLOR=grey] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])[/COLOR] - - - !IsEmpty(ListItem.Episode) - - - - $INFO[ListItem.Premiered] - - - !IsEmpty(ListItem.Premiered) - - - - $INFO[ListItem.Genre] - - - !IsEmpty(ListItem.Genre) - - - - $INFO[ListItem.Year] - - - !IsEmpty(ListItem.Year) - - - - $INFO[ListItem.Rating] - - - !IsEmpty(ListItem.Rating) - - - - $INFO[ListItem.FilenameAndPath] - - - !IsEmpty(ListItem.FilenameAndPath) - - - - - 0 - 370 - 1030 - 4 - stretch - separator.png - - - - [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] + !Control.HasFocus(12) - 90 - 210 - VisibleFadeEffect 0 0 @@ -487,7 +354,8 @@ stretch button-nofocus.png 4 - $INFO[ListItem.Icon] + $INFO[ListItem.Art(poster)] + !IsEmpty(ListItem.Art(poster)) 4 @@ -1108,12 +976,7 @@ Get Thumb ButtonInfoDialogsCommonValues - - - - Get Fanart - ButtonInfoDialogsCommonValues - + Play Trailer diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml index b6f78e1cd3..0f9cb2fa6d 100644 --- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml +++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml @@ -28,7 +28,7 @@ 1280 720 scale - $INFO[ListItem.Property(Fanart_Image)] + $INFO[ListItem.Art(fanart)] backgroundfade FanartCrossfadeTime !Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image)) @@ -66,6 +66,7 @@ 120 HomeNowPlayingBack.png [Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | SubString(Window(videolibrary).Property(TvTunesIsAlive),True)]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))] + VisibleFadeEffect diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml index 68d5cbf144..50d68d4575 100644 --- a/addons/skin.confluence/720p/MusicVisualisation.xml +++ b/addons/skin.confluence/720p/MusicVisualisation.xml @@ -16,9 +16,9 @@ 0 1280 720 - $INFO[MusicPlayer.Property(Fanart_Image)] + $INFO[Player.Art(fanart)] AAFFFFFF - !IsEmpty(MusicPlayer.Property(Fanart_Image)) + !Skin.HasSetting(HideVisualizationFanart) + !IsEmpty(Player.Art(fanart)) + !Skin.HasSetting(HideVisualizationFanart) 600 @@ -87,7 +87,7 @@ 250r 300 230 - MusicPlayer.Cover + $INFO[Player.Art(thumb)] keep ThumbShadow.png 8 diff --git a/addons/skin.confluence/720p/VideoFullScreen.xml b/addons/skin.confluence/720p/VideoFullScreen.xml index a208efe9f9..b32ec14bae 100644 --- a/addons/skin.confluence/720p/VideoFullScreen.xml +++ b/addons/skin.confluence/720p/VideoFullScreen.xml @@ -67,7 +67,7 @@ 260r 300 230 - VideoPlayer.Cover + $INFO[Player.Art(thumb)] keep ThumbShadow.png 8 @@ -79,7 +79,7 @@ 350r 300 330 - VideoPlayer.Cover + $INFO[Player.Art(thumb)] keep ThumbShadow.png 8 diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml index 4fe22789a8..6728fa6720 100644 --- a/addons/skin.confluence/720p/ViewsFileMode.xml +++ b/addons/skin.confluence/720p/ViewsFileMode.xml @@ -15,7 +15,6 @@ list 60 200 - ![Window.IsVisible(VideoLibrary) + Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters)] 0 @@ -240,7 +239,7 @@ 60 200 2 - + 1 0 @@ -283,7 +282,7 @@ $INFO[ListItem.Overlay] - + 1 0 @@ -326,7 +325,7 @@ $INFO[ListItem.Overlay] - + 1 0 @@ -357,7 +356,7 @@ $INFO[ListItem.Overlay] - + 1 0 @@ -412,7 +411,7 @@ Control.IsVisible(505) VisibleFadeEffect - !Container.Content(LiveTV) + !Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos) + !Container.Content(Addons) + !Skin.HasSetting(TVShowsUsePosters) + !Container.Content(LiveTV) + !Container.Content(Movies) + !Container.Content(Episodes) + !Container.Content(Seasons) + !Container.Content(MusicVideos) + !Container.Content(Addons) 95 80 1080 @@ -434,6 +433,17 @@ button-nofocus.png 5 $INFO[Listitem.Icon] + IsEmpty(ListItem.Art(banner)) + + + 1 + 0 + 538 + 105 + button-nofocus.png + 5 + $INFO[Listitem.Art(banner)] + !IsEmpty(ListItem.Art(banner)) 500 @@ -453,6 +463,17 @@ folder-focus.png 5 $INFO[Listitem.Icon] + IsEmpty(ListItem.Art(banner)) + + + 1 + 0 + 538 + 105 + folder-focus.png + 5 + $INFO[Listitem.Art(banner)] + !IsEmpty(ListItem.Art(banner)) 500 diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml index 803514bfc6..d122022f7c 100644 --- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml +++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml @@ -11,7 +11,7 @@ true VisibleFadeEffect - Container.Content(Movies) | Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] + Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) !Container.Content(LiveTV) -183 0 @@ -37,6 +37,18 @@ button-nofocus.png 4 $INFO[ListItem.Icon] + IsEmpty(ListItem.Art(poster)) + + + 2 + 40 + 214 + 310 + stretch + button-nofocus.png + 4 + $INFO[ListItem.Art(poster)] + !IsEmpty(ListItem.Art(poster)) @@ -51,6 +63,20 @@ $INFO[ListItem.Icon] focus unfocus + !IsEmpty(ListItem.Art(poster)) + + + -2 + 36 + 222 + 318 + stretch + ThumbBorder.png + 8 + $INFO[ListItem.Art(poster)] + focus + unfocus + IsEmpty(ListItem.Art(poster)) 6 @@ -307,7 +333,7 @@ 0 460 - Container.Content(Movies) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] + Container.Content(Movies) | Container.Content(TVShows) -20 0 @@ -335,6 +361,19 @@ 4 200 $INFO[ListItem.Icon] + IsEmpty(ListItem.Art(poster)) + + + 2 + 20 + 120 + 160 + stretch + button-nofocus.png + 4 + 200 + $INFO[ListItem.art(poster)] + !IsEmpty(ListItem.Art(poster)) 6 @@ -370,6 +409,21 @@ $INFO[ListItem.Icon] focus unfocus + IsEmpty(ListItem.Art(poster)) + + + -2 + 16 + 128 + 168 + stretch + ThumbBorder.png + 8 + 200 + $INFO[ListItem.Art(poster)] + focus + unfocus + !IsEmpty(ListItem.Art(poster)) 90 @@ -915,7 +969,7 @@ 710 245 - Container.Content(TVShows) + !Skin.HasSetting(TVShowsUsePosters) + Container.Content(TVShows) 0 0 @@ -926,6 +980,19 @@ $INFO[ListItem.Icon] ThumbShadow.png 8 + IsEmpty(ListItem.Art(banner)) + + + 0 + 0 + 530 + 110 + keep + IconCrossfadeTime + $INFO[ListItem.Art(banner)] + ThumbShadow.png + 8 + !IsEmpty(ListItem.Art(banner)) Episodes txt @@ -1086,7 +1153,7 @@ 710 245 - Container.Content(Seasons) | [Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters)] + Container.Content(Seasons) 0 0 @@ -1111,19 +1178,6 @@ Skin.HasSetting(AutoScroll) Container.Content(Seasons) - - Description Value for TVShows - 270 - 0 - 250 - 355 - font12 - justify - white - - Skin.HasSetting(AutoScroll) - Container.Content(TVShows) + Skin.HasSetting(TVShowsUsePosters) - Watched Count 10 @@ -1364,7 +1418,7 @@ 286 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] Container.Content(Movies) ThumbShadow.png 8 @@ -1376,7 +1430,7 @@ 325 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] Container.Content(TVShows) ThumbShadow.png 8 @@ -1708,7 +1762,7 @@ 420 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] 10 @@ -1771,12 +1825,12 @@ 420 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] 10 395 - 730 + 540 30 font24_title white @@ -1789,7 +1843,7 @@ Description Value for Video 10 425 - 730 + 540 145 font12 justify @@ -1797,6 +1851,17 @@ Skin.HasSetting(AutoScroll) + + 560 + 140 + 180 + 440 + keep + IconCrossfadeTime + $INFO[ListItem.Art(poster)] + ThumbShadow.png + 8 + 470 @@ -1809,7 +1874,7 @@ 420 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] 10 @@ -1858,7 +1923,7 @@ 420 scale IconCrossfadeTime - $INFO[ListItem.Property(fanart_image)] + $INFO[ListItem.Art(fanart)] 10 diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml index f29e127765..5422cc1a80 100644 --- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml +++ b/addons/skin.confluence/720p/custom_SkinSetting_1111.xml @@ -294,18 +294,6 @@ left center - - 750 - 40 - font13 - - grey2 - white - MenuItemFO.png - MenuItemNF.png - Skin.ToggleSetting(TVShowsUsePosters) - Skin.HasSetting(TVShowsUsePosters) - 750 40 diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po index fae0ecc815..e89eb6a67e 100644 --- a/addons/skin.confluence/language/English/strings.po +++ b/addons/skin.confluence/language/English/strings.po @@ -248,10 +248,6 @@ msgctxt "#31122" msgid "Weather Page" msgstr "" -msgctxt "#31123" -msgid "Use \"Posters\" instead of \"Banners\" for TV Shows" -msgstr "" - msgctxt "#31124" msgid "Show Background \"Now Playing\" Video" msgstr "" -- cgit v1.2.3