From ab9a1ab3ddfad64a9ead4f2f864fb9762a790668 Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Sun, 19 Apr 2015 21:55:23 +0100 Subject: [PATCH] various --- 1080i/AddonBrowser.xml | 201 +++++++---- 1080i/Defaults.xml | 11 +- 1080i/DialogAddonInfo.xml | 5 +- 1080i/DialogAddonSettings.xml | 131 +++++--- 1080i/DialogAlbumInfo.xml | 310 +++++++++-------- 1080i/DialogSeekBar.xml | 107 ++---- 1080i/DialogVideoInfo.xml | 1 - 1080i/DialogYesNo.xml | 4 +- 1080i/Home.xml | 17 +- 1080i/Includes_hubMenu.xml | 28 ++ 1080i/MyMusicNav.xml | 2 +- 1080i/MyPVRChannels.xml | 6 + 1080i/MyPVRGuide.xml | 77 ++--- 1080i/MyPVRRecordings.xml | 428 ++++++++++++------------ 1080i/MyVideoNav.xml | 6 +- 1080i/VideoOSD.xml | 14 +- 1080i/VideoOSDSettings.xml | 66 ++-- 1080i/View_Albums.xml | 35 +- 1080i/View_Artists.xml | 35 +- 1080i/View_Episodes.xml | 38 ++- 1080i/View_LiveTVChannels.xml | 4 +- 1080i/View_Movies.xml | 1 + 1080i/View_MusicRecentItems.xml | 2 +- 1080i/View_Seasons.xml | 87 +++-- 1080i/View_Songs.xml | 14 +- 1080i/View_TVShows.xml | 2 +- 1080i/View_VideoRecentItems.xml | 2 +- 1080i/custom_menuItemTypeSelector.xml | 15 +- 1080i/custom_musicPlayerFullscreen.xml | 99 +++--- 1080i/custom_recentItemTypeSelector.xml | 15 +- media/UIControls/radio-button-fo.png | Bin 1165 -> 3035 bytes media/UIControls/radio-button-nf.png | Bin 3027 -> 2973 bytes media/kodilogo.png | Bin 0 -> 10035 bytes 33 files changed, 977 insertions(+), 786 deletions(-) create mode 100644 media/kodilogo.png diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml index a6b2338..ec95204 100644 --- a/1080i/AddonBrowser.xml +++ b/1080i/AddonBrowser.xml @@ -7,14 +7,14 @@ globalBackground - col-1-begin + col-2-begin row-3-begin modalDialogInOutVertical 0 0 - 24-col + 22-col 2-row colors/white.png highlight @@ -27,7 +27,7 @@ 20-col 2-row dialogTitle - + textActive - @@ -35,7 +35,7 @@ 0 2-row - 24-col + 22-col 21-row colors/black.png overlay @@ -56,7 +56,7 @@ 6-col - - 9999 + 9999 6-col @@ -78,94 +78,151 @@ 0 0 - 18-col + 16-col 21-row colors/black.png overlay stretch - 0 - 0 - 12-col - 21-row + 12 + 12 + 18-col + 734 9000 60 50 50 60 - + 0 0 - 2-row - 2-row - scale - $INFO[Listitem.icon] + 4-col-gutter + 4-col-gutter + stretch + colors/black.png + colors/white.png + 3 + textboxInactive - 1-col-indent - 0 - 11-col-gutter + 12 + 2-row + 240 2-row + center + center + regularStrong + disabled + + + + 12 + 3-row + 240 + 2-row + center center buttonTitle textActive - - - + - - 9-col + + 0 0 - 3-col-gutter - 2-row - center - - buttonTitle - textActive - selected - - + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] + colors/white.png + 3 + ffFFFFFF - - - 1-col - 0 - 11-col - 2-row - stretch - colors/white.png - 0 - - - 0 - 0 - 2-row - 2-row - scale - $INFO[Listitem.icon] - spinFocusIcon - - - 1-col-indent - 0 - 11-col-gutter - 2-row - center - buttonTitle - black - - - - 9-col - 0 - 3-col-gutter - 2-row - center - - buttonTitle - black - selected + + + spinFocusPoster + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] + colors/white.png + 3 + ffFFFFFF + + + 3 + 3 + 258 + 258 + stretch + colors/black.png + ccFFFFFF + + + 12 + 2-row + 240 + 2-row + center + center + regularStrong + textActive + + + + 12 + 3-row + 240 + 2-row + center + center + buttonTitle + highlight + + + + 42 + 5-row + 4-col-gutter + horizontal + + 24 + 2-row + center + symbol + textActive + + + + 1-col + 2-row + center + smallStrong + textActive + + + + 24 + 2-row + center + symbol + textActive + + + + 1-col + 2-row + center + smallStrong + textActive + + + @@ -175,9 +232,9 @@ Control.IsVisible(60) conditional - col-24-begin - 126 - 11-row + 2-col + 78 + 750 9999 diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml index 7de8660..8cb543f 100644 --- a/1080i/Defaults.xml +++ b/1080i/Defaults.xml @@ -94,8 +94,8 @@ textActive black textDisabled - 64 - 64 + 88 + 58 0 0 colors/white.png @@ -157,13 +157,14 @@ 0 - 2-row + center buttonTitle 24 0 textActive black textDisabled - colors/offblack.png + - colors/white.png 0 0 @@ -182,8 +183,8 @@ 12 colors/inactive.png - colors/black.png - colors/white.png + colors/black.png + colors/white.png false vertical diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml index 1ebe335..ed89856 100644 --- a/1080i/DialogAddonInfo.xml +++ b/1080i/DialogAddonInfo.xml @@ -93,7 +93,8 @@ 12 2-row 10-col-gutter - smallStrong + itemSubTitle + highlight @@ -115,7 +116,7 @@ 0 0 6-col - 8-row + 10-row 3 vertical diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml index 1ec3dc8..3a0dfcd 100644 --- a/1080i/DialogAddonSettings.xml +++ b/1080i/DialogAddonSettings.xml @@ -3,24 +3,10 @@ 9 yes - - - dimensionsFullscreen - colors/black.png - FFFFFFFF - stretch - globalBackground - - dimensionsFullscreen - colors/black.png - stretch - 99ffffff - - col-3-begin + col-2-begin row-2-begin modalDialogInOutVertical @@ -28,42 +14,84 @@ 0 0 - 20-col + 22-col 2-row colors/white.png highlight stretch - - + + 0 + 2-row + 22-col + 10-row + scale + $INFO[ListItem.art(fanart)] + + + 0 + 2-row + 22-col + 10-row + scale + vignette.png + + + 12 + 3-row + 4-col-gutter + 4-col-gutter + stretch + $INFO[ListItem.art(thumb)] + colors/white.png + 3 + + + 0 + 12-row + 22-col + 13-row + colors/black.png + overlay + stretch + 24 0 - 16-col + 23-col 2-row center dialogTitle - + textActive 0 - 2-row + 12-row 4-col - 11-row + 12-row 9000 2 vertical + + 4-col + 12-row + 14-col + 13-row + colors/black.png + overlay + stretch + 4-col - 2-row - 12-col - 11-row + 12-row + 14-col + 13-row 9 9001 vertical @@ -71,55 +99,73 @@ - 16-col - 2-row + 18-col + 12-row 4-col 6-row vertical 2 - 24 + 0 0 1-col + 2-row + center + center symbol textActive - - - 1-col + 1-col-indent -1 - 6-col - menuTitle + 3-col-gutter + 2-row + center + buttonTitle textActive - - 0 - 2 - 6-col - 53 + 0 + 1-col-textbox + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 3-col-textbox + 2-row stretch colors/white.png - 24 + 0 0 1-col + 2-row + center + center symbol - black + textActive - - 1-col + 1-col-indent -1 - 6-col - menuTitle + 5-col-gutter + 2-row + center + buttonTitle black - @@ -163,6 +209,9 @@ + 24 + itemTitle + highlight Default Separator diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml index e182ce0..309ee9a 100644 --- a/1080i/DialogAlbumInfo.xml +++ b/1080i/DialogAlbumInfo.xml @@ -8,14 +8,7 @@ 0 0 - - 0 - 0 - dimensionsFullscreen - colors/black.png - ffffffff - stretch - + globalBackground !container.content(albums) @@ -51,54 +44,54 @@ container.content(artists) - 1359 - row-2-begin + col-15-begin + 0 - - -12 - -95 - 573 - 817 + 0 + 0 + 10-col + fullscreenHeight colors/black.png - ccffffff + cc111111 stretch - -12 - -95 - 573 - 198 + 0 + 0 + 10-col + row-5-begin colors/white.png - ffffffff + highlight stretch - -12 - 838 - 573 - 198 - colors/black.png - ccffffff + 0 + row-5-begin + 10-col + 1-row + colors/white.png stretch - 0 - 0 - 8-col-gutter + 12 + row-1-begin + 10-col-gutter left + 3-row + center pageTitle - black - - - + textActive + + true - 0 - 42 + 12 + row-5-begin 8-col-gutter left itemSubTitle @@ -108,77 +101,104 @@ - 0 - 132 - textboxExtraLeading - 8-col-gutter + 12 + row-7-begin + textbox + 10-col-gutter left textActive - 528 - - - - + 17-row + + - -12 - row-13-begin - 8-col - 6-row - 3 + 0 + row-25-begin + 10-col + 4-row vertical - + 0 - 2 - 285 - 55 + 0 + 1-col-textbox + 2-row stretch colors/black.png - cc000000 + textboxInactive - 24 + 0 0 1-col + 2-row + center + center symbol textActive - + + 1-col + 0 + 4-col + 2-row + stretch + colors/black.png + textboxInactive + - 64 - 2 - 184 - menuTitle + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle textActive - - + 0 - 2 - 285 - 55 + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 4-col + 2-row stretch colors/white.png - 24 + 0 0 1-col + 2-row + center + center symbol black - - 64 - 2 - 184 - menuTitle + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle black - @@ -203,152 +223,172 @@ - SendClick(12) - - container.content(albums) + !container.content(artists) - 1359 - row-2-begin + col-16-begin + 0 - - -12 - -95 - 573 - 817 + 0 + 0 + 10-col + fullscreenHeight colors/black.png - ccffffff + cc111111 stretch - -12 - -95 - 573 - 198 + 0 + 0 + 10-col + row-5-begin colors/white.png - ffffffff + highlight stretch - -12 - 838 - 573 - 198 - colors/black.png - ccffffff + 0 + row-5-begin + 10-col + 1-row + colors/white.png stretch - 0 - 0 + 12 + row-1-begin 0 0 - 8-col-gutter + 10-col-gutter left + 3-row + center pageTitle - black - - - - - - + textActive + + true + 0 - 42 - 8-col-gutter + 4-row + 10-col-gutter left itemSubTitle black - + - 0 - 132 - textboxExtraLeading - 8-col-gutter + 6-row + textbox + 10-col-gutter left textActive - 528 - + 15-row + - - -12 - row-13-begin - 8-col + 0 + row-24-begin + 10-col 6-row - 3 vertical - + 0 - 2 - 285 - 55 + 0 + 1-col-textbox + 2-row stretch colors/black.png - cc000000 + textboxInactive - 24 + 0 0 1-col + 2-row + center + center symbol textActive - + + 1-col + 0 + 4-col + 2-row + stretch + colors/black.png + textboxInactive + - 64 - 2 - 184 - menuTitle + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle textActive - - + 0 - 2 - 285 - 55 + 0 + 1-col + 2-row + stretch + colors/white.png + highlight + spinFocusIcon + + + 1-col + 0 + 4-col + 2-row stretch colors/white.png - 24 + 0 0 1-col + 2-row + center + center symbol black - - 64 - 2 - 184 - menuTitle + 1-col-indent + 0 + 4-col-gutter + 2-row + center + buttonTitle black - @@ -373,12 +413,6 @@ - SendClick(12) - - diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index 51fa830..80898ac 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -4,114 +4,75 @@ yes !Window.IsActive(5901) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] + + dimensionsFullscreen + vignette.png + ffffffff + stretch + - 0 - row-13-begin - - - - - - - - + col-9-begin + row-24-begin - 0 - -16 - fullscreenWidth + -36 + -36 + 9-col 6-row + colors/white.png stretch - colors/black.png - 99FFFFFF + highlight Player.Playing | player.seeking - col-3-begin + 0 0 16-col-gutter - smallStrong + pageTitle highlight Player.Paused + !Player.Caching - col-3-begin + 0 0 - 16-col-gutter - smallStrong - highlight + 8-col-gutter + pageTitle + textActive buffering - col-3-begin + 0 0 - 16-col-gutter - smallStrong + 8-col-gutter + pageTitle highlight [Player.Paused + Player.Caching] + !Player.Seeking - - System.HasMediaDVD - 21-col - 0 - 4-col-gutter - smallStrong - right - textActive - - - - - - !Player.Caching - 5-col - 0 - 12-col - smallMedium - textActive - - - - - - col-3-begin - 1-row - 18-col - 2-row - center - largeTitle - textActive - - Progress Bar - col-3-begin - 114 - 18-col + 0 + 2-row + 8-col + 1-row + colors/offblack.png + colors/white.png Player.Progress - col-3-begin - 4-row - 24-col + 0 + 3-row + 8-col smallStrong textActive - - 350 - 4-row - 24-col - smallStrong - textActive - - - - - - col-3-begin - 4-row - 24-col + 8-col + 3-row + 8-col smallStrong right textActive diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index da91352..925f227 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -153,7 +153,6 @@ textActive true - - 0 diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml index 7874cdb..6e30f7a 100644 --- a/1080i/DialogYesNo.xml +++ b/1080i/DialogYesNo.xml @@ -35,13 +35,13 @@ 0 - 68 + 44 8-col 2-row textbox textActive - + diff --git a/1080i/Home.xml b/1080i/Home.xml index 16bde75..5e5085a 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -8,21 +8,6 @@ WindowOpen globalBackground - - - false - dimensionsFullscreen - scale - $INFO[skin.string(homeBackground)] - 0 - ffffffff - - - dimensionsFullscreen - backgrounds/vignette.png - ffffffff - stretch - 24 @@ -177,7 +162,7 @@ - col-17-begin + 18-col row-21-begin 8-col diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml index 26ab70d..1bbc746 100644 --- a/1080i/Includes_hubMenu.xml +++ b/1080i/Includes_hubMenu.xml @@ -20,6 +20,20 @@ highlight stretch + + + col-1-begin + row-1-begin + 1-col + 1-col + kodilogo.png + textActive + stretch + + + + + 0 row-4-begin @@ -87,6 +101,20 @@ highlight stretch + + + col-1-begin + row-1-begin + 1-col + 1-col + kodilogo.png + textActive + stretch + + + + + 0 diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml index 6e90967..d9fcaaa 100644 --- a/1080i/MyMusicNav.xml +++ b/1080i/MyMusicNav.xml @@ -43,7 +43,7 @@ - Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false) + Control.IsVisible(60) + SubString(skin.string(showRecentMusicItems),false) conditional 84r diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 8fa8254..67526a0 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -18,6 +18,12 @@ modalDialogContentShift + + + + + + liveTVChannels diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index 4f69e1b..cedda0a 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -18,97 +18,98 @@ modalDialogContentShift + + + + + + EPG Grid col-1-begin row-4-begin - 1758 - 23-row + 24-col + 24-row 10 30 6 8000 - + SubString(ListItem.Label,:) 0 - 20 - 60 - 30 - itemSubTitle - textActive - selected - - + 12 + 216 + 2-row + itemTitle + 66FFFFFF - - - 284 - 2-row - colors/black.png - textboxInactive - + 0 - 0 - 2-row - 2-row + 3 + 66 + 66 scale $INFO[Listitem.thumb] 1-col-indent - 3-col + 3-col-gutter 2-row - itemSubTitle + itemTitle textActive selected - - + 1-col - 284 + 216 2-row colors/white.png highlight 0 - 0 - 2-row - 2-row + 3 + 66 + 66 scale $INFO[Listitem.thumb] - spinFocusIcon + + + + 1-col-indent - 3-col + 3-col-gutter 2-row - itemSubTitle + itemTitle textActive selected - - + - 139 - 2-row + 213 + 69 stretch colors/black.png - textboxInactive + overlay - 120 + 204 2-row itemTitle 12 @@ -118,15 +119,15 @@ - + - 139 + 213 2-row colors/white.png highlight - 120 + 204 2-row itemTitle 12 diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index c996e11..f3da45b 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -6,249 +6,231 @@ Skin.SetString(showRecentVideoItems,true) globalBackground + + + modalDialogContentShift - - - 0 - 0 - - - col-1-begin - row-2-begin - dateTime - hubMenu + + + + + + + + + + col-1-begin + row-5-begin + + 0 + 0 + 16-col + 22-row + 9000 + 60 + 60 + + + 1-col + 0 + 15-col + 69 + stretch + colors/black.png + overlay + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + !isempty(ListItem.playcount) + !ListItem.IsResumable + 16 + 2 + 66 + 66 + symbolLarge + textActive + - + + + + 1-col-indent + 0 + 9-col-gutter + 2-row + center + itemTitle + textActive + - + + + + 10-col + 0 + 4-col-gutter + 2-row + center + itemTitle + textActive + - + + + + 14-col + 0 + 2-col + 2-row + center + itemTitle + textActive + - + + + + + + 1-col + 0 + 16-col + 2-row + stretch + colors/white.png + highlight + + + + + + + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + !isempty(ListItem.playcount) + !ListItem.IsResumable + 16 + 2 + 66 + 66 + symbolLarge + textActive + - + + + + + 1-col-indent + 0 + 9-col-gutter + 2-row + center + itemTitle + textActive + textActive + - + + + + 10-col + 0 + 4-col-gutter + 2-row + center + itemTitle + textActive + textActive + - + + + + 14-col + 0 + 2-col + 2-row + center + itemTitle + textActive + textActive + - + + + - + - col-4-begin - row-2-begin - + 0 + 22-row 0 0 - 14-col - pageTitle - + 12-col-gutter + itemTitle textActive - - - 0 - 45 - 14-col - regular - - textActive - - - - - col-4-begin - 270 - - - listSlideIn - - - -12 - -12 - 20-col - 11-row - 9000 - 60 - 60 - - - 0 - 2 - 20-col - 53 - stretch - UIControls/listitemNF.png - 0 - 99FFFFFF - - - 4 - 4 - 48 - 48 - scale - colors/offblack.png - - - !isempty(ListItem.playcount) + !ListItem.IsResumable - 11 - -2 - 38 - symbolLarge - textActive - - - - - - 1-col - 0 - 10-col-gutter - itemTitle - textActive - - - - - - 13-col - 0 - 4-col-gutter - itemTitle - textActive - - - - - - !isempty(listitem.duration) - 17-col - 0 - 30 - symbol - textActive - - - - - - 1260 - 0 - 2-col - itemTitle - textActive - - - - - - - - 0 - 2 - 20-col - 53 - stretch - UIControls/listitemFO.png - 0 - FFFFFFFF - - - 4 - 4 - 48 - 48 - scale - colors/offblack.png - - - !isempty(ListItem.playcount) + !ListItem.IsResumable - 11 - -2 - 38 - symbolLarge - textActive - - - - - - 1-col - 0 - 10-col-gutter - itemTitle - black - black - - - - - - 13-col - 0 - 4-col-gutter - itemTitle - black - black - - - - - - !isempty(listitem.duration) - 17-col - 0 - 30 - symbol - black - black - - - - - - 1260 - 0 - 2-col - itemTitle - black - black - - - - - - - - - 0 - 672 - - 0 - 0 - 12-col-gutter - itemTitle - textActive - selected - - - - - - - - - Control.IsVisible(60) - conditional - - 108r - 276 - 672 - 9999 + selected + - + - - - - + + + + Control.IsVisible(60) + conditional + + 108r + 276 + 672 + 9999 + + + + - 24 - 111 - - - - - - - - - - sideBarMenuItems + col-1-begin + row-1-begin + + + 0 + 0 + 14-col + pageTitle + + textActive + + + 0 + 45 + 14-col + regular + + textActive + + + + dateTime + + + hubMenu + DebugGrid diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 9f6a612..32048c8 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -29,7 +29,7 @@ - SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems) + [SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems)] movies tvshows seasons @@ -45,8 +45,8 @@ conditional 84r - 276 - 672 + row-5-begin + 789 9999 diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 9105168..220ec18 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -10,6 +10,12 @@ + + dimensionsFullscreen + vignette.png + ffffffff + stretch + 0 @@ -62,7 +68,7 @@ - col-9-begin + col-5-begin 0 24-col 2-row @@ -80,7 +86,7 @@ 1-col 0 - 3-col + 3-col-textbox 2-row stretch colors/black.png @@ -111,7 +117,7 @@ 0 0 - 1-col + 1-col-textbox 2-row stretch colors/white.png @@ -121,7 +127,7 @@ 1-col 0 - 3-col + 3-col-textbox 2-row stretch colors/white.png diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml index 4d713bb..504c7b6 100644 --- a/1080i/VideoOSDSettings.xml +++ b/1080i/VideoOSDSettings.xml @@ -21,74 +21,64 @@ modalDialogInOutVertical - -528 - 44 - fullscreenWidth - 1-row + 0 + 0 + 12-col + 2-row colors/white.png - ffffffff - stretch - - - -3 - 44 - 3 - 1-row - colors/black.png - ffffffff + highlight stretch Window.IsVisible(123) - 12 - 44 - 12-col + 24 + 0 + 16-col + 2-row + center dialogTitle - black - - + textActive Window.IsVisible(124) - 12 - 44 - 12-col + 24 + 0 + 16-col + 2-row + center dialogTitle - black - - + textActive + + 0 + 2-row + 12-col + 21-row + colors/black.png + overlay + stretch + Control Area 0 - 120 + 2-row 12-col - 644 + 21-row vertical Default Button - left - itemTitle - 54 - itemTitle - textActive - black - colors/white.png - 12 Default RadioButton - left Default spincontrolex - left Default Slider - left - 54 diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml index 020afc8..480561b 100644 --- a/1080i/View_Albums.xml +++ b/1080i/View_Albums.xml @@ -38,7 +38,40 @@ 4-col-gutter 4-col-gutter stretch - $INFO[Listitem.thumb] + colors/black.png + colors/white.png + 3 + textboxInactive + + + 12 + 2-row + 240 + 2-row + center + center + regularStrong + disabled + + + + 12 + 3-row + 240 + 2-row + center + center + buttonTitle + disabled + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] colors/white.png 3 ffFFFFFF diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml index f7fcb1c..59288bd 100644 --- a/1080i/View_Artists.xml +++ b/1080i/View_Artists.xml @@ -14,23 +14,13 @@ 53 60 - - false - 1-col - 0 - 7-col-gutter - 2-row - stretch - colors/black.png - 77ffffff - 0 - 0 - 2-row - 2-row - scale - $INFO[Listitem.thumb] + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] 1-col-indent @@ -56,12 +46,15 @@ 0 - 0 - 2-row - 2-row - scale - $INFO[Listitem.thumb] - spinFocusIcon + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + 1-col-indent diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index 282fab0..be8fd68 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -6,17 +6,34 @@ container.content(episodes) + !Substring(Container.folderpath,plugin) 0 - -960 + -966 dimensionsFullscreen stretch - $INFO[Listitem.art(fanart)] - colors/white.png - 0,0,6,0 + $INFO[Listitem.art(fanart)] ffffffff + + + + + + + + container.content(episodes) + !Substring(Container.folderpath,plugin) + 949 + 0 + 972 + fullscreenHeight + stretch + colors/white.png + colors/white.png + 6,0,0,0 + background + + col-13-begin @@ -51,7 +68,7 @@ 0 0 1-col-textbox - 2-row + 69 stretch colors/black.png 0 @@ -61,7 +78,7 @@ 0 0 1-col-textbox - 2-row + 69 center center itemTitle @@ -74,7 +91,7 @@ 1-col 0 11-col - 2-row + 69 stretch colors/black.png 0 @@ -178,8 +195,8 @@ 22-row 9000 60 - 50 - 50 + 52 + 52 60 @@ -194,7 +211,7 @@ 1-col 0 23-col - 2-row + 69 stretch colors/black.png textboxInactive @@ -246,7 +263,6 @@ - \ No newline at end of file diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml index 99eba18..dc773da 100644 --- a/1080i/View_LiveTVChannels.xml +++ b/1080i/View_LiveTVChannels.xml @@ -15,10 +15,10 @@ 1-col 0 23-col - 2-row + 69 stretch colors/black.png - textboxInactive + overlay 0 diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml index b5661ed..9278d4b 100644 --- a/1080i/View_Movies.xml +++ b/1080i/View_Movies.xml @@ -19,6 +19,7 @@ ffffffff stretch + kenBurnsey diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml index aab3c82..2879627 100644 --- a/1080i/View_MusicRecentItems.xml +++ b/1080i/View_MusicRecentItems.xml @@ -127,7 +127,7 @@ - + col-1-begin diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 0f3b3e7..9414e00 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -3,6 +3,62 @@ container.content(seasons) + !container.content(episodes) + + + + !Substring(Container.folderpath,plugin) + -100 + + dimensionsFullscreen + stretch + $INFO[Listitem.art(fanart)] + ffffffff + + + + + + + + + + + !Substring(Container.folderpath,plugin) + col-1-begin + row-2-begin + + 0 + 11-row + 24-col + 2-row + largeStrong + textActive + + + + + + + !Substring(Container.folderpath,plugin) + 0 + row-15-begin + fullscreenWidth + 15-row + stretch + colors/white.png + background + + + !Substring(Container.folderpath,plugin) + 0 + row-15-begin + fullscreenWidth + 6 + stretch + colors/white.png + highlight + + !StringCompare(container.foldername,files) + !container.content(episodes) + !Substring(Container.folderpath,plugin) + !container.content(addons) @@ -115,37 +171,6 @@ - - - - - - - 0 - - dimensionsFullscreen - stretch - $INFO[Listitem.art(fanart)] - colors/white.png - 0,0,0,6 - ffffffff - - - - - - col-1-begin - row-2-begin - - 0 - 11-row - 24-col - 2-row - largeStrong - textActive - - - \ No newline at end of file diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index 5715e0e..3fb2caa 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -39,6 +39,7 @@ colors/white.png 3 500 + windowopen @@ -67,14 +68,7 @@ - - - - - - - - + container.content(songs) col-10-begin row-9-begin 15-col @@ -103,7 +97,7 @@ 0 0 1-col-textbox - 2-row + 69 stretch colors/black.png 0 @@ -125,7 +119,7 @@ 1-col 0 14-col - 2-row + 69 stretch colors/black.png 0 diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml index 1a22631..f4a6c54 100644 --- a/1080i/View_TVShows.xml +++ b/1080i/View_TVShows.xml @@ -20,9 +20,9 @@ ffffffff stretch + kenBurnsey - !StringCompare(container.foldername,files) + !container.content(movies) + !container.content(episodes) + !container.content(seasons) + !Substring(Container.folderpath,plugin) + !container.content(addons) col-1-begin diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 71e6f1f..7260028 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -149,7 +149,7 @@ - + SubString(skin.string(videoHomeItemsEpisodesSource),recentepisodes) diff --git a/1080i/custom_menuItemTypeSelector.xml b/1080i/custom_menuItemTypeSelector.xml index ddd70b9..18da226 100644 --- a/1080i/custom_menuItemTypeSelector.xml +++ b/1080i/custom_menuItemTypeSelector.xml @@ -26,7 +26,20 @@ highlight stretch - + + + col-1-begin + row-1-begin + 1-col + 1-col + kodilogo.png + textActive + stretch + + + + + diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index cbbca07..78cd3f9 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -60,21 +60,25 @@ + + + col-1-begin row-14-begin - 72 - 0 + -24 + -16 3-col 3-col scale @@ -82,81 +86,80 @@ colors/white.png 3 ffFFFFFF + windowopen !Pvr.IsPlayingRadio - 88 - -62 + 0 + -82 4-col symbolLarge textActive 00000000 - scrollSuppressionActive - scrollSuppressionInactive - col-4-begin - -4 + 3-col-indent + -8 20-col largeBlack textActive false - + 00000000 - scrollSuppressionActive - scrollSuppressionInactive - + !Pvr.IsPlayingRadio - col-4-begin - 1-row - 20-col - medium - textActive - false - - 00000000 - scrollSuppressionActive - scrollSuppressionInactive - - - Pvr.IsPlayingRadio - col-4-begin - 1-row - 20-col - medium - textActive - false - - 00000000 - scrollSuppressionActive - scrollSuppressionInactive - - - col-4-begin - 118 + 3-col-indent + 48 20-col regularStrong textActive false 00000000 - scrollSuppressionActive - scrollSuppressionInactive - col-4-begin - 164 + Pvr.IsPlayingRadio + 3-col-indent + 48 + 20-col + regularStrong + textActive + false + + 00000000 + + + 3-col-indent + 96 + 3-col + 3 + colors/white.png + ffffffff + stretch + + + 3-col-indent + 3-row 12-col - itemSubTitle + regularStrong left textActive false 00000000 - - scrollSuppressionActive - scrollSuppressionInactive + + + + 3-col-indent + 156 + 12-col + itemTitle + left + textActive + false + 00000000 + diff --git a/1080i/custom_recentItemTypeSelector.xml b/1080i/custom_recentItemTypeSelector.xml index acb58b6..dbbed41 100644 --- a/1080i/custom_recentItemTypeSelector.xml +++ b/1080i/custom_recentItemTypeSelector.xml @@ -21,7 +21,20 @@ highlight stretch - + + + col-1-begin + row-1-begin + 1-col + 1-col + kodilogo.png + textActive + stretch + + + + + 0 diff --git a/media/UIControls/radio-button-fo.png b/media/UIControls/radio-button-fo.png index 7f288646cca37cc65fdd4dadb11e84031031d483..16a1b3301b1b7fa9bfbebc7ec2e2fe14ab9e6fdf 100644 GIT binary patch delta 3029 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 X?At0W;4?kK00000NkvXXu0mjf+4!9n literal 1165 zcmaJ>TSyd97@kdtk|d*uE+E6073t1R*L8;7Y}?tbrN(SsXoU*LnWH=DT$(wyyY^s7 z5k*4u&;^U2GD;!}qM)EG3AK8vm*`#(L3e7wpi(-cyV`>_Fz1~A@O|I^o%8>k{k1h~ z3i21_V;EKtSt~@*yx#d|Oh@Cu(T$~OS_ngNSZ6fBq+|gspcst+k7!aehyqDTZyy3a z49g?bSRBU1^}K9oq~u`8lx89}hWV;frX;rjh&O^}RreELZ{8+wRq+#>JR&WcL6A__ zwp*aCy(T8Nx5%7ARIkK+DIN)E07`gDYt?N&%9$>_K|W)LzE9$`oF*+{%A)DP)Fn3j0@~b6co;oaIE@qF|!&fsVS}LT&wH z+ul(ObGafyAeMUi>G_?4P8wUak$(B+{`}TEiw^cJzu4b3=SgSFajgGdVb@?N|J_Kp zbv~_jUtMx8<6HLhRe_6c=-cI*``4Jaw4v`UJaulUXEa=Yq^IdvN&5BS%^ic8-}9<_ z%N``;+5Lz16b|n`*>mgbnXVD-QT*`mBzK0!Fql3b=}wTqVaOkt96A4fy~Tw#uFvQMH@)h{LHN8 s$h61N4;`fsCv#-&I!1SGIlT|d!#+J*;huL_IO{wRkx-3rX>~*AA2F(rkpKVy diff --git a/media/UIControls/radio-button-nf.png b/media/UIControls/radio-button-nf.png index a63295bfb5cfba41cbfecf816673c9f2340f9343..dfdf9e58295f0bf75172639df1ffe1f5bdf2c064 100644 GIT binary patch delta 230 zcmcaCK39Ch0j~NJo-U3d6}R5pG2}X;Am9)fd&%1UQ(71B&cjq|d;>@c%zEgGRU*w|edZaUhq$)78&qol`;+0NL?ehX4Qo delta 267 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 literal 0 HcmV?d00001