diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml index 2933130..0b4bddc 100644 --- a/1080i/DialogAlbumInfo.xml +++ b/1080i/DialogAlbumInfo.xml @@ -21,19 +21,38 @@ kenBurnsey - + container.content(albums) col-3-begin 2-row - 12-col - 12-col - stretch - $INFO[Listitem.thumb] - windowOpen - - - - + + 0 + 0 + 12-col + 12-col + stretch + $INFO[Listitem.thumb] + windowOpen + + + + + + + 0 + 12-col + 12-col + 2-col + scale + $INFO[Listitem.thumb] + + + + + + + + @@ -87,12 +106,12 @@ 12 - row-1-begin + 42 8-col-gutter left 3-row center - pageTitle + LargeLight textActive true @@ -279,12 +298,12 @@ row-1-begin 0 - 0 + -12 528 left 3-row center - pageTitle + largeLight textActive true @@ -296,7 +315,7 @@ left itemSubTitle black - + - @@ -307,9 +326,9 @@ 528 left textActive - 15-row + 16-row - + - diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml index 45eedec..9669f83 100644 --- a/1080i/DialogFullScreenInfo.xml +++ b/1080i/DialogFullScreenInfo.xml @@ -9,12 +9,6 @@ - - dimensionsFullscreen - vignette.png - ffffffff - stretch - dateTime 0 @@ -67,7 +61,7 @@ stretch - col-1-begin + col-1-begin 90 textbox 24-col @@ -76,21 +70,6 @@ - - Pvr.IsPlayingTv | Pvr.IsPlayingRadio - 0 - 5-row - - 96r - 6 - buttonTitle - right - fullscreenWidth - textActive - 1-row - - - diff --git a/1080i/DialogOK.xml b/1080i/DialogOK.xml index 89c28d3..68c9828 100644 --- a/1080i/DialogOK.xml +++ b/1080i/DialogOK.xml @@ -24,7 +24,7 @@ 12 3-row 540 - 4-row + 3-row textbox textActive diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 80dfa04..1a46ee4 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -157,12 +157,12 @@ row-1-begin 0 - 0 + -12 672 left 3-row center - pageTitle + largeLight textActive true diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 5c36079..919f9ca 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -16,7 +16,6 @@ - diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml index cba1085..429147d 100644 --- a/1080i/Includes_hubMenuItems.xml +++ b/1080i/Includes_hubMenuItems.xml @@ -146,7 +146,7 @@ ActivateWindow(Videos,addons://sources/video/) Skin.SetString(showRecentVideoItems,false) - Control.SetFocus(59) + Control.SetFocus(50) diff --git a/1080i/Includes_hubOptions.xml b/1080i/Includes_hubOptions.xml index b549f88..e3a67af 100644 --- a/1080i/Includes_hubOptions.xml +++ b/1080i/Includes_hubOptions.xml @@ -22,21 +22,132 @@ ffffffff stretch - - - col-10-begin - 6-row - 0 - 6-col - 18-row - 0 - control.setfocus(9999) - control.setfocus(9999) - 9002 - 9002 - videoSideMenu - musicSideMenu - picturesSideMenu + + + + col-10-begin + 7-row + 6-col + 2-row + 0 + Control.SetFocus(9004,0) + control.setfocus(9999) + control.setfocus(9999) + horizontal + + + 0 + 0 + 1-col-textbox + 69 + stretch + colors/black.png + overlay + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + + + + + 0 + 0 + 1-col-textbox + 69 + stretch + colors/white.png + highlight + + + 0 + 0 + 1-col + 2-row + center + center + symbolLarge + textActive + + - + + + + + !Skin.HasSetting(hideVideo) + + ActivateWindow(Videos,sources://video/) + Skin.SetString(showRecentVideoItems,false) + ActivateWindow(Videos,library://video/) + Skin.SetString(showRecentVideoItems,true) + Control.SetFocus(9000) + + + !Skin.HasSetting(hideMusic) + + ActivateWindow(Music,files) + Skin.SetString(showRecentMusicItems,false) + ActivateWindow(Music,musicdb://) + Skin.SetString(showRecentMusicItems,true) + Control.SetFocus(9000) + + + !Skin.HasSetting(hidePictures) + + ActivateWindow(pictures) + Control.SetFocus(9999) + + + !Skin.HasSetting(hideGames) + System.HasAddon(script.games.rom.collection.browser) + + RunScript(script.games.rom.collection.browser,) + Control.SetFocus(9999) + + + System.HasAddon(plugin.program.advanced.launcher) + RunAddon(plugin.program.advanced.launcher,) + Control.SetFocus(9999) + + + !Skin.HasSetting(hideSearch) + + RunPlugin(plugin://script.globalsearch) + RunScript(script.globalsearch) + Skin.SetString(showRecentMusicItems,false) + Skin.SetString(showRecentVideoItems,false) + Control.SetFocus(9999) + + + + ActivateWindow(settings) + Control.SetFocus(9999) + + + + + + + col-10-begin + 10-row + 0 + 6-col + 17-row + 0 + control.setfocus(9999) + control.setfocus(9999) + 9003 + noop + videoSideMenu + musicSideMenu + picturesSideMenu + diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 3dd4947..4530b29 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -37,7 +37,6 @@ videofiles seasons episodes - videoaddons diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 423cb02..8af5adb 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -20,107 +20,139 @@ kenBurnsey + + + + col-17-begin + 222 + + Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + Substring(container.folderpath,videodb://) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) + + + + + + + + + 0 + 0 + 8-col + 768 + stretch + $INFO[Listitem.art(poster)] + 200 + + + 0 + 768 + 8-col + 2-row + scale + $INFO[Listitem.art(poster)] + 200 + + + + + Library.HasContent(movies) + !container.content(files) + !isempty(container.foldername) + !StringCompare(container.foldername,files) + Substring(container.folderpath,videodb://) + !StringCompare(container.foldername,Video Playlists) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) - 78 + col-1-begin row-5-begin - 1800 - 25-row + 15-col + 23-row 9000 60 50 50 - 9000 60 - 600 - + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col 0 - 4-col-gutter - 396 + 14-col + 69 stretch - DefaultPoster.png - colors/black.png - 6 - overlay + colors/black.png + textboxInactive - isempty(listitem.title) - 12 - 4-row - 240 + 1-col-indent + 0 + 10-col-gutter 2-row - center center - regularStrong - textDisabled - + itemTitle + textActive + - + - !controlgroup(9000).hasfocus - 12 - 11-row - 240 - 1-row - center - center - thumbTitle - textDisabled - - - - 0 + 12-col 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.Art(poster)] - colors/white.png - 3 - ffffffff + 3-col-gutter + 2-row + center + right + itemSubTitle + textActive + - + - - - focusThumb - - 0 - 0 - 4-col-gutter - 396 - stretch - $INFO[ListItem.Art(poster)] - colors/white.png - 6 - - - 0 - 0 - - isempty(listitem.title) - 12 - 11-row - 240 - 1-row - center - center - thumbTitle - textActive - - - - 12 - 11-row - 240 - 1-row - center - center - thumbTitle - textActive - - - + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 14-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 10-col-gutter + 2-row + center + itemTitle + textActive + - + + + + 12-col + 0 + 3-col-gutter + 2-row + center + right + itemSubTitle + textActive + - + diff --git a/1080i/View_MusicAddons.xml b/1080i/View_MusicAddons.xml index f08974d..518ac69 100644 --- a/1080i/View_MusicAddons.xml +++ b/1080i/View_MusicAddons.xml @@ -3,77 +3,77 @@ Substring(Container.folderpath,addons://sources/audio) - 78 + col-1-begin row-5-begin - 1800 - 24-row + 24-col + 23-row 9000 60 50 50 - 9000 60 - 600 - + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + 1-col 0 - 4-col-gutter - 4-col-gutter + 23-col + 69 stretch - DefaultAlbumCover.png - colors/black.png - 6 + colors/black.png textboxInactive - !controlgroup(9000).hasfocus - 12 - 264 - 240 - 1-row - center - center - thumbtitle - textDisabled - - - - 0 + 1-col-indent 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[Listitem.thumb] - colors/black.png - 6 - ffFFFFFF + 23-col-gutter + 2-row + center + itemTitle + textActive + - + - - - focusThumb - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[Listitem.thumb] - colors/white.png - 6 - - - 12 - 264 - 240 - 1-row - center - center - thumbtitle - textActive - - + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + + + 1-col + 0 + 23-col + 2-row + stretch + colors/white.png + highlight + + + 1-col-indent + 0 + 23-col-gutter + 2-row + center + itemTitle + textActive + - + diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index abfd341..bf6dea6 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -48,20 +48,20 @@ row-5-begin 15-col 2-row - mediumStrong + largeLight textActive - - + col-10-begin row-7-begin 15-col 1-row - small + regular textActive - - + diff --git a/1080i/View_VideoAddons.xml b/1080i/View_VideoAddons.xml deleted file mode 100644 index a3c6e87..0000000 --- a/1080i/View_VideoAddons.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - container.content(addons) - - !isempty(container.folderpath) + !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(tvshows) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) - 78 - row-5-begin - 1800 - 24-row - 9000 - 60 - 59 - 59 - 9000 - 60 - 600 - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - DefaultAlbumCover.png - colors/black.png - 6 - textboxInactive - - - !controlgroup(9000).hasfocus - 12 - 264 - 240 - 1-row - center - center - thumbtitle - textDisabled - - - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[Listitem.thumb] - colors/black.png - 6 - ffFFFFFF - - - - - focusThumb - - 0 - 0 - 4-col-gutter - 4-col-gutter - stretch - $INFO[Listitem.thumb] - colors/white.png - 6 - - - 12 - 264 - 240 - 1-row - center - center - thumbtitle - textActive - - - - - - - - diff --git a/1080i/script-skin_helper_service-CustomInfo.xml b/1080i/script-skin_helper_service-CustomInfo.xml index 2f0b98f..42f8c12 100755 --- a/1080i/script-skin_helper_service-CustomInfo.xml +++ b/1080i/script-skin_helper_service-CustomInfo.xml @@ -146,12 +146,12 @@ row-1-begin 0 - 0 + -12 672 left 3-row center - pageTitle + largeLight textActive true diff --git a/changelog.txt b/changelog.txt index be44215..c532cea 100644 --- a/changelog.txt +++ b/changelog.txt @@ -44,7 +44,13 @@ ***To do (Skinners Notes)*** -Update music library not working +PVR Info screen: delete button + +Add default background for 'what's new' items without fanart + +Check CD and DVD handling + +Check Youtube addon login issue Photo section needs revision diff --git a/media/icon.png b/media/icon.png deleted file mode 100644 index d5e958d..0000000 Binary files a/media/icon.png and /dev/null differ diff --git a/media/logoOverlay.png b/media/logoOverlay.png deleted file mode 100644 index af3c111..0000000 Binary files a/media/logoOverlay.png and /dev/null differ diff --git a/media/masks/thumbFader.png b/media/masks/thumbFader.png new file mode 100644 index 0000000..e29ce0c Binary files /dev/null and b/media/masks/thumbFader.png differ