diff --git a/1080i/Home.xml b/1080i/Home.xml index 155be7d66..b9e2ae4a2 100644 --- a/1080i/Home.xml +++ b/1080i/Home.xml @@ -11,7 +11,6 @@ CancelAlarm(slide_out,true) ClearProperty(TMDbHelper.WidgetContainer,home) SetProperty(TMDbHelper.WidgetContainer,301,home) - RunScript(script.favourites) ClearProperty(listitem.trailer,home) GlobalBackground diff --git a/1080i/Includes.xml b/1080i/Includes.xml index a6dad5543..b91aa713f 100644 --- a/1080i/Includes.xml +++ b/1080i/Includes.xml @@ -93,7 +93,7 @@ String.IsEqual(Window(home).Property(TrailerPath2),Player.FileNameAndPath) + !String.IsEmpty(Player.FileNameAndPath) Skin.HasSetting(home.netflix.autoplay.trailer) + Skin.HasSetting(DebugInfo.extended) + Skin.HasSetting(DebugInfo.extended) [Skin.HasSetting(extended.nowplaying) + Window.IsVisible(Home) + Player.HasMedia] + [[!ControlGroup(301).HasFocus() + !Control.HasFocus(8888) + !Control.HasFocus(4567)] | ControlGroup(777).HasFocus()] - [!String.IsEmpty(ListItem.Art(clearlogo)) | !String.IsEmpty(ListItem.Art(artist.clearlogo)) | !String.IsEmpty(ListItem.Art(tvshow.clearlogo))] + !Container.Content(episodes) + !Container.Content(seasons) + [!String.IsEmpty(ListItem.Art(clearlogo)) | !String.IsEmpty(ListItem.Art(artist.clearlogo)) | !String.IsEmpty(ListItem.Art(tvshow.clearlogo)) | [Skin.HasSetting(enable.crop.clearlogo) + [!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage)) | !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.base_clearlogo))]]] + !Container.Content(episodes) + !Container.Content(seasons) String.Contains(ListItem.FileNameAndPath,.atmos.) | String.Contains(ListItem.FileNameAndPath,.atmos-) | String.Contains(ListItem.FileNameAndPath,dolby atmos) | String.Contains(ListItem.FileNameAndPath,dolby-atmos) | [VideoPlayer.IsFullscreen + [String.Contains(Player.FileNameAndPath,.atmos.) | String.Contains(Player.FileNameAndPath,.atmos-) | String.Contains(Player.FileNameAndPath,dolby atmos) | String.Contains(Player.FileNameAndPath,dolby-atmos)]] diff --git a/1080i/Includes_Furniture.xml b/1080i/Includes_Furniture.xml index ce529230a..1f6d78844 100644 --- a/1080i/Includes_Furniture.xml +++ b/1080i/Includes_Furniture.xml @@ -461,6 +461,8 @@ + $INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)] + $INFO[Window(Home).Property(TMDbHelper.ListItem.base_clearlogo)] $INFO[ListItem.Art(clearlogo)] $INFO[ListItem.Art(tvshow.clearlogo)] $INFO[ListItem.Art(artist.clearlogo)] diff --git a/1080i/Includes_Home.xml b/1080i/Includes_Home.xml index a8769e357..ef5c3ec3c 100644 --- a/1080i/Includes_Home.xml +++ b/1080i/Includes_Home.xml @@ -4065,7 +4065,13 @@ 102 keep $INFO[Container($PARAM[id]).ListItem.Art(clearlogo)] - $PARAM[visible] + Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + !String.IsEmpty(Container($PARAM[id]).ListItem.Art(clearlogo)) + !Skin.HasSetting(homemenu.clean.flix) + $PARAM[visible] + Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + [!String.IsEmpty(Container($PARAM[id]).ListItem.Art(clearlogo)) + !Skin.HasSetting(enable.crop.clearlogo)] + !Skin.HasSetting(homemenu.clean.flix) + + + 102 + keep + $VAR[ClearLogo_Crop_Home] + $PARAM[visible] + Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + [Skin.HasSetting(enable.crop.clearlogo) + [!String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage)) | !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.base_clearlogo))]] + !Skin.HasSetting(homemenu.clean.flix) @@ -4080,7 +4086,7 @@ Dark1 LabelScroll - $PARAM[visible] + [[[!Skin.HasSetting(home.netflix.clearlogo) | Skin.HasSetting(homemenu.clean.flix)] | [Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + String.IsEmpty(Container($PARAM[id]).ListItem.Art(clearlogo))]] | !Skin.HasSetting(homemenu.netflix)] + $PARAM[visible] + [[[!Skin.HasSetting(home.netflix.clearlogo) | Skin.HasSetting(homemenu.clean.flix)] | [Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + [[String.IsEmpty(Container($PARAM[id]).ListItem.Art(clearlogo)) + !Skin.HasSetting(enable.crop.clearlogo)] | [String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage)) + String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.base_clearlogo)) + Skin.HasSetting(enable.crop.clearlogo)]]]] | !Skin.HasSetting(homemenu.netflix)] diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml index 4e0c6b31e..e5e9bb4c9 100644 --- a/1080i/Includes_Images.xml +++ b/1080i/Includes_Images.xml @@ -471,4 +471,9 @@ dialog/on.png dialog/off.png + + + $INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)] + $INFO[Window(Home).Property(TMDbHelper.ListItem.base_clearlogo)] + \ No newline at end of file diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml index 8d8064224..42e20643e 100644 --- a/1080i/SkinSettings.xml +++ b/1080i/SkinSettings.xml @@ -2753,6 +2753,16 @@ + + 1360 + ControlGroup(9100).HasFocus(9107) + DefSettingsButtonGradientSkinSettings + + Skin.HasSetting(enable.crop.clearlogo) + Skin.SetBool(TMDbHelper.EnableCrop) + Skin.Reset(TMDbHelper.EnableCrop) + Skin.ToggleSetting(enable.crop.clearlogo) + 1360 left diff --git a/1080i/Startup.xml b/1080i/Startup.xml index e6a82be6c..c9fad77d3 100644 --- a/1080i/Startup.xml +++ b/1080i/Startup.xml @@ -23,6 +23,7 @@ RunScript(script.embuary.helper,action=setkodisetting,setting=lookandfeel.skintheme,value=$INFO[Skin.String(skintheme)]) RunScript(script.embuary.helper,action=setkodisetting,setting=lookandfeel.font,value=$INFO[Skin.String(skinfont)]) RunScript(script.skin.info.service) + Skin.Reset(TMDbHelper.MonitorContainer) Skin.SetBool(global.hidecirles) diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index e2773b336..d1c0bec94 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -2575,4 +2575,8 @@ msgstr "" msgctxt "#31701" msgid "Color palette" +msgstr "" + +msgctxt "#31702" +msgid "Use TMDB helper for clearlogo" msgstr "" \ No newline at end of file