diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs index a0cbbc1d..a7a58d8e 100644 --- a/components/ItemGrid/ItemGrid.brs +++ b/components/ItemGrid/ItemGrid.brs @@ -133,7 +133,7 @@ sub loadInitialItems() showTvGuide() end if - else if m.top.parentItem.collectionType = "CollectionFolder" or m.top.parentItem.type = "CollectionFolder" or m.top.parentItem.collectionType = "boxsets" or m.top.parentItem.Type = "Folder" or m.top.parentItem.Type = "Channel" + else if m.top.parentItem.collectionType = "CollectionFolder" or m.top.parentItem.type = "CollectionFolder" or m.top.parentItem.collectionType = "boxsets" or m.top.parentItem.Type = "Boxset" or m.top.parentItem.Type = "Folder" or m.top.parentItem.Type = "Channel" ' Non-recursive, to not show subfolder contents m.loadItemsTask.recursive = false else if m.top.parentItem.collectionType = "Channel" @@ -223,7 +223,11 @@ end sub ' Set Music view, sort, and filter options sub setMusicOptions(options) - options.views = [{ "Title": tr("Music"), "Name": "music" }] + options.views = [ + { "Title": tr("Default"), "Name": "music-default" }, + { "Title": tr("Artists"), "Name": "music-artist" }, + { "Title": tr("Albums"), "Name": "music-album" }, + ] options.sort = [ { "Title": tr("TITLE"), "Name": "SortName" }, { "Title": tr("DATE_ADDED"), "Name": "DateCreated" }, @@ -259,7 +263,11 @@ end sub ' Return parent collection type function getCollectionType() as string - return m.top.parentItem.collectionType + if m.top.parentItem.collectionType = invalid + return m.top.parentItem.Type + else + return m.top.parentItem.CollectionType + end if end function ' Search string array for search value. Return if it's found @@ -276,10 +284,9 @@ sub SetUpOptions() options = {} options.filter = [] options.favorite = [] - if getCollectionType() = "movies" setMoviesOptions(options) - else if getCollectionType() = "boxsets" + else if inStringArray(["boxsets", "Boxset"], getCollectionType()) setBoxsetsOptions(options) else if getCollectionType() = "tvshows" setTvShowsOptions(options) diff --git a/components/home/Home.brs b/components/home/Home.brs index ea72fbca..bc951c1a 100644 --- a/components/home/Home.brs +++ b/components/home/Home.brs @@ -1,6 +1,11 @@ sub init() m.top.overhangTitle = "Home" m.top.optionsAvailable = true + + if get_user_setting("ui.home.splashBackground") = "true" + m.backdrop = m.top.findNode("backdrop") + m.backdrop.uri = buildURL("/Branding/Splashscreen?format=jpg&foregroundLayer=0.15&fillWidth=1280&width=1280&fillHeight=720&height=720&tag=splash") + end if end sub sub refresh() diff --git a/components/home/Home.xml b/components/home/Home.xml index f0eb64c2..3909bb0c 100644 --- a/components/home/Home.xml +++ b/components/home/Home.xml @@ -1,6 +1,7 @@ + @@ -13,4 +14,6 @@