diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 6a2867f..b4393d0 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -100,30 +100,22 @@ overlay stretch - - 12 - 12 - 2-col-gutter - 2-col-gutter - stretch - $INFO[ListItem.art(thumb)] - Addon Title - 2-col + 12 12 10-col-gutter 2-row center - mediumStrong - + menuTitle + - 2-col - 84 + 12 + 72 9-col - buttonTitle - textDisabled + menuTitle + menuUnselected diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 11a9d84..35f3b33 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -17,7 +17,7 @@ 8-col-gutter 2-row true - regularStrong + menuTitle textActive diff --git a/1080i/Font.xml b/1080i/Font.xml index 1db59be..6b46bb8 100644 --- a/1080i/Font.xml +++ b/1080i/Font.xml @@ -143,6 +143,12 @@ 24 1.0 + + playlistSubTitle + roboto_slab/bold.ttf + 24 + 1.0 + itemSubTitleCondensed roboto/condensedBold.ttf diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index 841a92c..d8dc4c0 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -105,7 +105,8 @@ - skinshortcuts-group-picturessubmenu + skinshortcuts-group-picturessubmenu + skinshortcuts-group-picturessubmenu skinshortcuts-group-musicsubmenu skinshortcuts-group-videosubmenu diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index c147d81..fef8ffa 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -27,7 +27,8 @@ $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR] $LOCALIZE[10506] $LOCALIZE[31123] - $LOCALIZE[31056] + $LOCALIZE[31056] + $LOCALIZE[31232] $INFO[Container.NumAllItems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] @@ -36,6 +37,7 @@ $INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)]) $INFO[container.NumAllItems] $LOCALIZE[31165] $INFO[container.NumAllItems,, $LOCALIZE[31145]] + $INFO[container.NumAllItems,, $LOCALIZE[31145]] $INFO[container.NumAllItems,, $LOCALIZE[31014]] $INFO[container.NumAllItems,, $LOCALIZE[31038]] $INFO[container.foldername,,] $INFO[container.NumAllItems,(, $LOCALIZE[31050])] @@ -97,7 +99,8 @@ - + + diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index a69428c..4bd2732 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -13,7 +13,7 @@ stretch $INFO[Container.Art(artist.fanart)] 500 - 77ffffff + 55ffffff vignette.png diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml index ca610ee..94b12ed 100644 --- a/1080i/MyPlaylist.xml +++ b/1080i/MyPlaylist.xml @@ -3,6 +3,7 @@ 59 PlayerControl(stop) fadeInOut + 59 globalBackground diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index a4508d3..84e8899 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -22,11 +22,11 @@ 9998 9000 horizontal - + 0 0 - 234 + 246 2-row menuTitle center @@ -35,11 +35,11 @@ - + 0 0 - 234 + 246 2-row menuTitle center @@ -77,7 +77,7 @@ 9000 9000 horizontal - activatewindow(music,musicdb://albums/$INFO[listitem.DBID],return) + activatewindow(music,musicdb://albums/$INFO[listitem.DBID]/,return) Control.SetFocus(50) diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index a40ee8a..b0fc360 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -8,7 +8,7 @@ dimensionsFullscreen stretch - $INFO[container.Art(artist.fanart)] + $INFO[Container.Art(fanart)] 0 66ffffff @@ -43,11 +43,11 @@ row-8-begin 0 - 0 + 4-row 10-col 4-row - veryLarge - 44ffffff + largeTitle + textActive center true diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index c0586f7..9a2f0a1 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -23,11 +23,11 @@ 9000 horizontal true - + 0 0 - 4-col-gutter + 4-col 2-row menuTitle center @@ -36,11 +36,11 @@ - + 0 0 - 4-col-gutter + 4-col 2-row menuTitle center diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml index fba36a2..781a500 100644 --- a/1080i/View_MusicPlaylist.xml +++ b/1080i/View_MusicPlaylist.xml @@ -7,7 +7,7 @@ col-1-begin row-5-begin - 15-col + 24-col 23-row 9000 60 @@ -16,30 +16,22 @@ 9000 60 200 - + - 1-col + 105 0 - 14-col - 87 + 1620 + 105 stretch colors/black.png overlay - - ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi + !Skin.HasSetting(lowPowerMode) - 12 - 12 - 1-col-gutter - 1-col-gutter - equaliser.gif - ListItem.IsPlaying + !player.paused + [System.Platform.Linux.RaspberryPi | Skin.HasSetting(lowPowerMode)] 0 0 - 1-col-textbox - 2-row + 105 + 105 center center symbolLarge @@ -51,8 +43,8 @@ ListItem.IsPlaying + player.paused 0 0 - 1-col-textbox - 90 + 105 + 105 center center symbolLarge @@ -63,75 +55,75 @@ !ListItem.IsPlaying 0 - 12 - 66 - 66 + 0 + 105 + 105 stretch - $INFO[Listitem.thumb] + $INFO[Listitem.thumb] - 1-col-indent - -8 + 129 + -4 13-col 2-row center - itemTitle + dialogTitle textActive - 1-col-indent - 28 + 129 + 34 13-col 2-row center - thumbTitle + playlistSubTitle textActive - + - 24 + -36 0 3-col-gutter - 87 + 105 center right - itemTitle + regularStrong textActive - + - 1-col + 105 0 - 14-col - 87 + 1620 + 105 stretch colors/white.png highlight ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi - 12 - 12 - 1-col-gutter - 1-col-gutter + 18 + 0 + 72 + 72 equaliser.gif - + ListItem.IsPlaying + !player.paused + System.Platform.Linux.RaspberryPi 0 0 - 1-col-textbox - 90 + 105 + 105 center center symbolLarge @@ -140,15 +132,15 @@ - + ListItem.IsPlaying + player.paused 0 0 - 1-col-textbox - 90 + 105 + 105 center center symbolLarge @@ -157,52 +149,52 @@ - + !ListItem.IsPlaying 0 - 12 - 66 - 66 + 0 + 105 + 105 stretch - $INFO[Listitem.thumb] + $INFO[Listitem.thumb] - + - 1-col-indent - -8 + 129 + -4 13-col 2-row center - itemTitle + dialogTitle textActive - 1-col-indent - 28 + 129 + 34 13-col 2-row center - thumbTitle + playlistSubTitle textActive - + - 24 + -36 0 3-col-gutter - 87 + 105 center right - itemTitle + regularStrong textActive @@ -210,43 +202,5 @@ - - - $EXP[isMusicPlaylist] - col-17-begin - row-5-begin - - 0 - 0 - 4-col-textbox - 4-col-textbox - stretch - $INFO[container(59).listitemAbsolute(2).art(thumb)] - - - 4-col - 0 - 4-col - 4-col-textbox - stretch - $INFO[container(59).listitemAbsolute(4).art(thumb)] - - - 0 - 4-col - 4-col-textbox - 4-col - stretch - $INFO[container(59).listitemAbsolute(6).art(thumb)] - - - 4-col - 4-col - 4-col - 4-col - stretch - $INFO[container(59).listitemAbsolute(8).art(thumb)] - - diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml index 292735d..82321a9 100644 --- a/1080i/View_Photos.xml +++ b/1080i/View_Photos.xml @@ -20,8 +20,8 @@ 6-col-gutter 4-col-gutter scale - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -33,6 +33,7 @@ scale $INFO[Listitem.thumb] 6 + 77ffffff 12 diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index c130420..1b2a83b 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -29,8 +29,8 @@ 0 10-col 4-row - veryLarge - 44ffffff + largeTitle + textActive center true diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 93ad1e6..ca73f5c 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -43,7 +43,7 @@ row-6-begin 15-col 3-row - regular + menuTitle center textActive diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 9198b24..c815bb1 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -22,11 +22,11 @@ 9203 9000 horizontal - + 0 0 - 4-col-gutter + 4-col 2-row menuTitle center @@ -35,11 +35,11 @@ - + 0 0 - 4-col-gutter + 4-col 2-row menuTitle center @@ -73,7 +73,7 @@ 9000 9000 horizontal - activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid]) + activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid]/) 0 diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml index 4cfc462..d7f9786 100644 --- a/1080i/custom_musicOverlay.xml +++ b/1080i/custom_musicOverlay.xml @@ -66,7 +66,7 @@ center 1-row - true + false textActive diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 72fce59..a75d964 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -50,15 +50,6 @@ - - 0 - 0 - 5-row - 182 - stretch - DefaultAlbumCover.png - textboxInactive - 0 0 @@ -85,7 +76,7 @@ 0 542 2-row - regularStrong + dialogTitle textActive true diff --git a/changelog.txt b/changelog.txt index 77b70ca..d4a0028 100644 --- a/changelog.txt +++ b/changelog.txt @@ -24,6 +24,7 @@ [complete up to DialogPVRGroupManager.xml section] - new window: MyGames.xml +- new menu needs building for games section - new dialog: GameOSD.xml diff --git a/language/English/strings.po b/language/English/strings.po index 87e767b..bfaa6f3 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -952,3 +952,7 @@ msgstr "" msgctxt "#31231" msgid "Game related options" msgstr "" + +msgctxt "#31232" +msgid "Games" +msgstr "" diff --git a/media/DefaultAlbumCover.png b/media/DefaultAlbumCover.png deleted file mode 100644 index 834c936..0000000 Binary files a/media/DefaultAlbumCover.png and /dev/null differ