From 33fc24101e257f05bd05a78ff1ce780482da058f Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Wed, 18 Jul 2018 21:56:20 +0100 Subject: [PATCH] Add user option for removing recently added content --- 1080i/SkinSettings.xml | 24 +++++++++++++++++ 1080i/View_Albums.xml | 4 +-- 1080i/View_Movies.xml | 3 ++- 1080i/View_TVShows.xml | 3 ++- addon.xml | 2 +- changelog.txt | 4 +-- language/English/strings.po | 12 +++++++++ shortcuts/overrides.xml | 52 ++++++++++++++++++++++++------------- 8 files changed, 78 insertions(+), 26 deletions(-) diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index a644f88..6e3313c 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -231,6 +231,30 @@ Skin.ToggleSetting(disableExtendedFanart) Skin.HasSetting(disableExtendedFanart) + + + Container(8000).Hasfocus(1) + Disable recently added Movies + 14-col + + Skin.ToggleSetting(disableRecentMovies) + Skin.HasSetting(disableRecentMovies) + + + Container(8000).Hasfocus(1) + Disable recently added TVShows + 14-col + + Skin.ToggleSetting(disableRecentTVShows) + Skin.HasSetting(disableRecentTVShows) + + + Container(8000).Hasfocus(1) + Disable recently added Albums + 14-col + + Skin.ToggleSetting(disableRecentAlbums) + Skin.HasSetting(disableRecentAlbums) diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index cdb57d3..f9d7e66 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -3,7 +3,7 @@ - $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue] + $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue] + !Skin.HasSetting(disableRecentAlbums) @@ -20,7 +20,7 @@ special://skin/extras/backgrounds/music.jpg FF333333 scale - 200 + 300 diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index ca956ca..25dfdcc 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -3,7 +3,7 @@ - $EXP[isMovie] + !string.contains(container.folderpath,playlists) + $EXP[isMovie] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentMovies) @@ -20,6 +20,7 @@ $INFO[container(9103).listitem.art(fanart)] FF333333 scale + 300 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 7169b1f..f1b32b1 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -3,7 +3,7 @@ - $EXP[isTVShow] + !string.contains(container.folderpath,playlists) + $EXP[isTVShow] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentTVShows) @@ -20,6 +20,7 @@ $INFO[container(9203).listitem.art(fanart)] FF333333 scale + 300 diff --git a/addon.xml b/addon.xml index 177cc6f..ebe9182 100644 --- a/addon.xml +++ b/addon.xml @@ -12,7 +12,7 @@ A skin for Kodi by theDeadMan - Built for the living room, Pellucid is a clean and simple kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. + Built for the living room, Pellucid is a clean and simple kodi experience designed for maximum usability and minimum fuss. Skin Shortcuts addon support is available for full menu customisation. With thanks to Marco "Dadebue" Debus for the homescreen photography. all Creative Commons Attribution-Noncommercial-Share Alike 3.0 http://forum.kodi.tv/forumdisplay.php?fid=267 diff --git a/changelog.txt b/changelog.txt index 71e851b..a5609d5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -31,10 +31,8 @@ - [COMPLETE] GameOSD.xml - [COMPLETE] Adjust alignment of home menu items based on item count - [NEW] Additional wallpapers (Thanks Dadebue) +- [NEW] USER OPTION: Disable recently added content for movies, tvshows and music -- USER OPTION: Disable recently added - -- Rework spotify addon presentation - check controls for new window: MyGames.xml - Screenshots etc need updating diff --git a/language/English/strings.po b/language/English/strings.po index aef9d21..dd586bf 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -976,3 +976,15 @@ msgstr "" msgctxt "#31237" msgid "Results for" msgstr "" + +msgctxt "#31238" +msgid "Disable recently added section for Movies" +msgstr "" + +msgctxt "#31239" +msgid "Disable recently added section for TV Shows" +msgstr "" + +msgctxt "#31240" +msgid "Disable recently added section for Albums" +msgstr "" diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml index 4669b11..fbea2b6 100644 --- a/shortcuts/overrides.xml +++ b/shortcuts/overrides.xml @@ -10,32 +10,43 @@ system.hasaddon(script.globalsearch) ::ACTION:: + + !Skin.HasSetting(disableRecentMovies) + ::ACTION:: + control.setfocus(9103,0,absolute) + + + Skin.HasSetting(disableRecentMovies) + ::ACTION:: + + + !window.isactive(videos) + !Skin.HasSetting(disableRecentMovies) ::ACTION:: control.setfocus(9103,0,absolute) - !window.isactive(videos) - ::ACTION:: - control.setfocus(9103,0,absolute) - - - window.isactive(videos) + window.isactive(videos) + !Skin.HasSetting(disableRecentMovies) Container.Update(videodb://movies/titles/) control.setfocus(9103,0,absolute) + !Skin.HasSetting(disableRecentTVShows) + ::ACTION:: + control.setfocus(9203,0,absolute) + + + Skin.HasSetting(disableRecentTVShows) + ::ACTION:: + + + !window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows) ::ACTION:: control.setfocus(9203,0,absolute) - !window.isactive(videos) - ::ACTION:: - control.setfocus(9203,0,absolute) - - - window.isactive(videos) + window.isactive(videos) + !Skin.HasSetting(disableRecentTVShows) Container.Update(videodb://tvshows/titles/) control.setfocus(9203,0,absolute) @@ -50,16 +61,21 @@ + !Skin.HasSetting(disableRecentAlbums) + ::ACTION:: + control.setfocus(9998,0,absolute) + + + Skin.HasSetting(disableRecentAlbums) + ::ACTION:: + + + !window.isactive(music) + !Skin.HasSetting(disableRecentAlbums) ::ACTION:: control.setfocus(9998,0,absolute) - !window.isactive(music) - ::ACTION:: - control.setfocus(9998,0,absolute) - - - window.isactive(music) + window.isactive(music) + !Skin.HasSetting(disableRecentAlbums) Container.Update(musicdb://albums/) control.setfocus(9998,0,absolute)