From d81c7870395931fed4b8e939b74b4bc206179cfd Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Wed, 4 Nov 2015 20:43:54 +0000 Subject: [PATCH] various --- 1080i/DialogAddonInfo.xml | 9 +- 1080i/DialogVideoInfo.xml | 16 +- 1080i/Includes.xml | 1 + 1080i/Includes_variables.xml | 8 +- 1080i/MyMusicNav.xml | 1 + 1080i/View_Albums.xml | 6 +- 1080i/View_ArtistAlbums.xml | 158 ++++++++++++++++++ 1080i/View_VideoRecentItems.xml | 10 +- changelog.txt | 7 + ...domAlbums.xsp => collage_RandomAlbums.xsp} | 2 +- ...domVideos.xsp => collage_RandomMovies.xsp} | 2 +- ...mTVShows.xsp => collage_RandomTVShows.xsp} | 2 +- extras/playlists/recentEpisodes.xsp | 7 + extras/playlists/recentMovies.xsp | 7 + 14 files changed, 205 insertions(+), 31 deletions(-) create mode 100644 1080i/View_ArtistAlbums.xml rename extras/playlists/{randomAlbums.xsp => collage_RandomAlbums.xsp} (76%) rename extras/playlists/{randomVideos.xsp => collage_RandomMovies.xsp} (83%) rename extras/playlists/{randomTVShows.xsp => collage_RandomTVShows.xsp} (76%) create mode 100644 extras/playlists/recentEpisodes.xsp create mode 100644 extras/playlists/recentMovies.xsp diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index f3a0222..fc19b63 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -1,7 +1,7 @@ 8000 - + globalBackground @@ -206,13 +206,6 @@ - SendClick(146,8) - - Control.IsEnabled(11) - - - - - SendClick(146,11) - Control.IsEnabled(7) diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 4f65d52..f224523 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -5,7 +5,6 @@ fadeInOut Skin.Reset(showcast) action(info) - 0 @@ -134,7 +133,7 @@ - $INFO[ListItem.Rating,,/10] + $INFO[ListItem.UserRating,,/10] - noop @@ -307,12 +306,10 @@ SendClick(2003,10) - Get Artwork - - XBMC.RunScript(script.artwork.downloader, mode=gui, mediatype=movie, dbid=$INFO[ListItem.DBID]) - RunScript(script.artwork.downloader,mode=gui, mediatype=tvshow, dbid=$INFO[ListItem.DBID]) - - System.HasAddon(script.artwork.downloader) + + + - + SendClick(2003,7) @@ -644,6 +641,9 @@ Refresh + + Ratings + Choose Art diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 9ff8b06..8c4c553 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -25,6 +25,7 @@ + diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 2503b89..f9664de 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -32,9 +32,7 @@ $INFO[container.foldername] $LOCALIZE[31012] - @@ -81,9 +79,9 @@ - special://skin/extras/playlists/randomVideos.xsp - special://skin/extras/playlists/randomAlbums.xsp - special://skin/extras/playlists/randomTVShows.xsp + special://skin/extras/playlists/collage_randomMovies.xsp + special://skin/extras/playlists/collage_RandomAlbums.xsp + special://skin/extras/playlists/collage_RandomTVShows.xsp diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 301a5c2..77eb61a 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -31,6 +31,7 @@ skin.string(showRecentMusicItems) + SubString(skin.string(showRecentMusicItems),false) artist album + artistalbums song musicgenre musicfiles diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index 859f1e7..25ae77a 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -5,11 +5,11 @@ - container.content(albums) + !container.content(songs) + container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) dimensionsFullscreen stretch - $INFO[Listitem.art(fanart)] + $INFO[listitem.Art(artist.fanart)] 1500 22ffffff @@ -21,7 +21,7 @@ - container.content(albums) + !container.content(songs) + container.content(albums) + !container.content(songs) + !SubString(container.folderpath,musicdb://artists) 78 row-5-begin 1800 diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml new file mode 100644 index 0000000..6bc4459 --- /dev/null +++ b/1080i/View_ArtistAlbums.xml @@ -0,0 +1,158 @@ + + + + + + + + container.content(albums) + !container.content(songs) + SubString(container.folderpath,musicdb://artists) + + 0 + 0 + fullscreenWidth + fullscreenHeight + stretch + $INFO[Container.Art(artist.fanart)] + 500 + 66ffffff + kenBurnsey + + + dimensionsFullscreen + vignette.png + ffffffff + stretch + + + 0 + row-20-begin + fullscreenWidth + 15-row + stretch + colors/black.png + ccffffff + + + + + !controlgroup(9000).hasfocus + col-1-begin + row-6-begin + + + 24-col + 0 + 24-col + 8-row + right + veryLargeLight + 66ffffff + - + true + + + + + + + container.content(albums) + !container.content(songs) + SubString(container.folderpath,musicdb://artists) + 72 + row-21-begin + 1800 + 9-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/black.png + colors/white.png + 3 + textboxInactive + + + !controlgroup(9000).hasfocus + 12 + 2-row + 240 + 2-row + center + center + regularStrong + disabled + + + + !controlgroup(9000).hasfocus + 12 + 3-row + 240 + 2-row + center + center + buttonTitle + disabled + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] + colors/white.png + 3 + ffFFFFFF + + + + + + + + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + colors/offblack.png + colors/white.png + 3 + ffFFFFFF + + + 3 + 3 + 258 + 258 + stretch + colors/black.png + ccFFFFFF + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[ListItem.Art(thumb)] + colors/white.png + 3 + ffffffff + + + + + + \ No newline at end of file diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 1b463cf..4ce8191 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -129,13 +129,13 @@ Library.HasContent(movies) - + 31176 noop Library.HasContent(tvshows) - + 31178 noop @@ -152,8 +152,10 @@ 9000 activateWindow(home) horizontal - - plugin://script.thedeadman.functions?type=$INFO[control.getlabel(9123)] + Skin.SetString(showRecentVideoItems,false) + activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) + Control.SetFocus(50) + $INFO[control.getlabel(9123)] 0 diff --git a/changelog.txt b/changelog.txt index 6dbcf8f..a665168 100644 --- a/changelog.txt +++ b/changelog.txt @@ -12,6 +12,13 @@ - [REMOVED] videooverlay.xml - [REMOVED] musicoverlay.xml - [NEW] custom_musicOverlay.xml +- [REMOVED] References to "zorder" tag + +[DONE] - DialogAddonInfo.xml - remove button id="11" +[DONE] - DialogKaiToast.xml - removed ID's 403-405 +[DONE] - DialogVideoInfo.xml - add button ID 7, replace user rating value +[DONE] - MyMusicNav.xml - remove files node button + [B]0.1.0[/B] diff --git a/extras/playlists/randomAlbums.xsp b/extras/playlists/collage_RandomAlbums.xsp similarity index 76% rename from extras/playlists/randomAlbums.xsp rename to extras/playlists/collage_RandomAlbums.xsp index 9868de8..218264b 100644 --- a/extras/playlists/randomAlbums.xsp +++ b/extras/playlists/collage_RandomAlbums.xsp @@ -1,6 +1,6 @@ - randomAlbums + collage_RandomAlbums all 50 random diff --git a/extras/playlists/randomVideos.xsp b/extras/playlists/collage_RandomMovies.xsp similarity index 83% rename from extras/playlists/randomVideos.xsp rename to extras/playlists/collage_RandomMovies.xsp index 3623821..c7bf581 100644 --- a/extras/playlists/randomVideos.xsp +++ b/extras/playlists/collage_RandomMovies.xsp @@ -1,6 +1,6 @@ - randomMovies + collage_randomMovies all 50 random diff --git a/extras/playlists/randomTVShows.xsp b/extras/playlists/collage_RandomTVShows.xsp similarity index 76% rename from extras/playlists/randomTVShows.xsp rename to extras/playlists/collage_RandomTVShows.xsp index 1b1e727..d998ca3 100644 --- a/extras/playlists/randomTVShows.xsp +++ b/extras/playlists/collage_RandomTVShows.xsp @@ -1,6 +1,6 @@ - Random tvshows + collage_RandomTVShows all 50 random diff --git a/extras/playlists/recentEpisodes.xsp b/extras/playlists/recentEpisodes.xsp new file mode 100644 index 0000000..86031f6 --- /dev/null +++ b/extras/playlists/recentEpisodes.xsp @@ -0,0 +1,7 @@ + + + recentEpisodes + all + 10 + dateadded + diff --git a/extras/playlists/recentMovies.xsp b/extras/playlists/recentMovies.xsp new file mode 100644 index 0000000..9cd3594 --- /dev/null +++ b/extras/playlists/recentMovies.xsp @@ -0,0 +1,7 @@ + + + recentMovies + all + 10 + dateadded +