diff --git a/1080i/DialogAlbumInfo.xml b/1080i/DialogAlbumInfo.xml index 78622f0..65c918d 100644 --- a/1080i/DialogAlbumInfo.xml +++ b/1080i/DialogAlbumInfo.xml @@ -17,7 +17,7 @@ dimensionsFullscreen stretch $INFO[Listitem.art(fanart)] - kenBurnsey + kenBurnsey diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index 50ba176..bb1aa40 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -11,24 +11,14 @@ stretch - col-9-begin + col-4-begin row-24-begin - - 0 - 0 - 8-col - 2-row - colors/white.png - stretch - highlight - Player.Playing | player.seeking 0 - 0 - 8-col-gutter + -32 + 18-col 2-row - center center pageTitle textActive @@ -37,11 +27,10 @@ Player.Paused + !Player.Caching 0 - 0 - 8-col-gutter + -32 + 18-col 2-row center - center pageTitle textActive @@ -49,11 +38,10 @@ buffering 0 - 0 - 8-col-gutter + -32 + 18-col 2-row center - center pageTitle textActive @@ -62,13 +50,23 @@ Progress Bar 0 - 2-row - 8-col - 1-row + row-2-begin + 18-col + 12 colors/offblack.png - colors/white.png + colors/white.png Player.Progress + + 0 + 1-row + 18-col + center + small + textActive + + - + 0 3-row @@ -79,7 +77,7 @@ - - 8-col + 18-col 3-row 8-col smallStrong diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml index 1a22ae2..22f5333 100644 --- a/1080i/DialogSelect.xml +++ b/1080i/DialogSelect.xml @@ -25,7 +25,16 @@ 0 2-row 18-col - 21-row + 14-row + colors/black.png + overlay + stretch + + + 0 + 2-row + 12-col + 14-row colors/black.png overlay stretch @@ -123,19 +132,19 @@ - 0 + 12 2-row - 12-col - 21-row + 12-col-gutter + 14-row 9999 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.icon] + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] 1-col-indent @@ -150,6 +159,18 @@ + + 0 + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + + 1-col 0 @@ -160,15 +181,6 @@ 0 ffffffff - - 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.icon] - spinFocusIcon - 1-col-indent 0 @@ -185,16 +197,6 @@ - - - 12-col - 2-row - 6-col - 21-row - colors/black.png - overlay - stretch - 13-col @@ -209,9 +211,9 @@ control.isvisible(3) | control.isvisible(5) - 12-col + 867 12-row - 6-col + 429 6-row vertical 9000 diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml index 0eda7bc..0a62cbb 100644 --- a/1080i/DialogVideoInfo.xml +++ b/1080i/DialogVideoInfo.xml @@ -34,7 +34,7 @@ $INFO[listitem.art(fanart)] ffffffff stretch - kenBurnsey + kenBurnsey dimensionsFullscreen diff --git a/1080i/Home.xml b/1080i/Home.xml index 54a77f1..03aa9f5 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -141,19 +141,12 @@ Skin.SetString(showRecentVideoItems,false) - !Skin.HasSetting(hideFavourites) - - - - - ReplaceWindow(favourites) - - - ActivateWindow(settings) - + - diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml index 74fc51d..1a011ed 100644 --- a/1080i/Includes_homeBackground.xml +++ b/1080i/Includes_homeBackground.xml @@ -19,7 +19,7 @@ horizontal 10000 - + @@ -42,7 +42,7 @@ - + dimensionsFullscreen logoOverlay.png diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index c14b97e..8aa89a1 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -70,6 +70,7 @@ special://skin/extras/playlists/randomVideos.xsp special://skin/extras/playlists/randomAlbums.xsp + addons://sources/executable/ diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml index def5d2b..053b933 100644 --- a/1080i/MyPrograms.xml +++ b/1080i/MyPrograms.xml @@ -7,62 +7,201 @@ globalBackground + - - - 0 - 0 - + + + + - col-1-begin - row-2-begin - - - 0 - 0 + + col-1-begin + row-5-begin 24-col - left - pageTitle - - textActive - - - - 0 - 45 - 24-col - left - regular - - textActive - - - - - col-1-begin - row-2-begin - - - viewGridList - viewFileList - - - - - Control.IsVisible(60) - conditional - - 108r - 276 - 672 - 9999 + 24-row + 9000 + 60 + 50 + 50 + 60 + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + 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 + textActive + + + + 0 + 0 + 4-col-gutter + 4-col-gutter + stretch + $INFO[Listitem.thumb] + colors/white.png + 3 + ffFFFFFF + + + + + 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 + + + + + + + + + Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false) + conditional + + 84r + row-5-begin + 789 + 9999 + + + + + + + + col-1-begin + row-1-begin + 24-col + left + pageTitle + + textActive + + + + col-1-begin + 96 + 24-col + left + regular + + textActive + + + + dateTime + + hubMenu DebugGrid diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 32048c8..2911986 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -20,6 +20,9 @@ + + + SubString(skin.string(showRecentVideoItems),true) | isEmpty(container.foldername) diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 7ffa270..d62e52b 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -131,55 +131,6 @@ 8000 0 vertical - - Container(8000).Hasfocus(1) - Home background image - 15-col-textbox - - $INFO[Skin.String(homeBackground)] - Skin.SetFile(homeBackground,.png|.jpg|.gif,special://skin/extras/backgrounds/) - 8-col - 501 - - - Container(8000).Hasfocus(1) - Set video fanart - 15-col-textbox - left - - $INFO[Skin.String(videoFanartLocation)] - Skin.SetPath(videoFanartLocation) - 8-col - 502 - - - Container(8000).Hasfocus(1) - Set music fanart - 15-col-textbox - - $INFO[Skin.String(musicFanartLocation)] - Skin.SetPath(musicFanartLocation) - 8-col - 503 - - - Container(8000).Hasfocus(1) - Set game fanart - 15-col-textbox - - $INFO[Skin.String(gameFanartLocation)] - Skin.SetPath(gameFanartLocation) - 8-col - 504 - - - Container(8000).Hasfocus(1) - Override global background with fanart slides - 16-col - - Skin.ToggleSetting(useGlobalFanartBackground) - Skin.HasSetting(useGlobalFanartBackground) - Container(8000).Hasfocus(1) Stop video on return to menu @@ -244,14 +195,6 @@ Skin.ToggleSetting(hidePrograms) Skin.HasSetting(hidePrograms) - - Container(8000).Hasfocus(2) - Hide Favourites - 16-col - - Skin.ToggleSetting(hideFavourites) - Skin.HasSetting(hideFavourites) - Container(8000).Hasfocus(3) Enable Debug Grid @@ -268,23 +211,6 @@ Skin.ToggleSetting(DebugInfo) Skin.HasSetting(DebugInfo) - - Container(8000).Hasfocus(1) - Disable Fanart animations and scrolling (low power mode) - 16-col - - Skin.ToggleSetting(lowPowerMode) - ReloadSkin() - Skin.HasSetting(lowPowerMode) - - - Container(8000).Hasfocus(1) - Disable backgrounds on fullscreen music view - 16-col - - Skin.ToggleSetting(disableFullscreenMusicBackground) - Skin.HasSetting(disableFullscreenMusicBackground) - Container(8000).Hasfocus(1) Autostart music visualisation on playback @@ -294,69 +220,6 @@ Skin.HasSetting(startVisualiserOnPlayback) - - - 19-col - - Container(8000).Hasfocus(1) - 2-row - 2-row - 1-col - symbol - textActive - black - colors/white.png - - 1 - 502 - Skin.Reset(globalBackground) - - - Container(8000).Hasfocus(1) - 4-row - 2-row - 1-col - symbol - textActive - black - colors/white.png - - 2 - 503 - 501 - Skin.Reset(videoFanartLocation) - - - Container(8000).Hasfocus(1) - 6-row - 2-row - 1-col - symbol - textActive - black - colors/white.png - - 3 - 504 - 502 - Skin.Reset(musicFanartLocation) - - - Container(8000).Hasfocus(1) - 8-row - 2-row - 1-col - symbol - textActive - black - colors/white.png - - 4 - 503 - 5 - Skin.Reset(gameFanartLocation) - - DebugGrid diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml index 220ec18..13020c2 100644 --- a/1080i/VideoOSD.xml +++ b/1080i/VideoOSD.xml @@ -33,7 +33,7 @@ 2-row pageTitle textActive - + 96 @@ -188,8 +188,6 @@ - - DebugGrid diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml index 4c85cdd..6d62622 100644 --- a/1080i/VideoOSDSettings.xml +++ b/1080i/VideoOSDSettings.xml @@ -27,8 +27,6 @@ 25-row colors/black.png stretch - colors/white.png - 3 ffffffff diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml index c32de09..481b82f 100644 --- a/1080i/View_Episodes.xml +++ b/1080i/View_Episodes.xml @@ -10,7 +10,7 @@ dimensionsFullscreen stretch - $INFO[Listitem.art(fanart)] + $INFO[container.art(fanart)] ffffffff diff --git a/1080i/View_Files.xml b/1080i/View_Files.xml index cf7c8cd..0867afe 100644 --- a/1080i/View_Files.xml +++ b/1080i/View_Files.xml @@ -15,11 +15,11 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.thumb] + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] 1-col @@ -45,12 +45,15 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.thumb] - spinFocusIcon + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + 1-col diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml index 962b662..8b83fc6 100644 --- a/1080i/View_MusicFiles.xml +++ b/1080i/View_MusicFiles.xml @@ -19,11 +19,11 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.thumb] + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] 1-col @@ -49,12 +49,15 @@ 0 - 0 - 1-col - 2-row - scale - $INFO[Listitem.thumb] - spinFocusIcon + 3 + 66 + 66 + stretch + $INFO[Listitem.thumb] + + + + 1-col diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml index 8018206..b38cb03 100644 --- a/1080i/View_Seasons.xml +++ b/1080i/View_Seasons.xml @@ -11,7 +11,7 @@ dimensionsFullscreen stretch - $INFO[Listitem.art(fanart)] + $INFO[container.art(fanart)] ffffffff diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml index 7260028..99de964 100644 --- a/1080i/View_VideoRecentItems.xml +++ b/1080i/View_VideoRecentItems.xml @@ -2,6 +2,9 @@ + + + diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 6ad6b00..feedbdc 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -10,7 +10,6 @@ fadeInOut - !Skin.HasSetting(disableFullscreenMusicBackground) isempty(Window(Visualisation).Property(ArtistSlideshow)) @@ -91,20 +90,10 @@ false 00000000 - - - !Pvr.IsPlayingRadio - 3-col-indent - 48 - 4-col - symbolLarge - textActive - - 00000000 !Pvr.IsPlayingRadio - 6-col + 3-col-indent 52 20-col regularStrong @@ -135,6 +124,16 @@ 00000000 + + !Pvr.IsPlayingRadio + 7-col + 104 + 4-col + symbolLarge + textActive + + 00000000 + 3-col-indent 156 @@ -149,7 +148,7 @@ - col-5-begin + col-3-begin 0 @@ -281,10 +280,9 @@ activateWindow(musicOSD) - Visualisation.Enabled Visualisation Settings - + - Addon.Default.OpenSettings(xbmc.player.musicviz) diff --git a/1080i/script-globalsearch-infodialog.xml b/1080i/script-globalsearch-infodialog.xml index 653bd83..000c69b 100644 --- a/1080i/script-globalsearch-infodialog.xml +++ b/1080i/script-globalsearch-infodialog.xml @@ -64,7 +64,7 @@ $INFO[Container(100).ListItem.Property(fanart)] ffffffff stretch - kenBurnsey + kenBurnsey diff --git a/extras/backgrounds/background001.jpg b/extras/backgrounds/background001.jpg deleted file mode 100644 index 0603efe..0000000 Binary files a/extras/backgrounds/background001.jpg and /dev/null differ