From a245b44cc89aa2eecc60873f3b00329949740321 Mon Sep 17 00:00:00 2001 From: chrisbevan Date: Sun, 24 Jul 2016 19:39:38 +0100 Subject: [PATCH] bits n bobs --- 1080i/DialogPictureInfo.xml | 6 +- 1080i/View_ArtistAlbums.xml | 2 +- 1080i/View_MusicRecentItems.xml | 2 +- 1080i/View_Photos.xml | 4 +- 1080i/View_Seasons.xml | 9 +- 1080i/View_TVShows.xml | 247 +++++++++++++++++++------------- 1080i/View_VideoRecentItems.xml | 2 +- changelog.txt | 7 - 8 files changed, 157 insertions(+), 122 deletions(-) diff --git a/1080i/DialogPictureInfo.xml b/1080i/DialogPictureInfo.xml index 60c9be6..8a5c40c 100644 --- a/1080i/DialogPictureInfo.xml +++ b/1080i/DialogPictureInfo.xml @@ -6,8 +6,8 @@ modalDialog - col-8-begin - row-3-begin + col-9-begin + row-2-begin modalDialogInOut @@ -20,7 +20,7 @@ 0 - 11-row + 13-row 12-col 12-row diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index f9b55ba..7c04047 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -80,7 +80,7 @@ container.content(albums) + !container.content(songs) + [SubString(container.folderpath,musicdb://artists) | SubString(container.folderpath,musicdb://genres)] 72 row-21-begin - 1800 + 1848 9-row 9000 50 diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index c172ce3..8f52d84 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -64,7 +64,7 @@ 72 row-21-begin - 1800 + 1848 9-row 9123 9000 diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml index 1eb72a0..36bcf06 100644 --- a/1080i/View_Photos.xml +++ b/1080i/View_Photos.xml @@ -47,8 +47,8 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] - colors/white.png + $INFO[Listitem.thumb] + colors/white.png 6 ffffffff diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index b905e22..3aced4c 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -75,14 +75,11 @@ !isempty(container.folderpath) + !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons) col-1-begin row-17-begin - 24-col + 1836 11-row 9000 - 60 - 50 - 50 - 60 - 2 + 58 + horizontal 0 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index a766c6f..1a3f74b 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -20,129 +20,174 @@ kenBurnsey + + + + col-17-begin + 222 + + Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files) + + + + + + + + + 0 + 0 + 8-col + 768 + stretch + $INFO[Listitem.art(poster)] + 200 + + + 0 + 768 + 8-col + 2-row + scale + $INFO[Listitem.art(poster)] + 200 + + + + Substring(container.folderpath,videodb://) + Library.HasContent(tvshows) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + !container.content(files) col-1-begin row-5-begin - 1800 - 25-row + 15-col + 23-row 9000 60 50 50 - 600 - 9000 60 - + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col 0 - 6-col-gutter - 4-col-gutter - scale - DefaultPoster.png - colors/black.png - 6 - overlay + 13-col-textbox + 69 + stretch + colors/black.png + textboxInactive + + + + 14-col + 0 + 1-col + 69 + stretch + colors/black.png + textboxInactive - isempty(ListItem.Title) - 12 - 4-row - 384 - 3-row - center + 1-col-indent + 0 + 11-col-gutter + 2-row center itemTitle textActive - - ff333333 + - + - 12 - 268 - 384 - 1-row - center - thumbTitle - textDisabled - - ff333333 - - - 12 - 268 - 384 - 1-row - right - center - thumbTitle - textDisabled - - ff333333 - - - 0 + 11-col-indent 0 - 6-col-gutter - 4-col-gutter - scale - $INFO[Listitem.art(fanart)] - colors/white.png - 3 - ffffffff + 3-col-gutter + 2-row + center + right + itemSubTitle + textActive + - + + + + IntegerGreaterThan(ListItem.Property(UnWatchedEpisodes),0) + 985 + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + - - - focusThumb - - 0 - 0 - 6-col-gutter - 4-col-gutter - scale - $INFO[Listitem.art(fanart)] - colors/white.png - 6 - ffffffff - - - isempty(ListItem.Title) - 12 - 4-row - 384 - 3-row - center - center - itemTitle - textActive - - ff333333 - - - 12 - 268 - 384 - 1-row - center - thumbTitle - textActive - - ff333333 - - - 12 - 268 - 384 - 1-row - right - center - thumbTitle - textActive - - ff333333 - + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 14-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 11-col-gutter + 2-row + center + itemTitle + textActive + - + + + + 11-col-indent + 0 + 3-col-gutter + 2-row + center + right + itemSubTitle + textActive + - + + + + IntegerGreaterThan(ListItem.Property(UnWatchedEpisodes),0) + 985 + 0 + 1-col + 2-row + center + right + symbolLarge + textActive + - + diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 4e789c0..227ab2f 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -83,7 +83,7 @@ 72 row-20-begin - 1800 + 1848 9-row 9123 9000 diff --git a/changelog.txt b/changelog.txt index dae4a68..5a8070b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -46,15 +46,8 @@ Add mini screen / view during menu option -Check Youtube addon login issue - -Photo section needs revision - Improve handling of new users (bring through images from homescreen etc) PVR Recording schedule (integrate with recordings) -Complete DialogAudioDSPManager.xml and DialogAudioDSPSettings.xmls - -