diff --git a/1080i/Includes.xml b/1080i/Includes.xml index 602d04599..fe1c9fc81 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -464,15 +464,45 @@ Conditional + + Skin.HasSetting(EnableBlur) + Skin.HasSetting(FullsizeFanart510) + Control.IsVisible(510) + !Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(Custom_MovieSets.xml) + 1300 + 675 + scale + $VAR[GlobalFanart] + 0 + 0 + 600 + Conditional + Animation.ViHi + + + + Skin.HasSetting(EnableBlur) + !Skin.HasSetting(FullsizeFanart510) + Control.IsVisible(510) + !Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(Custom_MovieSets.xml) + 1920 + 1080 + scale + $VAR[GlobalFanart] + 0 + 0 + 600 + Conditional + Animation.ViHi + + Skin.HasSetting(EnableBlur) Control.IsVisible(510) + !Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(Custom_MovieSets.xml) Dimensions_Fullscreen Animation.FadeFromInfo - common/bg.jpg + common/bg.png Overlay510Blur - + !Skin.HasSetting(EnableBlur) Control.IsVisible(510) + !Window.IsVisible(DialogVideoInfo.xml) + !Window.IsVisible(Custom_MovieSets.xml) @@ -560,8 +590,6 @@ - - Control.HasFocus(60) | Control.HasFocus(1602) | Control.HasFocus(1600) | Control.HasFocus(1609) | Control.HasFocus(1603) | Control.HasFocus(1605) | Control.HasFocus(1606) | Control.HasFocus(1604) | Control.HasFocus(1607) | Control.HasFocus(1619) | Control.HasFocus(1620) | Control.HasFocus(1624) | Control.HasFocus(1625) | Control.HasFocus(1635) | Control.HasFocus(1627) Container.Content(movies) | Container.Content(tvshows) | Container.Content(actors) | Container.Content(addons) diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index ea50aab1b..f00b26fa8 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -325,6 +325,23 @@ Control.IsVisible(510) + + DefContextButton + left + + Skin.HasSetting(ShowDiscart510) + Skin.ToggleSetting(ShowDiscart510) + Control.IsVisible(510) + + + DefContextButton + left + + Skin.HasSetting(FullsizeFanart510) + Skin.ToggleSetting(FullsizeFanart510) + Control.IsVisible(510) + + @@ -356,7 +373,7 @@ Skin.ToggleSetting(furniture.animatedposters) - + - DefContextButton left @@ -382,9 +397,7 @@ Skin.HasSetting(furniture.animatedfanarts) Skin.ToggleSetting(furniture.animatedfanarts) - - - + DefContextButton left @@ -392,8 +405,6 @@ Skin.HasSetting(thumbnails.white) Skin.ToggleSetting(thumbnails.white) - - DefContextButton diff --git a/1080i/View_510_Minimal.xml b/1080i/View_510_Minimal.xml index 7cf640201..9525d8fd9 100644 --- a/1080i/View_510_Minimal.xml +++ b/1080i/View_510_Minimal.xml @@ -12,6 +12,7 @@ 235 40 520 + Conditional Conditional Skin.HasSetting(ShowClearart510) + !String.IsEmpty(ListItem.Art(clearlogo)) @@ -39,7 +40,19 @@ Dark1 - + + Skin.HasSetting(ShowDiscart510) + Conditional + 300 + 17 + Tiny + 140 + Dark2 + Dark2 + + + + !Skin.HasSetting(ShowDiscart510) 300 17 Tiny @@ -121,7 +134,7 @@ - + Focus UnFocus @@ -139,6 +152,28 @@ common/box2.png !Skin.HasSetting(thumbnails.white) + + !String.IsEqual(ListItem.Label,..) + Skin.HasSetting(ShowDiscart510) + 8 + 8 + 139 + 139 + 1000 + $INFO[ListItem.Art(discart)] + + + + + + + + + + + + + 10 5 diff --git a/extras/views/509.png b/extras/views/509.png deleted file mode 100644 index 56e98a9cb..000000000 Binary files a/extras/views/509.png and /dev/null differ diff --git a/language/English/strings.po b/language/English/strings.po index 869f581bb..a854d86fe 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -1079,23 +1079,23 @@ msgid "Top Rated Episodes" msgstr "" msgctxt "#37580" -msgid "NewAlbums" +msgid "New Albums" msgstr "" msgctxt "#37581" -msgid "RecentAlbums" +msgid "Recent Albums" msgstr "" msgctxt "#37582" -msgid "TopAlbums" +msgid "Top Albums" msgstr "" msgctxt "#37583" -msgid "RandomAlbums" +msgid "Random Albums" msgstr "" msgctxt "#37584" -msgid "RandomArtists" +msgid "Random Artists" msgstr "" msgctxt "#37585" @@ -1119,31 +1119,31 @@ msgid "Show extended info" msgstr "" msgctxt "#37590" -msgid "Minimal" +msgid "Big Icons-Flix" msgstr "" msgctxt "#37591" -msgid "Show Clearart instead of title" +msgid "Show clearart instead of title" msgstr "" msgctxt "#37592" -msgid "Enable Blur" +msgid "Enable blur" msgstr "" msgctxt "#37593" -msgid "Enable Blur on Home Menu" +msgid "Enable blur on home menu" msgstr "" msgctxt "#37594" -msgid "This view" +msgid "-- This view --" msgstr "" msgctxt "#37595" -msgid "All views" +msgid "-- All views --" msgstr "" msgctxt "#37596" -msgid "Misc" +msgid "-- Misc --" msgstr "" msgctxt "#37597" @@ -1155,7 +1155,11 @@ msgid "Restart" msgstr "" msgctxt "#37599" -msgid "Global Options" +msgid "-- Global options --" +msgstr "" + +msgctxt "#37600" +msgid "Show discart" msgstr "" msgctxt "#31001" diff --git a/media/common/diffuse510.png b/media/common/diffuse510.png new file mode 100644 index 000000000..bdea3e310 Binary files /dev/null and b/media/common/diffuse510.png differ diff --git a/media/common/diffuse510fs.png b/media/common/diffuse510fs.png new file mode 100644 index 000000000..65d6c45b1 Binary files /dev/null and b/media/common/diffuse510fs.png differ