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 40ad873..7253543 100644 Binary files a/media/DefaultAlbumCover.png and b/media/DefaultAlbumCover.png differ diff --git a/media/DefaultPoster.png b/media/DefaultPoster.png index 3717e05..0148fad 100644 Binary files a/media/DefaultPoster.png and b/media/DefaultPoster.png differ diff --git a/media/icon.png b/media/icon.png new file mode 100644 index 0000000..d5e958d Binary files /dev/null and b/media/icon.png differ