Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ClearLogo TMDBhelper] #905

Closed
wants to merge 11 commits into from
1 change: 0 additions & 1 deletion 1080i/Home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<onunload condition="$EXP[HasHomemenuAutoSlideOutAnimation]">CancelAlarm(slide_out,true)</onunload>
<onunload>ClearProperty(TMDbHelper.WidgetContainer,home)</onunload>
<onload condition="!$EXP[HomeIsModernMultiWidgets] + !$EXP[HomeIsVerticalMultiWidgets]">SetProperty(TMDbHelper.WidgetContainer,301,home)</onload>
<onload condition="System.AddonIsEnabled(script.favourites)">RunScript(script.favourites)</onload>
<onunload condition="Skin.HasSetting(home.netflix.autoplay.trailer)">ClearProperty(listitem.trailer,home)</onunload>
<controls>
<include>GlobalBackground</include>
Expand Down
2 changes: 1 addition & 1 deletion 1080i/Includes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<expression name="TrailerIsPlaying">String.IsEqual(Window(home).Property(TrailerPath2),Player.FileNameAndPath) + !String.IsEmpty(Player.FileNameAndPath)</expression>
<expression name="AutoTrailerDebugging">Skin.HasSetting(home.netflix.autoplay.trailer) + Skin.HasSetting(DebugInfo.extended) + Skin.HasSetting(DebugInfo.extended)</expression>
<expression name="ExtendedNowPlayingIsVisible">[Skin.HasSetting(extended.nowplaying) + Window.IsVisible(Home) + Player.HasMedia] + [[!ControlGroup(301).HasFocus() + !Control.HasFocus(8888) + !Control.HasFocus(4567)] | ControlGroup(777).HasFocus()]</expression>
<expression name="TitleClearlogoAvailable">[!String.IsEmpty(ListItem.Art(clearlogo)) | !String.IsEmpty(ListItem.Art(artist.clearlogo)) | !String.IsEmpty(ListItem.Art(tvshow.clearlogo))] + !Container.Content(episodes) + !Container.Content(seasons)</expression>
<expression name="TitleClearlogoAvailable">[!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)</expression>
<expression name="IsAudioCodecATMOS">
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)]]
Expand Down
2 changes: 2 additions & 0 deletions 1080i/Includes_Furniture.xml
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@
</variable>

<variable name="ClearLogoTopVar">
<value condition="Skin.HasSetting(enable.crop.clearlogo) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage))">$INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)]</value>
<value condition="Skin.HasSetting(enable.crop.clearlogo) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.base_clearlogo))">$INFO[Window(Home).Property(TMDbHelper.ListItem.base_clearlogo)]</value>
<value condition="!String.IsEmpty(ListItem.Art(clearlogo))">$INFO[ListItem.Art(clearlogo)]</value>
<value condition="!String.IsEmpty(ListItem.Art(tvshow.clearlogo))">$INFO[ListItem.Art(tvshow.clearlogo)]</value>
<value condition="!String.IsEmpty(ListItem.Art(artist.clearlogo))">$INFO[ListItem.Art(artist.clearlogo)]</value>
Expand Down
10 changes: 8 additions & 2 deletions 1080i/Includes_Home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4065,7 +4065,13 @@
<height>102</height>
<aspectratio scalediffuse="true" align="left">keep</aspectratio>
<texture background="true">$INFO[Container($PARAM[id]).ListItem.Art(clearlogo)]</texture>
<visible>$PARAM[visible] + Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + !String.IsEmpty(Container($PARAM[id]).ListItem.Art(clearlogo)) + !Skin.HasSetting(homemenu.clean.flix)</visible>
<visible>$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)</visible>
</control>
<control type="image" description="clearlogo" id="$PARAM[id]38">
<height>102</height>
<aspectratio scalediffuse="true" align="left">keep</aspectratio>
<texture background="true">$VAR[ClearLogo_Crop_Home]</texture>
<visible>$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)</visible>
</control>
<control type="label">
<include content="def_font" condition="Skin.HasSetting(homemenu.netflix)">
Expand All @@ -4080,7 +4086,7 @@
<textcolor>Dark1</textcolor>
<label>$PARAM[label]</label>
<include condition="Skin.HasSetting(labels.autoscroll)">LabelScroll</include>
<visible>$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)]</visible>
<visible>$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)]</visible>
</control>
</definition>
</include>
Expand Down
5 changes: 5 additions & 0 deletions 1080i/Includes_Images.xml
Original file line number Diff line number Diff line change
Expand Up @@ -471,4 +471,9 @@
<value condition="!String.IsEmpty(Window(home).Property(SkinHelperPING))">dialog/on.png</value>
<value>dialog/off.png</value>
</variable>

<variable name="ClearLogo_Crop_Home">
<value condition="Skin.HasSetting(enable.crop.clearlogo) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage))">$INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)]</value>
<value condition="Skin.HasSetting(enable.crop.clearlogo) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.base_clearlogo))">$INFO[Window(Home).Property(TMDbHelper.ListItem.base_clearlogo)]</value>
</variable>
</includes>
10 changes: 10 additions & 0 deletions 1080i/SkinSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2753,6 +2753,16 @@
<label>31078</label>
</control>
</control>
<control type="radiobutton" id="120001" description="Netflix preview window">
<width>1360</width>
<visible>ControlGroup(9100).HasFocus(9107)</visible>
<include>DefSettingsButtonGradientSkinSettings</include>
<label>31702</label>
<selected>Skin.HasSetting(enable.crop.clearlogo)</selected>
<onclick condition="!Skin.HasSetting(enable.crop.clearlogo)">Skin.SetBool(TMDbHelper.EnableCrop)</onclick>
<onclick condition="Skin.HasSetting(enable.crop.clearlogo)">Skin.Reset(TMDbHelper.EnableCrop)</onclick>
<onclick>Skin.ToggleSetting(enable.crop.clearlogo)</onclick>
</control>
<control type="radiobutton" id="12004">
<width>1360</width>
<align>left</align>
Expand Down
1 change: 1 addition & 0 deletions 1080i/Startup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<onload condition="Skin.HasSetting(lock.skinsettings) + !String.IsEqual(Skin.String(skintheme),SKINDEFAULT) + !String.IsEmpty(Skin.String(skintheme))">RunScript(script.embuary.helper,action=setkodisetting,setting=lookandfeel.skintheme,value=$INFO[Skin.String(skintheme)])</onload>
<onload condition="Skin.HasSetting(lock.skinsettings) + !String.IsEqual(Skin.String(skinfont),SKINDEFAULT) + !String.IsEmpty(Skin.String(skinfont))">RunScript(script.embuary.helper,action=setkodisetting,setting=lookandfeel.font,value=$INFO[Skin.String(skinfont)])</onload>
<onload condition="System.AddonIsEnabled(script.skin.info.service)">RunScript(script.skin.info.service)</onload>
<onload>Skin.Reset(TMDbHelper.MonitorContainer)</onload>

<!-- First start settings -->
<onload condition="!Skin.HasSetting(startup.init)">Skin.SetBool(global.hidecirles)</onload>
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -2575,4 +2575,8 @@ msgstr ""

msgctxt "#31701"
msgid "Color palette"
msgstr ""

msgctxt "#31702"
msgid "Use TMDB helper for clearlogo"
msgstr ""