From e5f671f157537b6aa0a9bea80b5b70106451de24 Mon Sep 17 00:00:00 2001 From: Sranshaft Date: Thu, 13 Feb 2014 03:56:08 +1100 Subject: [PATCH] Update: Various cosmetic changes and code cleanup Update includes new favourite screen and additional options for home screen background --- 720p/Custom_Hub_Movies.xml | 23 +-- 720p/Custom_Hub_Music.xml | 23 +-- 720p/Custom_Hub_TV.xml | 25 +-- 720p/Custom_Splash.xml | 2 +- 720p/DialogFavourites.xml | 254 +++++++++++++---------------- 720p/DialogFullScreenInfo.xml | 2 +- 720p/Font.xml | 2 +- 720p/Home.xml | 29 +++- 720p/Includes.xml | 61 +++++-- 720p/Includes_Animation.xml | 7 +- 720p/Includes_Appbar.xml | 4 +- 720p/Includes_Breadcrumb.xml | 46 +++++- 720p/Includes_Home.xml | 138 ++++++++++++---- 720p/Includes_Hub.xml | 16 +- 720p/Includes_Splash.xml | 49 ------ 720p/MusicOSD.xml | 6 +- 720p/PlayerControls.xml | 6 +- 720p/SkinSettings.xml | 235 +++++++++++++++----------- 720p/Variable.xml | 5 +- 720p/VideoOSD.xml | 6 +- 720p/ViewDetails.xml | 4 +- 720p/ViewExtendedList.xml | 4 +- 720p/ViewPoster.xml | 7 +- media/dialoginfo/Device-Radio.png | Bin 918 -> 0 bytes playlists/Episodes In Progress.xsp | 6 + playlists/Movies In Progress.xsp | 6 + 26 files changed, 559 insertions(+), 407 deletions(-) delete mode 100644 720p/Includes_Splash.xml delete mode 100644 media/dialoginfo/Device-Radio.png create mode 100644 playlists/Episodes In Progress.xsp create mode 100644 playlists/Movies In Progress.xsp diff --git a/720p/Custom_Hub_Movies.xml b/720p/Custom_Hub_Movies.xml index 293b999..2856341 100644 --- a/720p/Custom_Hub_Movies.xml +++ b/720p/Custom_Hub_Movies.xml @@ -67,15 +67,8 @@ 45 58 - 600 - 30 - ForumBrowser-PageLabels - Label_Normal - top - true - 0 - -90 + Common_Vertical_Label Common_Animation_Vertical_Label @@ -304,13 +297,13 @@ - ViewList_RootMenu_Featured - ViewList_RootMenu_RecentlyAdded - ViewList_RootMenu_AiringToday - ViewList_RootMenu_InCinemas - ViewList_RootMenu_NearbyEvents - ViewList_RootMenu_History - ViewList_RootMenu_Trakt + Hub_Featured + Hub_RecentlyAdded + Hub_AiringToday + Hub_InCinemas + Hub_NearbyEvents + Hub_History + Hub_Trakt diff --git a/720p/Custom_Hub_Music.xml b/720p/Custom_Hub_Music.xml index 0966f8d..0a4b6be 100644 --- a/720p/Custom_Hub_Music.xml +++ b/720p/Custom_Hub_Music.xml @@ -60,15 +60,8 @@ 45 58 - 600 - 30 - ForumBrowser-PageLabels - Label_Normal - top - true - 0 - -90 + Common_Vertical_Label Common_Animation_Vertical_Label @@ -276,13 +269,13 @@ - ViewList_RootMenu_Featured - ViewList_RootMenu_RecentlyAdded - ViewList_RootMenu_AiringToday - ViewList_RootMenu_InCinemas - ViewList_RootMenu_NearbyEvents - ViewList_RootMenu_History - ViewList_RootMenu_Trakt + Hub_Featured + Hub_RecentlyAdded + Hub_AiringToday + Hub_InCinemas + Hub_NearbyEvents + Hub_History + Hub_Trakt diff --git a/720p/Custom_Hub_TV.xml b/720p/Custom_Hub_TV.xml index 424cc25..5f61833 100644 --- a/720p/Custom_Hub_TV.xml +++ b/720p/Custom_Hub_TV.xml @@ -64,15 +64,8 @@ 45 58 - 600 - 30 - ForumBrowser-PageLabels - Label_Normal - top - true - 0 - -90 + Common_Vertical_Label Common_Animation_Vertical_Label @@ -204,7 +197,7 @@ hub/hub_recentlyadded_small.png ActivateWindow(Videos,RecentlyAddedEpisodes,return) - + Actors @@ -273,13 +266,13 @@ - ViewList_RootMenu_Featured - ViewList_RootMenu_RecentlyAdded - ViewList_RootMenu_AiringToday - ViewList_RootMenu_InCinemas - ViewList_RootMenu_NearbyEvents - ViewList_RootMenu_History - ViewList_RootMenu_Trakt + Hub_Featured + Hub_RecentlyAdded + Hub_AiringToday + Hub_InCinemas + Hub_NearbyEvents + Hub_History + Hub_Trakt diff --git a/720p/Custom_Splash.xml b/720p/Custom_Splash.xml index bf78b7d..c716a8d 100644 --- a/720p/Custom_Splash.xml +++ b/720p/Custom_Splash.xml @@ -4,7 +4,7 @@ 2 - AlarmClock(CloseSplash,Dialog.Close(60, force),00:02,silent) + AlarmClock(CloseSplash,Dialog.Close(60, force),00:01,silent) diff --git a/720p/DialogFavourites.xml b/720p/DialogFavourites.xml index d06747a..4ddd11e 100644 --- a/720p/DialogFavourites.xml +++ b/720p/DialogFavourites.xml @@ -5,22 +5,8 @@ 450 yes - - ActivateWindow(60) - Common_Animation_Window_Splash - - - - Common_Dimensions - colors/color_white.png - Settings_Background_Light - - - - Common_Breadcrumb_Dark - @@ -28,147 +14,139 @@ 100 1220 480 - - - Common_Animation_Content_Splash + + + + + + + + + + - - Common_Section_Label_Dark + + Common_Section_Label - + 0 60 1220 - 500 + 480 + Dialog.Close(134) + Dialog.Close(134) 450 450 - 450 - 450 - 9010 - 600 + panel horizontal + 459 + 0 + 600 4 - - - - - 420 - 105 - colors/color_white.png - Settings_Background_Dark - - - - - - 0 - 0 - 105 - 105 - colors/color_keyboard_dark.png - - - - - - 0 - 0 - 105 - 105 - $INFO[Listitem.Icon] - scale - - - - - - 125 - 10 - 255 - 72 - - Favourites-Large - Settings_Menu_Normal - top - true - 0 - - - - - - - - - - 420 - 105 - colors/color_white.png - Background_Highlight - - - - - - 0 - 0 - 105 - 105 - colors/color_keyboard_dark.png - - - - - - 0 - 0 - 105 - 105 - $INFO[Listitem.Icon] - scale - - - - - - 125 - 10 - 255 - 72 - - Favourites-Large - Label_Normal - top - true - 0 - - - - - - - - - - - - - - - Common_Window_Scrollbar_Horizontal_Dark - 700 - - Common_Animation_Window_Scrollbar_Fade + Common_Animation_HideWhenScrolling + + + + + 0 + 0 + 150 + 150 + $INFO[ListItem.Thumb] + scale + + + + + + 0 + 160 + 150 + 40 + + Home-RecentWatched + Label_Normal + top + true + false + + + + + + 0 + 200 + 150 + 22 + + Home-RecentWatched-Small + Label_Normal + top + true + 00FFFFFF + false + + + + + + + + + + 0 + 0 + 150 + 150 + $INFO[ListItem.Thumb] + scale + + + + + + 0 + 160 + 150 + 40 + + Home-RecentWatched + Label_Highlight + top + true + 00FFFFFF + false + + + + + + 0 + 200 + 150 + 22 + + Home-RecentWatched-Small + Label_Highlight + top + true + 00FFFFFF + false + + + + + - - + + diff --git a/720p/DialogFullScreenInfo.xml b/720p/DialogFullScreenInfo.xml index bdce1d0..0d23d41 100644 --- a/720p/DialogFullScreenInfo.xml +++ b/720p/DialogFullScreenInfo.xml @@ -108,7 +108,7 @@ 320 - 380 + 410 Label_Normal Fullscreen-Info-Normal diff --git a/720p/Font.xml b/720p/Font.xml index 3af6cc8..fa686e5 100644 --- a/720p/Font.xml +++ b/720p/Font.xml @@ -310,7 +310,7 @@ - + Home-Featured SegoeWP-Black.ttf diff --git a/720p/Home.xml b/720p/Home.xml index 457d3f9..7f10fec 100755 --- a/720p/Home.xml +++ b/720p/Home.xml @@ -36,7 +36,34 @@ - Home_Normal + Home_Content + + + + 60 + 640 + 32 + 32 + breadcrumb/breadcrumb_backarrow_focus.png + breadcrumb/breadcrumb_backarrow.png + keep + Label_Normal + ActivateWindow(favourites) + 9001 + 9001 + Control.Move(9001,1) + + Conditional + Conditional + + + + + + + Skin.HasSetting(UseTileMenu) + + Common_RSS diff --git a/720p/Includes.xml b/720p/Includes.xml index b4ce928..210462b 100644 --- a/720p/Includes.xml +++ b/720p/Includes.xml @@ -25,8 +25,7 @@ - - + = @@ -270,7 +269,7 @@ Container.SetViewMode(59) - + Common_AppBar_Button @@ -385,10 +384,21 @@ VisibleChange + + Common_Dimensions + $INFO[Window(Home).Property(script.grab.fanart.Video.Fanart)] + 1000 + Background_Normal + Skin.HasSetting(UseColorDiffuseFanart_Home) + + + + Common_Dimensions $INFO[Window(Home).Property(script.grab.fanart.Video.Fanart)] 1000 + !Skin.HasSetting(UseColorDiffuseFanart_Home) @@ -408,17 +418,25 @@ Common_Dimensions colors/color_white.png - Background_Dark + Background_Normal StringCompare(Skin.String(PersonalizeOverlay),Plain) - + Common_Dimensions $VAR[Home_Background_Image] Background_Normal - !StringCompare(Skin.String(PersonalizeOverlay),Plain) + Skin.HasSetting(UseColorDiffuseBackground_Home) + + + + + + Common_Dimensions + $VAR[Home_Background_Image] + !Skin.HasSetting(UseColorDiffuseBackground_Home) @@ -438,7 +456,7 @@ $VAR[Fanart_Image] - + Common_Background_Fade @@ -1984,6 +2002,19 @@ center + + + + 520 + 60 + Menu-List-Small + Settings_Label + Settings_Label_Highlight + Settings_Label_Disabled + left + top + + @@ -2059,10 +2090,20 @@ 0 0 - 320 - 180 + 425 + 240 stretch + + + + + 0 + 0 + 110 + 110 + scale + @@ -2568,7 +2609,7 @@ 115 5 285 - 34 + 36 Menu-Details-Header Label_Normal diff --git a/720p/Includes_Animation.xml b/720p/Includes_Animation.xml index a5f4d40..967c50e 100644 --- a/720p/Includes_Animation.xml +++ b/720p/Includes_Animation.xml @@ -225,7 +225,12 @@ - + + + + + + diff --git a/720p/Includes_Appbar.xml b/720p/Includes_Appbar.xml index e8bf6d2..51eb2cf 100644 --- a/720p/Includes_Appbar.xml +++ b/720p/Includes_Appbar.xml @@ -632,7 +632,7 @@ Common_AppBar_View_Poster - Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) + Container.Content(files) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(actors) @@ -689,7 +689,7 @@ Common_AppBar_View_Details - + diff --git a/720p/Includes_Breadcrumb.xml b/720p/Includes_Breadcrumb.xml index a255635..988b229 100644 --- a/720p/Includes_Breadcrumb.xml +++ b/720p/Includes_Breadcrumb.xml @@ -21,7 +21,7 @@ horizontal 20 true - + 12 @@ -33,7 +33,17 @@ Label_Normal back !StringCompare(Window.Property(xmlfile),Home.xml) - + + + + + + + + + + + @@ -45,7 +55,17 @@ Breadcrumb-Home Label_Normal center - + + + + + + + + + + + @@ -58,6 +78,16 @@ Label_Normal center !StringCompare(Window.Property(xmlfile),Home.xml) + !StringCompare(Window.Property(xmlfile),FileBrowser.xml) + + + + + + + + + + @@ -73,6 +103,16 @@ ActivateWindow(51) Conditional + + + + + + + + + + [!StringCompare(Container.FolderPath,videodb://1/) + SubString(Container.FolderPath,videodb://1/)] | [!StringCompare(Container.FolderPath,videodb://2/) + SubString(Container.FolderPath,videodb://2/)] | StringCompare(Container.FolderPath,videodb://4/) | StringCompare(Container.FolderPath,videodb://5/) | SubString(Container.FolderPath,musicdb://) diff --git a/720p/Includes_Home.xml b/720p/Includes_Home.xml index e6f7ce6..a050d8f 100644 --- a/720p/Includes_Home.xml +++ b/720p/Includes_Home.xml @@ -2,7 +2,7 @@ - + @@ -17,6 +17,11 @@ Common_Content_Grouplist + + + + + @@ -40,8 +45,9 @@ 480 9007 9002 - 9001 - 9001 + 8999 + Control.Move(9001,-1) + 8999 9011 list 600 @@ -60,6 +66,36 @@ Tile_Background + + + + 0 + 0 + 140 + 140 + $INFO[ListItem.Thumb] + 2000 + 1000 + false + scale + + + + + + -1 + -1 + 142 + 142 + tile/ + 2000 + 1000 + false + FanartDiffuse + + !IsEmpty(ListItem.Thumb) + + @@ -67,7 +103,7 @@ 0 140 140 - $INFO[ListItem.Thumb] + $INFO[ListItem.Icon] scale @@ -100,7 +136,7 @@ StringCompare(ListItem.Label,Now playing) + !VideoPlayer.HasMenu - + @@ -115,6 +151,36 @@ Background_Highlight + + + + 0 + 0 + 140 + 140 + $INFO[ListItem.Thumb] + 2000 + 1000 + false + scale + + + + + + -1 + -1 + 142 + 142 + tile/ + 2000 + 1000 + false + FanartDiffuse + + !IsEmpty(ListItem.Thumb) + + @@ -122,7 +188,7 @@ 0 140 140 - $INFO[ListItem.Thumb] + $INFO[ListItem.Icon] scale @@ -155,6 +221,18 @@ StringCompare(ListItem.Label,Now playing) + !VideoPlayer.HasMenu + + + + 0 + 0 + 140 + 140 + button_unfocus.png + Background_Highlight + scale + + @@ -210,7 +288,7 @@ Now Playing - $INFO[VideoPlayer.Title] + $VAR[NowPlaying_First_Label][CR]$VAR[NowPlaying_Second_Label] $VAR[NowPlaying_Image] ActivateWindow(fullscreenvideo) Player.HasVideo @@ -228,7 +306,7 @@ Programs - home/home_addons.png + home/home_addons.png ActivateWindow(programs,addons,return) Skin.HasSetting(ShowAddonsMenu) @@ -236,7 +314,7 @@ Videos - home/home_videos.png + home/home_videos.png ActivateWindow(videos,root) Skin.HasSetting(ShowVideosMenu) @@ -245,7 +323,8 @@ Movies $INFO[Window(Home).Property(Movies.Count),, movies][CR]$INFO[Window(Home).Property(Movies.Watched),, watched][CR]$INFO[Window(Home).Property(Movies.UnWatched),, unwatched] - home/home_movie.png + $INFO[Window(Home).Property(script.grab.fanart.Movie.Fanart)] + home/home_movie.png ActivateWindow(61,return) Library.HasContent(movies) + Skin.HasSetting(ShowMoviesMenu) @@ -254,7 +333,8 @@ TV Shows $INFO[Window(Home).Property(TVShows.Count),, tv shows][CR]$INFO[Window(Home).Property(TVShows.Watched),, watched][CR]$INFO[Window(Home).Property(TVShows.UnWatched),, unwatched] - home/home_tvshow.png + $INFO[Window(Home).Property(script.grab.fanart.TV.Fanart)] + home/home_tvshow.png ActivateWindow(62,return) Library.HasContent(tvshows) + Skin.HasSetting(ShowTVShowsMenu) @@ -262,7 +342,7 @@ Live TV - home/home_livetv.png + home/home_livetv.png ActivateWindow(PVR) System.GetBool(pvrmanager.enabled) + Skin.HasSetting(ShowLiveTVMenu) @@ -271,7 +351,8 @@ Music $INFO[Window(Home).Property(Music.ArtistsCount),, artists][CR]$INFO[Window(Home).Property(Music.AlbumsCount),, albums][CR]$INFO[Window(Home).Property(Music.SongsCount),, songs] - home/home_music.png + $INFO[Window(Home).Property(script.grab.fanart.Music.Fanart)] + home/home_music.png ActivateWindow(63,return) Skin.HasSetting(ShowMusicMenu) @@ -279,7 +360,7 @@ Games - home/home_games.png + home/home_games.png XBMC.RunAddon(plugin.program.advanced.launcher) Skin.HasSetting(ShowGamesMenu) @@ -287,7 +368,7 @@ Pictures - home/home_pictures.png + home/home_pictures.png ActivateWindow(2) Skin.HasSetting(ShowPicturesMenu) @@ -296,7 +377,7 @@ Play Disc $INFO[System.DVDLabel] - home/home_dvd.png + home/home_dvd.png PlayDVD System.HasMediadvd @@ -305,23 +386,16 @@ Weather $INFO[Window(Weather).Property(Current.Condition)][CR]$INFO[Window(Weather).Property(Current.Temperature),,°] - home/home_weather.png + $INFO[Skin.String(WeatherFanartDir)]$INFO[Window(Weather).Property(Current.FanartCode)] + home/home_weather.png ActivateWindow(weather,return) Skin.HasSetting(ShowWeatherMenu) - - Favourites - - home/home_favourites.png - ActivateWindow(favourites) - Skin.HasSetting(ShowFavoritesMenu) - - Profiles - home/home_profiles.png + home/home_profiles.png ActivateWindow(profiles) Skin.HasSetting(ShowProfilesMenu) @@ -329,7 +403,7 @@ File Manager - home/home_filemanager.png + home/home_filemanager.png ActivateWindow(filemanager) Skin.HasSetting(ShowFileManagerMenu) @@ -337,14 +411,14 @@ Settings - home/home_settings.png + home/home_settings.png ActivateWindow(settings) Shutdown - home/home_shutdown.png + home/home_shutdown.png ActivateWindow(shutdownmenu) Skin.HasSetting(ShowShutdownMenu) @@ -352,7 +426,7 @@ Search - home/home_search.png + home/home_search.png XBMC.RunScript(script.globalsearch) Skin.HasSetting(ShowSearchMenu) @@ -416,7 +490,7 @@ 9007 9002 9001 - 9001 + 8999 9012 list 600 @@ -618,7 +692,7 @@ Favourites - home/home_favourites_small.png + home/home_favourites.png ActivateWindow(favourites) Skin.HasSetting(ShowFavoritesMenu) diff --git a/720p/Includes_Hub.xml b/720p/Includes_Hub.xml index b856f17..3bdd2c5 100644 --- a/720p/Includes_Hub.xml +++ b/720p/Includes_Hub.xml @@ -2,7 +2,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -452,7 +452,7 @@ - + @@ -840,7 +840,7 @@ - + @@ -929,7 +929,7 @@ - + @@ -1182,7 +1182,7 @@ - + @@ -1569,7 +1569,7 @@ - + @@ -1969,7 +1969,7 @@ - + diff --git a/720p/Includes_Splash.xml b/720p/Includes_Splash.xml deleted file mode 100644 index 1592182..0000000 --- a/720p/Includes_Splash.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - Common_Dimensions - - - - - - - - - - - - - - - - - Common_Dimensions - colors/color_white.png - Background_Normal - - - - - - - - - - - - Common_Dimensions - $VAR[Splash_Image] - - - - - - - - \ No newline at end of file diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml index 3def15d..2182b19 100644 --- a/720p/MusicOSD.xml +++ b/720p/MusicOSD.xml @@ -93,7 +93,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -103,7 +103,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -114,7 +114,7 @@ 500 - 30 + 22 Appbar-Info-Small Label_Normal diff --git a/720p/PlayerControls.xml b/720p/PlayerControls.xml index 89eb7cf..aabc3fc 100644 --- a/720p/PlayerControls.xml +++ b/720p/PlayerControls.xml @@ -74,7 +74,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -84,7 +84,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -95,7 +95,7 @@ 500 - 30 + 22 Appbar-Info-Small Label_Normal diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml index 03e2b67..6139fae 100644 --- a/720p/SkinSettings.xml +++ b/720p/SkinSettings.xml @@ -254,6 +254,7 @@ Skin.ToggleSetting(ShowFavoritesMenu) Skin.HasSetting(ShowFavoritesMenu) + !Skin.HasSetting(UseTileMenu) @@ -529,7 +530,7 @@ 0 0 730 - 240 + 300 Common_Animation_Settings_Options @@ -541,6 +542,7 @@ + 60 @@ -555,63 +557,86 @@ Common_Settings_Preview - colors/color_white.png + colors/color_white.png Background_Dark Skin.HasSetting(UseColorBackground_Home) + VisibleChange + - + Skin.HasSetting(UseFanartBackground_Home) - - + + VisibleChange + + Common_Settings_Preview - $INFO[Window(Home).Property(script.grab.fanart.Video.Fanart)] + $INFO[Window(Home).Property(script.grab.fanart.Video.Fanart)] 1000 + Background_Normal + Skin.HasSetting(UseColorDiffuseFanart_Home) + + + Common_Settings_Preview + $INFO[Window(Home).Property(script.grab.fanart.Video.Fanart)] + 1000 + !Skin.HasSetting(UseColorDiffuseFanart_Home) + + + Common_Settings_Preview - colors/color_black.png + colors/color_black.png - Conditional + Conditional + Conditional - + - Common_Settings_Preview - colors/color_white.png - Background_Dark - 1000 - StringCompare(Skin.String(PersonalizeOverlay),Plain) - - - - + - Common_Settings_Preview - $VAR[Home_Background_Image] - Background_Normal - 1000 - !StringCompare(Skin.String(PersonalizeOverlay),Plain) + Skin.HasSetting(UseColorDiffuseBackground_Home) + !IsEmpty(Skin.String(PersonalizeOverlay)) - - - + VisibleChange + + + + Common_Settings_Preview + colors/color_white.png + Background_Normal + StringCompare(Skin.String(PersonalizeOverlay),Plain) + + + + + + Common_Settings_Preview + $VAR[Home_Background_Image] + Background_Normal + Skin.HasSetting(UseColorDiffuseBackground_Home) + + - Common_Settings_Preview - $VAR[Home_Background_Image] - 1000 - !StringCompare(Skin.String(PersonalizeOverlay),Plain) + !Skin.HasSetting(UseColorDiffuseBackground_Home) + + + Common_Settings_Preview + $VAR[Home_Background_Image] + !Skin.HasSetting(UseColorDiffuseBackground_Home) + + @@ -642,38 +667,33 @@ - + - + Common_Settings_Label - + - + - 640 - 80 + 730 + 120 + horizontal - + - 0 - 0 - 60 - 60 + Common_Settings_Preview_Selection colors/color_black.png - 0 - 0 - 60 - 60 + Common_Settings_Preview_Selection colors/color_white.png Background_Dark Skin.HasSetting(UseColorBackground_Home) @@ -682,25 +702,16 @@ - 0 - 0 - 60 - 60 - $INFO[ListItem.Icon] - scale - Background_Normal + Common_Settings_Preview_Selection + $INFO[ListItem.Thumb] !Skin.HasSetting(UseColorDiffuseBackground_Home) - 0 - 0 - 60 - 60 - $INFO[ListItem.Icon] - scale + Common_Settings_Preview_Selection + $INFO[ListItem.Thumb] Background_Normal Skin.HasSetting(UseColorDiffuseBackground_Home) @@ -708,24 +719,18 @@ - + - 0 - 0 - 60 - 60 + Common_Settings_Preview_Selection colors/color_black.png - 0 - 0 - 60 - 60 + Common_Settings_Preview_Selection colors/color_white.png Background_Dark Skin.HasSetting(UseColorBackground_Home) @@ -734,38 +739,26 @@ - 0 - 0 - 60 - 60 - $INFO[ListItem.Icon] - scale - Background_Normal + Common_Settings_Preview + $INFO[ListItem.Thumb] !Skin.HasSetting(UseColorDiffuseBackground_Home) - 0 - 0 - 60 - 60 - $INFO[ListItem.Icon] - scale + Common_Settings_Preview_Selection + $INFO[ListItem.Thumb] Background_Normal Skin.HasSetting(UseColorDiffuseBackground_Home) - - 0 - 0 - 60 - 60 - colors/color_white.png - 40FFFFFF + + Common_Settings_Preview_Selection + button_unfocus.png + Background_Highlight @@ -830,24 +823,52 @@ - Skin.SetString(PersonalizeOverlay,Cubist) + Skin.SetImage(PersonalizationOverlayCustom1) + Skin.SetString(PersonalizeOverlay,Custom1) ActivateWindow(52) settings/settings_preview_cubist.png - personalization/personalization_cubist.png - + $INFO[Skin.String(PersonalizationOverlayCustom1)] + - Skin.SetString(PersonalizeOverlay,Cubist) + Skin.SetImage(PersonalizationOverlayCustom2) + Skin.SetString(PersonalizeOverlay,Custom2) ActivateWindow(52) settings/settings_preview_cubist.png - personalization/personalization_cubist.png - + $INFO[Skin.String(PersonalizationOverlayCustom2)] + + + + + Skin.SetImage(PersonalizationOverlayCustom3) + Skin.SetString(PersonalizeOverlay,Custom3) + ActivateWindow(52) + settings/settings_preview_cubist.png + $INFO[Skin.String(PersonalizationOverlayCustom3)] + + + + + + Settings_Label + Common_Settings_Label_Small + + + + + + + + Common_Settings_Label + + + @@ -871,7 +892,7 @@ - + Common_Settings_Label @@ -893,11 +914,21 @@ Color Background Common_Settings_RadioButton - + Skin.ToggleSetting(UseColorDiffuseBackground_Home) Skin.HasSetting(UseColorDiffuseBackground_Home) + + + + Color Background + Common_Settings_RadioButton + + Skin.ToggleSetting(UseColorDiffuseFanart_Home) + Skin.HasSetting(UseColorDiffuseFanart_Home) + + @@ -965,6 +996,16 @@ Skin.HasSetting(ShowFanartBackground) + + + + Background Visualiser + Common_Settings_RadioButton + + Skin.ToggleSetting(UseColorDiffuseFanart) + Skin.HasSetting(UseColorDiffuseFanart) + + @@ -974,7 +1015,7 @@ - + Background Visualiser Common_Settings_RadioButton @@ -992,7 +1033,7 @@ - + Disable alphabetic overlay when scrolling media Common_Settings_RadioButton diff --git a/720p/Variable.xml b/720p/Variable.xml index d932eea..77dbb1a 100644 --- a/720p/Variable.xml +++ b/720p/Variable.xml @@ -392,9 +392,12 @@ personalization/personalization_mountains.png personalization/personalization_city.png personalization/personalization_cubist.png + $INFO[Skin.String(PersonalizationOverlayCustom1)] + $INFO[Skin.String(PersonalizationOverlayCustom2)] + $INFO[Skin.String(PersonalizationOverlayCustom3)] - + diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml index 74dbfb7..1854165 100644 --- a/720p/VideoOSD.xml +++ b/720p/VideoOSD.xml @@ -94,7 +94,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -104,7 +104,7 @@ 500 - 16 + 18 Appbar-Info-Small Label_Normal @@ -115,7 +115,7 @@ 500 - 30 + 22 Appbar-Info-Small Label_Normal diff --git a/720p/ViewDetails.xml b/720p/ViewDetails.xml index 75b5124..3b5db47 100644 --- a/720p/ViewDetails.xml +++ b/720p/ViewDetails.xml @@ -36,7 +36,7 @@ 0 600 4 - + Common_Animation_HideWhenScrolling @@ -83,7 +83,7 @@ - + diff --git a/720p/ViewExtendedList.xml b/720p/ViewExtendedList.xml index d9dbf93..19ac457 100644 --- a/720p/ViewExtendedList.xml +++ b/720p/ViewExtendedList.xml @@ -75,7 +75,7 @@ 20 180 260 - 62 + 60 Menu-ExtendedList-Header Settings_Label @@ -194,7 +194,7 @@ 20 180 260 - 62 + 60 Menu-ExtendedList-Header Label_Normal diff --git a/720p/ViewPoster.xml b/720p/ViewPoster.xml index 7c0f8a5..31c0369 100644 --- a/720p/ViewPoster.xml +++ b/720p/ViewPoster.xml @@ -14,12 +14,13 @@ Common_Animation_View - - + + 1000 + Common_Section_Label - + 0 diff --git a/media/dialoginfo/Device-Radio.png b/media/dialoginfo/Device-Radio.png deleted file mode 100644 index 7447c29e50ea1040637d8a0c7abfddd6f8c32544..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 918 zcmV;H18Mw;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D11m{HK~!i%?U+Ak zQ&AMglh7eU!3-4?I;0SAaZs$Nn}T8o2Zt643RdXgQc&pNkU{8Bp@M=G$0A({4jn|= zP8k$3C^(2HR7gYz2f@LDg-YY^dpRj|u(9vmBuzX&_;Sv@@4k26mwVrRe^QR)IF92u zj^j8^C)nQJE}%uUjwY?T_o&rseHffYTj&FtLj~L1dtmM{`iZ7x9u1(pZSE~Fc^z{# z;y9t7_z-EN%hsf~z?iPrMax%E1x?C))S#EZSiwej1dXC!=r|fin&wxmX>Wkn2~2Gf zv&1K;Os)m&i~SLr+8tZGG8Th@r;T(v-DgF`O^aDo*tTWbT~)c=1UC#{^@E{7!h3WU z$>dGyR?#DJnO|n4-*(D)FffqAh_2gPmM?(y;UZW-l@ z6Br6cvNe`TKb4=mSpIZZf( zUSM+P0|Cccr94Kg(EhOMXj`F9*Kh1aE0|%GIiX=rWX~x``%kprS<%@?9}3pcG4?G+ zl?LUsnY@6iAq*!%Zgmn?j0O7_Im}(+h>q8Qa^pSvhoZGjyh?|h()~zNa?cTFWS*jX zR*Yr^;Td%&+5aN>HS`f_;TlJ0IQ|$hGMsdTJ3gfa`)Sb{MR(X=3zgOZJ+e-qbB*>P z3@1WvbrM!g1jo_$uQJl7U3~;x;P3;sIfA+aHKns?j_PLj%{AIDS-vl1IOzz7ybu3I zpE;3c(!I7j(eUbDw_?i)F{ML{upT(t^@^CdpTyU&MNQM_1-*r2xf~i#ah+MEnPSgn sx}DJHJL}$Y9LI4S$8j9T2}COO2kH_vb9ymA-~a#s07*qoM6N<$f&$f~YXATM diff --git a/playlists/Episodes In Progress.xsp b/playlists/Episodes In Progress.xsp new file mode 100644 index 0000000..983642f --- /dev/null +++ b/playlists/Episodes In Progress.xsp @@ -0,0 +1,6 @@ + + + Episodes In Progress + all + + diff --git a/playlists/Movies In Progress.xsp b/playlists/Movies In Progress.xsp new file mode 100644 index 0000000..ee5b3b6 --- /dev/null +++ b/playlists/Movies In Progress.xsp @@ -0,0 +1,6 @@ + + + Movies In Progress + all + +