From 5f22070030476987d1e026237b4358f99b1953cc Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Sun, 3 Apr 2016 16:35:32 +0100 Subject: [PATCH] bugfixes --- 1080i/DialogAlbumInfo.xml | 18 +- 1080i/DialogFullScreenInfo.xml | 2 +- 1080i/DialogVideoInfo.xml | 27 +-- 1080i/Includes_animations.xml | 8 +- 1080i/MyPVRRecordings.xml | 2 +- 1080i/MyPrograms.xml | 2 +- 1080i/MyWeather.xml | 4 +- 1080i/VideoOSDBookmarks.xml | 2 +- 1080i/View_Albums.xml | 6 +- 1080i/View_ArtistAlbums.xml | 6 +- 1080i/View_Movies.xml | 6 +- 1080i/View_MusicAddons.xml | 6 +- 1080i/View_MusicRecentItems.xml | 6 +- 1080i/View_Photos.xml | 6 +- 1080i/View_Seasons.xml | 2 +- 1080i/View_TVShows.xml | 6 +- 1080i/View_VideoAddons.xml | 6 +- 1080i/View_VideoRecentItems.xml | 189 +++++++++++------- .../script-skin_helper_service-CustomInfo.xml | 40 +--- changelog.txt | 14 +- extras/playlists/recentEpisodes.xsp | 2 +- extras/playlists/recentMovies.xsp | 2 +- 22 files changed, 176 insertions(+), 186 deletions(-) diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml index 3623b32..2933130 100644 --- a/1080i/DialogAlbumInfo.xml +++ b/1080i/DialogAlbumInfo.xml @@ -1,8 +1,9 @@ 8000 - - fadeInOut + + + @@ -29,7 +30,10 @@ stretch $INFO[Listitem.thumb] windowOpen - windowClose + + + + @@ -50,6 +54,10 @@ + + + + 0 0 @@ -235,6 +243,10 @@ + + + + 0 0 diff --git a/1080i/DialogFullScreenInfo.xml b/1080i/DialogFullScreenInfo.xml index a993368..755ee0a 100644 --- a/1080i/DialogFullScreenInfo.xml +++ b/1080i/DialogFullScreenInfo.xml @@ -44,7 +44,7 @@ 2-row pageTitle textActive - + 96 diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 66310d9..940e2f1 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -1,10 +1,11 @@ 8000 - - fadeInOut Skin.Reset(showcast) action(info) + + + @@ -63,6 +64,10 @@ + + + + 0 @@ -93,7 +98,7 @@ 12 - 324 + 7-row 10-col 6-row false @@ -162,18 +167,6 @@ true - - 0 - 5-row - 2-row - 672 - left - itemTitle - textActive - - true - - - 0 5-row @@ -189,12 +182,12 @@ 0 - 12-row + 10-row textbox 672 left textActive - 350 + 384 - diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 961c5d8..33f3dee 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -32,13 +32,13 @@ - + - - + + + - diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index c1ccc2b..8e11d5a 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -201,7 +201,7 @@ 0 45 14-col - regular + pageSubTitle textActive diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index 97fa614..cc4bf4d 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -75,7 +75,7 @@ - spinFocusPoster + focusThumb 0 0 diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml index b502aff..7752139 100644 --- a/1080i/MyWeather.xml +++ b/1080i/MyWeather.xml @@ -7,7 +7,7 @@ globalBackground dimensionsFullscreen - resource://resource.images.weatherfanart.single/$INFO[Window.Property(Current.FanartCode),,.jpg] + resource://resource.images.weatherfanart.single/$INFO[Window(weather).Property(Current.fanartCode),,.jpg] 33ffffff stretch kenBurnsey @@ -78,7 +78,7 @@ 3-col 3-col stretch - resource://resource.images.weathericons.outline/$INFO[Window.Property(current.FanartCode),,.png] + resource://resource.images.weathericons.outline/$INFO[Window(weather).Property(current.fanartCode),,.png] 3-col diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml index a6d6851..f40ad12 100644 --- a/1080i/VideoOSDBookmarks.xml +++ b/1080i/VideoOSDBookmarks.xml @@ -181,7 +181,7 @@ colors/white.png 3 ffFFFFFF - spinFocusPoster + focusThumb 12 diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index e22524c..c4ef67f 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -95,11 +95,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index a673e13..12b11b6 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -148,11 +148,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 30a30c0..c563c79 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -97,11 +97,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_MusicAddons.xml b/1080i/View_MusicAddons.xml index 823683e..74015a4 100644 --- a/1080i/View_MusicAddons.xml +++ b/1080i/View_MusicAddons.xml @@ -64,11 +64,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index 750b8b0..f653b96 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -124,11 +124,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml index 3a36f82..057ad63 100644 --- a/1080i/View_Photos.xml +++ b/1080i/View_Photos.xml @@ -64,11 +64,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index e51a71d..87bc4d2 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -133,7 +133,7 @@ - spinFocusPoster + focusThumb 0 0 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index f147de3..21cd814 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -93,11 +93,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_VideoAddons.xml b/1080i/View_VideoAddons.xml index c867579..c1554d3 100644 --- a/1080i/View_VideoAddons.xml +++ b/1080i/View_VideoAddons.xml @@ -67,11 +67,7 @@ - - - - - + focusThumb 0 0 diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 49a1af2..df17410 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -77,6 +77,7 @@ + container(9123).hasfocus(1) @@ -89,12 +90,8 @@ 9000 horizontal control.setfocus(9000) - Skin.SetString(showRecentVideoItems,false) - activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) - Control.SetFocus(50) $INFO[control.getlabel(9123)] - RunScript(script.skin.helper.service,action=showinfo,movieid=$INFO[container(9998).listitem.dbid]) - RunScript(script.skin.helper.service,action=showinfo,tvshowid=$INFO[container(9998).listitem.dbid]) + RunScript(script.skin.helper.service,action=showinfo,movieid=$INFO[container(9998).listitem.dbid]) 0 @@ -108,7 +105,7 @@ overlay - !controlgroup(9000).hasfocus + container(9123).hasfocus(1) + !controlgroup(9000).hasfocus 12 2-row 168 @@ -120,7 +117,114 @@ - !controlgroup(9000).hasfocus + container(9123).hasfocus(2) + !controlgroup(9000).hasfocus + 12 + 3-row + 168 + 2-row + center + center + buttonTitle + textDisabled + + + + 0 + 0 + 3-col-gutter + 288 + stretch + $INFO[ListItem.Art(poster)] + colors/black.png + 6 + ffffffff + + + + + focusThumb + + 0 + 0 + 3-col-gutter + 288 + stretch + defaultPoster.png + colors/black.png + 6 + overlay + + + !controlgroup(9000).hasfocus + 12 + 2-row + 168 + 2-row + center + center + regularStrong + textActive + + + + !controlgroup(9000).hasfocus + 12 + 3-row + 168 + 2-row + center + center + buttonTitle + textActive + + + + 0 + 0 + 3-col-gutter + 288 + stretch + $INFO[ListItem.Art(poster)] + colors/white.png + 6 + ffffffff + + + + + + container(9123).hasfocus(2) + + + + 72 + row-20-begin + 1800 + 9-row + 9123 + 9000 + 9000 + horizontal + control.setfocus(9000) + $INFO[control.getlabel(9123)] + Skin.SetString(showRecentVideoItems,false) + activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) + Control.SetFocus(50) + RunScript(script.skin.helper.service,action=showinfo,tvshowid=$INFO[container(9998).listitem.dbid]) + + + 0 + 0 + 3-col-gutter + 288 + stretch + defaultPoster.png + colors/black.png + 6 + overlay + + + !controlgroup(9000).hasfocus 12 2-row 168 @@ -132,19 +236,7 @@ - !controlgroup(9000).hasfocus + container(9123).hasfocus(1) - 12 - 3-row - 168 - 2-row - center - center - buttonTitle - textDisabled - - - - !controlgroup(9000).hasfocus + container(9123).hasfocus(2) + !controlgroup(9000).hasfocus 12 3-row 168 @@ -166,25 +258,10 @@ 6 ffffffff - - 0 - 0 - 3-col-gutter - 288 - stretch - $INFO[ListItem.property(season_poster)] - colors/black.png - 6 - ffffffff - - - - - - + focusThumb 0 0 @@ -197,19 +274,7 @@ overlay - !controlgroup(9000).hasfocus + container(9123).hasfocus(1) - 12 - 2-row - 168 - 2-row - center - center - regularStrong - textActive - - - - !controlgroup(9000).hasfocus + container(9123).hasfocus(2) + !controlgroup(9000).hasfocus 12 2-row 168 @@ -221,19 +286,7 @@ - !controlgroup(9000).hasfocus + container(9123).hasfocus(1) - 12 - 3-row - 168 - 2-row - center - center - buttonTitle - textActive - - - - !controlgroup(9000).hasfocus + container(9123).hasfocus(2) + !controlgroup(9000).hasfocus 12 3-row 168 @@ -255,21 +308,11 @@ 6 ffffffff - - 0 - 0 - 3-col-gutter - 288 - stretch - $INFO[ListItem.property(season_poster)] - colors/white.png - 6 - ffffffff - + diff --git a/1080i/script-skin_helper_service-CustomInfo.xml b/1080i/script-skin_helper_service-CustomInfo.xml index d9cfaea..2f0b98f 100755 --- a/1080i/script-skin_helper_service-CustomInfo.xml +++ b/1080i/script-skin_helper_service-CustomInfo.xml @@ -87,7 +87,7 @@ 12 - 324 + 7-row 10-col 6-row false @@ -156,39 +156,15 @@ true - - 0 - 5-row - 2-row - 672 - left - itemTitle - textActive - - true - - - - - 0 - 5-row - 2-row - 672 - left - itemTitle - textActive - - true - - - 0 - 12-row + 10-row textbox 672 left textActive - 350 + 384 - @@ -293,7 +269,8 @@ - - sendclick(2003,5) + PlayMedia($ESCINFO[Container(999).ListItem.filenameandpath]) + action(back) @@ -305,12 +282,5 @@ - - - false - - play - - \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index cc7c145..8d20ff5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -34,20 +34,24 @@ ***To do (Skinners Notes)*** +Photos section not looking good: Fallback thumbs not working + +Fullscreen music view: Radio art and RDS support + + + + + Optimise settings: use skin helper: on startup: Ask whether to change: show parent folder items: system.getbool(showparentdiritems) start PVR minimised: false PVR Recording schedule (integrate with recordings) -Fullscreen music view: Radio art and RDS support - Complete DialogAudioDSPManager.xml and DialogAudioDSPSettings.xml -scripted video info screen TEST THAT PLAYMEDIA WORKS - Add MyVideoPlaylist.xml -Check extra button to dialogAddonInfo.xml actually works (auto update) + diff --git a/extras/playlists/recentEpisodes.xsp b/extras/playlists/recentEpisodes.xsp index 86031f6..66486bd 100644 --- a/extras/playlists/recentEpisodes.xsp +++ b/extras/playlists/recentEpisodes.xsp @@ -2,6 +2,6 @@ recentEpisodes all - 10 + 20 dateadded diff --git a/extras/playlists/recentMovies.xsp b/extras/playlists/recentMovies.xsp index 9cd3594..19cbafe 100644 --- a/extras/playlists/recentMovies.xsp +++ b/extras/playlists/recentMovies.xsp @@ -2,6 +2,6 @@ recentMovies all - 10 + 20 dateadded