From 34a54a84917d8c471aff853db824fe0cb89dd4d1 Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Sun, 8 Nov 2015 20:16:04 +0000 Subject: [PATCH] Various --- 1080i/AddonBrowser.xml | 12 + 1080i/DialogVideoInfo.xml | 17 +- 1080i/Includes_hubMenuSubItems.xml | 20 +- 1080i/Includes_variables.xml | 4 +- 1080i/MyMusicNav.xml | 2 +- 1080i/MyMusicPlaylist.xml | 4 +- 1080i/MyPVRChannels.xml | 4 +- 1080i/MyPVRRecordings.xml | 4 +- 1080i/MyPics.xml | 2 +- 1080i/MyPrograms.xml | 2 +- 1080i/MyVideoNav.xml | 12 +- 1080i/View_MusicAddons.xml | 4 +- 1080i/View_MusicPlaylist.xml | 4 +- 1080i/View_TVShows.xml | 26 +- 1080i/View_VideoAddons.xml | 4 +- 1080i/View_VideoRecentItems.xml | 7 +- 1080i/custom_musicPlayerFullscreen.xml | 29 +- 1080i/custom_videoInformation.xml | 675 +++++++++++++++++++ 1080i/script-Rom_Collection_Browser-main.xml | 6 +- addon.xml | 1 - changelog.txt | 14 +- language/English/strings.po | 8 +- media/DefaultAlbumCover.png | Bin 46732 -> 8382 bytes media/DefaultPoster.png | Bin 1662 -> 11051 bytes media/icon.png | Bin 0 -> 112989 bytes 25 files changed, 780 insertions(+), 81 deletions(-) create mode 100644 1080i/custom_videoInformation.xml create mode 100644 media/icon.png diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index 4edc50c..1717e95 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -58,18 +58,30 @@ 6-col - + + + - + - 9999 6-col - + - + - + + 9999 6-col - + - + - + + 9999 diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 785826e..ed6432d 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -36,20 +36,21 @@ stretch kenBurnsey - - 1-col - row-25-begin - 4-col - 2-col - $INFO[ListItem.Art(clearlogo)] - keep - + dimensionsFullscreen vignette.png ffffffff stretch + + 1-col + row-22-begin + 6-col + 4-col + $INFO[ListItem.Art(clearlogo)] + keep + diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml index 0eacfdf..d7cd387 100644 --- a/1080i/Includes_hubMenuSubItems.xml +++ b/1080i/Includes_hubMenuSubItems.xml @@ -63,8 +63,7 @@ right - Watched Toggle off - !System.Setting(hidewatched) + Watched Toggle 2-row col-7-begin @@ -76,21 +75,8 @@ - - col-1-begin - - - Watched Toggle on - System.Setting(hidewatched) - - 2-row - col-7-begin - menuTitle - textActive - highlight - menuDisabled - colors/white.png - - - - - col-1-begin + + Unlock Shares diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index f9664de..c034c5f 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -17,9 +17,9 @@ $LOCALIZE[31012] $INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,] - $LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR] + $LOCALIZE[20342] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR] $LOCALIZE[20343] [COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod][/COLOR] - + $INFO[container.foldername] $LOCALIZE[31053] $LOCALIZE[31058] diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 77eb61a..a4e9559 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -44,7 +44,7 @@ Control.IsVisible(60) + SubString(skin.string(showRecentMusicItems),false) conditional - 84r + 48r 276 672 9999 diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml index 1657ad0..07c68f4 100644 --- a/1080i/MyMusicPlaylist.xml +++ b/1080i/MyMusicPlaylist.xml @@ -1,7 +1,7 @@ 9999 - + home globalBackground @@ -50,7 +50,7 @@ Control.IsVisible(60) conditional - 98r + 51r row-5-begin 22-row 9999 diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 9b9adc1..866b67f 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -1,7 +1,7 @@ 9999 - + PlayerControl(stop) Skin.SetString(showRecentVideoItems,true) @@ -34,7 +34,7 @@ Control.IsVisible(60) + !control.isvisible(10) conditional - 98r + 51r row-5-begin 22-row 9999 diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 94a0dd5..27c4cf4 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -1,7 +1,7 @@ 9999 - + PlayerControl(stop) Skin.SetString(showRecentVideoItems,true) @@ -183,7 +183,7 @@ Control.IsVisible(60) conditional - 84r + 51r row-5-begin 21-row 9999 diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml index 8fed25e..0c5be14 100644 --- a/1080i/MyPics.xml +++ b/1080i/MyPics.xml @@ -29,7 +29,7 @@ Control.IsVisible(60) conditional - 84r + 48r row-5-begin 826 9999 diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index 88b4ce8..2cc51c0 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -167,7 +167,7 @@ Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false) conditional - 84r + 48r row-5-begin 789 9999 diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 78bf661..a449c37 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -48,16 +48,16 @@ conditional Substring(Container.folderpath,plugin) - 84r + 51r row-5-begin - 789 + 23-row 9999 !Substring(Container.folderpath,plugin) - 84r - row-8-begin - 19-row + 48r + row-5-begin + 23-row 9999 @@ -75,7 +75,7 @@ row-1-begin 14-col pageTitle - + textActive diff --git a/1080i/View_MusicAddons.xml b/1080i/View_MusicAddons.xml index c8c603e..be16a17 100644 --- a/1080i/View_MusicAddons.xml +++ b/1080i/View_MusicAddons.xml @@ -19,7 +19,7 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png + defaultAlbumCover.png colors/white.png 3 textboxInactive @@ -73,7 +73,7 @@ 4-col-gutter 4-col-gutter stretch - $INFO[Listitem.thumb] + $INFO[Listitem.thumb] colors/white.png 3 ff666666 diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml index 5b1f918..38a8413 100644 --- a/1080i/View_MusicPlaylist.xml +++ b/1080i/View_MusicPlaylist.xml @@ -72,7 +72,7 @@ itemTitle textActive - - + 24 @@ -169,7 +169,7 @@ itemTitle textActive - - + 24 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 548b0a2..6981c4d 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -42,7 +42,7 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.art(fanart)] + $INFO[Listitem.art(fanart)] colors/white.png 3 @@ -63,6 +63,18 @@ keep $INFO[ListItem.Art(clearlogo)] + + isempty(ListItem.Art(clearlogo)) + 12 + 4-row + 6-col-gutter + 2-row + center + center + regularStrong + textActive + + @@ -99,6 +111,18 @@ keep $INFO[ListItem.Art(clearlogo)] + + isempty(ListItem.Art(clearlogo)) + 12 + 4-row + 6-col-gutter + 2-row + center + center + regularStrong + textActive + + diff --git a/1080i/View_VideoAddons.xml b/1080i/View_VideoAddons.xml index ad9ae9b..0bf07aa 100644 --- a/1080i/View_VideoAddons.xml +++ b/1080i/View_VideoAddons.xml @@ -22,7 +22,7 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png + defaultAlbumCover.png colors/white.png 3 textboxInactive @@ -76,7 +76,7 @@ 4-col-gutter 4-col-gutter stretch - $INFO[Listitem.thumb] + $INFO[Listitem.thumb] colors/white.png 3 ff666666 diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 52f2abc..155f9fa 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -159,10 +159,11 @@ 9000 activateWindow(home) horizontal - Skin.SetString(showRecentVideoItems,false) - activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) - Control.SetFocus(50) + Skin.SetString(showRecentVideoItems,false) + activatewindow(Video,videodb://tvshows/titles/$INFO[listitem.dbid]/$INFO[listitem.season]) + Control.SetFocus(50) $INFO[control.getlabel(9123)] + activateWindow(5824) 0 diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index ce87069..6141bb9 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -58,7 +58,7 @@ col-1-begin - row-16-begin + row-20-begin listSlideIn @@ -67,24 +67,21 @@ - 0 - 0 - 6-col - 6-col + 24 + -24 + 4-col + 4-col stretch - $INFO[musicplayer.cover] - colors/white.png - 3 + $INFO[musicplayer.cover] 500 - windowopen - col-5-begin - row-22-begin + col-3-begin + row-21-begin - 3-col-indent + 3-col -8 15-col largeBlack @@ -95,7 +92,7 @@ !Pvr.IsPlayingRadio - 3-col-indent + 3-col 52 15-col regularStrong @@ -106,7 +103,7 @@ Pvr.IsPlayingRadio - 3-col-indent + 3-col 48 15-col regularStrong @@ -116,7 +113,7 @@ 00000000 - 3-col-indent + 3-col 104 12-col pageTitle @@ -137,7 +134,7 @@ 00000000 - 3-col-indent + 3-col 156 12-col itemTitle diff --git a/1080i/custom_videoInformation.xml b/1080i/custom_videoInformation.xml new file mode 100644 index 0000000..e05b54e --- /dev/null +++ b/1080i/custom_videoInformation.xml @@ -0,0 +1,675 @@ + + + 8000 + fadeInOut + Skin.Reset(showcast) + + + false + + + !Substring(Container.folderpath,plugin) + !container.content(episodes) + 0 + 0 + dimensionsFullscreen + colors/black.png + ffffffff + stretch + + + Substring(Container.folderpath,plugin) | container.content(episodes) + 0 + 0 + dimensionsFullscreen + colors/black.png + ddffffff + stretch + + + !Substring(Container.folderpath,plugin) + !container.content(episodes) + 0 + 0 + dimensionsFullscreen + $INFO[container(9998).listitem.art(fanart)] + ffffffff + stretch + kenBurnsey + + + 1-col + row-25-begin + 4-col + 2-col + $INFO[ListItem.Art(clearlogo)] + keep + + + dimensionsFullscreen + vignette.png + ffffffff + stretch + + + + + !Substring(Container.folderpath,plugin) + !container.content(episodes) + col-15-begin + 0 + + + + + + + + + + 0 + 0 + 10-col + fullscreenHeight + colors/black.png + cc111111 + stretch + + + 0 + 0 + 10-col + row-5-begin + colors/white.png + highlight + stretch + + + 0 + row-5-begin + 10-col + 1-row + colors/white.png + stretch + + + + 12 + 7-row + 10-col + 6-row + false + + + 12 + 0 + 4-col-gutter + itemSubTitle + highlight + + - + + + 12 + 32 + 4-col-gutter + itemSubTitle + textActive + + - + + + + + + + + $INFO[ListItem.year] + - + noop + + + + $INFO[ListItem.director] + - + noop + + + + $INFO[ListItem.genre] + - + noop + + + + $INFO[ListItem.UserRating,,/10] + - + noop + + + + + + 24 + row-1-begin + + 0 + 0 + 672 + left + 3-row + center + pageTitle + textActive + + true + + + 0 + 4-row + 672 + left + itemSubTitle + black + + - + + + + 0 + 10-row + textbox + 672 + left + textActive + 410 + + + - + + + + + 0 + 24-row + 10-col + 6-row + 3 + vertical + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/black.png + textboxInactive + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + - + + + 1-col + 0 + 4-col + 2-row + stretch + colors/black.png + textboxInactive + + + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle + textActive + + - + + + + + 0 + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 4-col + 2-row + stretch + colors/white.png + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + - + + + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle + black + + - + + + + + + + - + sendclick(2003,8) + + + + + - + Skin.SetString(showcast,true) + control.setfocus(50) + + + + + - + SendClick(2003,11) + + + + + - + SendClick(2003,6) + + + + + - + SendClick(2003,10) + + + Artwork Downloader (overrides get artwork if available) + + 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]) + + false + + + + + - + SendClick(2003,7) + + + + + + + + Substring(Container.folderpath,plugin) | container.content(episodes) + + modalDialogInOut + + + col-7-begin + row-1-begin + + 0 + 0 + 12-col + 486 + scale + $INFO[Listitem.thumb] + colors/white.png + 3 + + + + + col-7-begin + row-15-begin + + + Episode title + 0 + 2-row + 12-col-gutter + 2-row + left + center + mediumStrong + highlight + - + + true + + + 0 + -18 + 12-col + horizontal + + 1-col-gutter + 2-row + center + symbolLarge + textActive + + + + 3-col + 2-row + center + regularStrong + textActive + + + + + + + 0 + 5-row + textbox + 12-col + left + textActive + - + 160 + + + + + + 0 + 11-row + 12-col + 2-row + horizontal + + + 0 + 0 + 6-col + 2-row + stretch + colors/black.png + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + - + + + 1-col-indent + 0 + 6-col + 2-row + center + buttonTitle + textActive + + - + + + + + 0 + 0 + 1-col-textbox + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 5-col + 2-row + stretch + colors/white.png + + + 0 + 0 + 1-col + 2-row + center + center + symbol + textActive + + - + + + 1-col-indent + 0 + 6-col + 2-row + center + buttonTitle + black + + - + + + + + + + - + sendclick(2003,8) + + + !Substring(Container.folderpath,plugin) + + + - + SendClick(2003,6) + + + + + + + + skin.string(showcast,true) + col-15-begin + 0 + + + + + + 0 + 0 + 10-col + fullscreenHeight + colors/black.png + cc111111 + stretch + + + 0 + 0 + 10-col + row-5-begin + colors/white.png + highlight + stretch + + + 0 + row-5-begin + 10-col + 1-row + colors/white.png + stretch + + + + 12 + row-1-begin + + 0 + 0 + 10-col-gutter + left + 3-row + center + pageTitle + textActive + + true + + + 0 + 4-row + 10-col-gutter + left + itemSubTitle + black + + + + + 0 + 236 + 10-col + 24-row + + + 0 + 0 + 2-col-textbox + 2-col-textbox + scale + $INFO[listitem.thumb] + 0 + ffFFFFFF + + + 2-col-indent + 0 + 8-col-gutter + 2-row + itemTitle + textActive + + + + 2-col-indent + 1-row + 8-col-gutter + 2-row + itemSubTitle + textActive + + + + + + 0 + 0 + 2-col-textbox + 2-col-textbox + scale + $INFO[listitem.thumb] + 0 + ffFFFFFF + + + + + + + 2-col + 0 + 8-col + 2-col + stretch + colors/white.png + ffFFFFFF + + + 2-col-indent + 0 + 8-col-gutter + 2-row + itemTitle + black + + + + 2-col-indent + 1-row + 8-col-gutter + 2-row + itemSubTitle + black + + + + + + + + false + + Play + + + Refresh + + + Ratings + + + Choose Art + + + Trailer + + + + DebugGrid + + DialogID + + + + diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml index 50653d0..7155dc7 100644 --- a/1080i/script-Rom_Collection_Browser-main.xml +++ b/1080i/script-Rom_Collection_Browser-main.xml @@ -1,6 +1,6 @@ - + 500 globalBackground @@ -379,6 +379,10 @@ menuDisabled colors/white.png - + - + - + + col-1-begin diff --git a/addon.xml b/addon.xml index bdc67a4..c207958 100644 --- a/addon.xml +++ b/addon.xml @@ -4,7 +4,6 @@ - diff --git a/changelog.txt b/changelog.txt index 1d2e8fa..ad4062b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -26,19 +26,23 @@ ***To do*** +Create / duplicate custom movie / music info dialog (for ONINFO) + DialogPVRinfo - button update +Use 'has parent' to manage back button (open side menu on no parent item) -Touchscreen controls -revise the TVShow view (looks kinda clunky) +Radio RDS test -Add Artwork downloader link to 2nd level side menu +Touchscreen controls - get Android tablet for testing + +Finish the TVShow view - No logo infolabel CREATE A BETTER SKIN LOGO! + Addons manager - clean up a bit. - -Design Fallbacks for posters and album covers +Remove dependencies (ask for install - see forum) diff --git a/language/English/strings.po b/language/English/strings.po index d40cd99..79ebbdb 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -514,11 +514,7 @@ msgid "Duration" msgstr "" msgctxt "#31195" -msgid "Hide watched items" -msgstr "" - -msgctxt "#31196" -msgid "Show watched items" +msgid "Hide watched items:" msgstr "" msgctxt "#31197" @@ -582,7 +578,7 @@ msgid "5 Day Forecast for" msgstr "" msgctxt "#31213" -msgid "(Showing unwatched items only)" +msgid "Unwatched items only" msgstr "" msgctxt "#31214" diff --git a/media/DefaultAlbumCover.png b/media/DefaultAlbumCover.png index 40ad873da7c02e6022746747d1b9830c099aa10b..7253543fa5b760d5e1f84f4984aa26b96860c762 100644 GIT binary patch literal 8382 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