From 8d5d1ef4fb23b482f40f61ad60a2bdca71650307 Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Sun, 21 Jan 2018 23:45:57 +0000 Subject: [PATCH] various --- 1080i/DialogMusicInfo.xml | 24 ++++------ 1080i/DialogPVRInfo.xml | 2 +- 1080i/DialogVideoInfo.xml | 26 +++++------ 1080i/Includes_animations.xml | 2 +- 1080i/Includes_hubMenu.xml | 18 ++++---- 1080i/MyGames.xml | 46 +++++++++++++++++++ 1080i/MyPVRGuide.xml | 2 +- 1080i/MyPVRRecordings.xml | 16 ++----- 1080i/VideoOSD.xml | 4 +- 1080i/View_AddonPosters.xml | 10 ++-- 1080i/View_Albums.xml | 23 ++++------ 1080i/View_ArtistAlbums.xml | 63 ++++++++++++++++---------- 1080i/View_Episodes.xml | 14 +++--- 1080i/View_Movies.xml | 17 ++++--- 1080i/View_Seasons.xml | 30 ++++-------- 1080i/View_Songs.xml | 10 ++-- 1080i/View_TVShows.xml | 14 +++--- 1080i/custom_musicPlayerFullscreen.xml | 2 - 18 files changed, 175 insertions(+), 148 deletions(-) diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml index 8855154..4e478a2 100644 --- a/1080i/DialogMusicInfo.xml +++ b/1080i/DialogMusicInfo.xml @@ -103,8 +103,8 @@ left 115 center - largeLight - textActive + largeStrong + highlight true @@ -161,31 +161,27 @@ $INFO[ListItem.Property(Artist_Formed)] - $INFO[ListItem.Property(Artist_Genre)] - $INFO[ListItem.Property(Artist_YearsActive)] - $INFO[ListItem.Property(Artist_Style)] - - 0 + 12 row-25-begin 10-col 4-row @@ -239,7 +235,7 @@ 1-col 0 - 4-col + 3-col 2-row stretch colors/white.png @@ -350,8 +346,8 @@ left 3-row center - largeLight - textActive + largeStrong + highlight true @@ -409,32 +405,28 @@ $INFO[ListItem.Year] - $INFO[ListItem.Property(Album_Label)] - $INFO[ListItem.Genre] - $INFO[ListItem.Property(Album_Style)] - - 0 + 12 row-25-begin 10-col 6-row @@ -488,7 +480,7 @@ 1-col 0 - 4-col + 3-col 2-row stretch colors/white.png diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml index 427b6f7..217ce96 100644 --- a/1080i/DialogPVRInfo.xml +++ b/1080i/DialogPVRInfo.xml @@ -27,7 +27,7 @@ 3-row left center - largeLight + largeStrong textActive diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index aab7374..621733b 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -149,25 +149,21 @@ $INFO[ListItem.year] - $INFO[ListItem.genre] - $INFO[ListItem.director] - $INFO[ListItem.duration,, $LOCALIZE[31018]] - @@ -182,8 +178,8 @@ left 115 center - largeLight - textActive + largeStrong + highlight true @@ -210,7 +206,7 @@ - 0 + 12 23-row 10-col 6-row @@ -266,7 +262,7 @@ 1-col 0 - 4-col + 3-col 2-row stretch colors/white.png @@ -355,9 +351,9 @@ 12-col 486 scale - $INFO[Listitem.thumb] - colors/white.png - 3 + $INFO[Listitem.thumb] + colors/white.png + 6 @@ -373,8 +369,8 @@ 2-row left center - largeLight - textActive + largeStrong + highlight true @@ -385,7 +381,7 @@ 12-col horizontal - 1-col-gutter + 36 2-row center symbolLarge @@ -398,7 +394,7 @@ center regularStrong textActive - + diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 65a03d7..b179b48 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -67,7 +67,7 @@ - + diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index ae27a3f..b3757c5 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -5,7 +5,7 @@ dimensionsFullscreen colors/black.png - ccFFFFFF + d5FFFFFF stretch @@ -32,14 +32,14 @@ 0 col-5-begin fullscreenHeight - colors/white.png - highlight + colors/black.png + textboxOverlay stretch col-1-begin - row-1-begin + row-5-begin 73 73 symbolVeryLarge @@ -49,7 +49,7 @@ 0 - row-4-begin + row-8-begin col-5-begin 832 vertical @@ -62,7 +62,7 @@ 0 4-col-gutter 2-row - menuTitle + itemTitle center textActive @@ -76,7 +76,7 @@ col-5-begin 2-row colors/white.png - textActive + highlight stretch @@ -84,9 +84,9 @@ 0 4-col-gutter 2-row - menuTitle + itemTitle center - highlight + textActive diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml index e69de29..4a26dc4 100644 --- a/1080i/MyGames.xml +++ b/1080i/MyGames.xml @@ -0,0 +1,46 @@ + + + 9999 + fadeInOut + 50 + + globalBackground + + + + modalDialogContentShift + + + contentOpen + 9000 + videofiles + + + + Control.IsVisible(60) + conditional + + 52r + row-6-begin + 20-row + 9999 + 9999 + + + + + pageHeader + + + + hubMenu + + miniVideoPlayer + + DebugGrid + + WindowID + + + + diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 12a2a84..5a6709c 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -22,7 +22,7 @@ col-1-begin row-5-begin 24-col - 22-row + 23-row 30 UIControls/PVR-EpgProgressIndicator.png 6 diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index a7b321b..6faee1d 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -147,24 +147,14 @@ - 6-col + 0 22-row - - Disk usage bar - 0 - 1 - 12-col - 1-row - colors/black.png - colors/white.png - PVR.backenddiskspaceprogr!Integer.IsGreater(PVR.backenddiskspaceprogr,100) - 0 2 12-col - itemSubTitle - center + 2-row + itemTitle textActive textActive diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 0ebc19e..d80cb8a 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -74,8 +74,8 @@ left 3-row center - largeLight - textActive + largeStrong + highlight true diff --git a/1080i/View_AddonPosters.xml b/1080i/View_AddonPosters.xml index 2fa6f28..c89e9a4 100644 --- a/1080i/View_AddonPosters.xml +++ b/1080i/View_AddonPosters.xml @@ -21,8 +21,8 @@ 228 342 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -34,7 +34,7 @@ stretch $INFO[ListItem.Art(poster)] 6 - ffffffff + 77ffffff String.IsEmpty(listitem.title) @@ -79,8 +79,8 @@ 228 342 stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index a81303e..98fe03c 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -55,17 +55,14 @@ 31180 - 31187 - 31181 - @@ -89,8 +86,8 @@ 5-col-gutter 5-col-gutter stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -102,7 +99,7 @@ stretch $INFO[ListItem.Art(thumb)] 6 - ffffffff + 77ffffff !controlgroup(9000).hasfocus @@ -125,8 +122,8 @@ 5-col-gutter 5-col-gutter stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 @@ -192,8 +189,8 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -205,7 +202,7 @@ stretch $INFO[ListItem.Art(thumb)] 6 - ffFFFFFF + 77ffffff String.IsEmpty(listitem.title) @@ -239,8 +236,8 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml index ea49e33..a40ee8a 100644 --- a/1080i/View_ArtistAlbums.xml +++ b/1080i/View_ArtistAlbums.xml @@ -10,7 +10,7 @@ stretch $INFO[container.Art(artist.fanart)] 0 - 44ffffff + 66ffffff dimensionsFullscreen @@ -18,36 +18,53 @@ ffffffff stretch + + + row-17-begin + 0 + globalBackground + + 0 + 0 + fullscreenWidth + 6 + stretch + colors/white.png + highlight + + - - - col-1-begin - row-6-begin + + + col-1-begin + row-8-begin - 0 - -12 - 16-col - 3-row - veryLargeLight - 66ffffff - true - - - - + 0 + 0 + 10-col + 4-row + veryLarge + 44ffffff + center + + true + + + $EXP[isMusicArtistCatalogue] col-1-begin - row-11-begin + row-19-begin 24-col 19-row 9000 50 50 60 + horizontal 600 @@ -56,8 +73,8 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -69,7 +86,7 @@ stretch $INFO[ListItem.Art(thumb)] 6 - ffFFFFFF + 77FFFFFF String.IsEmpty(listitem.title) @@ -114,8 +131,8 @@ 4-col-gutter 4-col-gutter stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 @@ -165,4 +182,4 @@ - + \ No newline at end of file diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index c64accc..349af05 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -77,7 +77,7 @@ col-13-begin - row-5-begin + row-6-begin String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin) 24 @@ -87,21 +87,21 @@ medium textActive - + - + $EXP[isEpisode] - 954 - row-8-begin + 978 + row-10-begin 12-col 19-row 9000 - 60 - 60 + + 4 0 diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index 9e4e661..9ca0e7c 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -81,8 +81,8 @@ 566 318 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -94,7 +94,7 @@ stretch $INFO[ListItem.Art(fanart)] 6 - ffffffff + 77ffffff !controlgroup(9000).hasfocus @@ -128,8 +128,8 @@ 566 318 stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 @@ -206,8 +206,8 @@ 228 342 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -218,8 +218,7 @@ 342 stretch $INFO[ListItem.Art(poster)] - 6 - ffffffff + 77ffffff String.IsEmpty(listitem.title) diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 9d86276..eb2bf53 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -23,28 +23,18 @@ !String.Contains(Container.folderpath,plugin) col-1-begin - row-4-begin + row-7-begin 0 0 - 24-col - 3-row - veryLargeLight - ffffffff + 10-col + 4-row + veryLarge + 44ffffff center true - - - 0 - 4-row - 12-col - 198 - textbox - ffffffff - - @@ -80,8 +70,8 @@ 4-col-gutter 396 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -93,7 +83,7 @@ stretch $INFO[ListItem.art(poster)] 6 - ffffffff + 77ffffff ListItem.IsParentFolder @@ -152,8 +142,8 @@ 4-col-gutter 396 stretch - colors/black.png - colors/white.png + colors/black.png + colors/white.png 6 FF000000 diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 374669f..4a6b040 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -19,8 +19,8 @@ 8-col 8-col stretch - $VAR[songViewThumb] - colors/white.png + $VAR[songViewThumb] + colors/black.png 6 500 @@ -33,16 +33,18 @@ 15-col 2-row largeStrong + center textActive col-10-begin - row-7-begin + row-6-begin 15-col - 1-row + 3-row regular + center textActive diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 9800cff..f57fd63 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -83,8 +83,8 @@ 566 318 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -96,7 +96,7 @@ stretch $INFO[ListItem.Art(fanart)] 6 - ffffffff + 77ffffff !controlgroup(9000).hasfocus @@ -131,7 +131,7 @@ 318 stretch colors/black.png - colors/white.png + colors/white.png 6 FF000000 @@ -209,8 +209,8 @@ 228 342 stretch - colors/black.png - colors/black.png + colors/black.png + colors/black.png 6 overlay @@ -222,7 +222,7 @@ stretch $INFO[ListItem.Art(poster)] 6 - ffffffff + 77ffffff String.IsEmpty(listitem.title) diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index be82b02..72fce59 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -67,8 +67,6 @@ stretch $INFO[player.art(thumb)] ffffffff - colors/white.png - 6