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.

Sign up for GitHub

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] #1014

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[ClearLogo TMDBhelper] #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0027427
[ClearLogo TMDBhelper]
beatmasterRS Jul 29, 2023
4ecc96f
[Update]
beatmasterRS Jul 29, 2023
3c3b502
[Update]
beatmasterRS Jul 30, 2023
e9c7b6d
Merge branch 'master' into clear-logo-2
beatmasterRS Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions 1080i/Includes_Furniture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@
</variable>

<variable name="ClearLogoTopVar">
<value condition="Skin.HasSetting(tmdbhelper.enablecrop) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage))">$INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)]</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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4073,7 +4073,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(tmdbhelper.enablecrop) + !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">$INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)]</texture>
<visible>$PARAM[visible] + Skin.HasSetting(home.netflix.clearlogo) + Skin.HasSetting(homemenu.netflix) + [Skin.HasSetting(tmdbhelper.enablecrop) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage))] + !Skin.HasSetting(homemenu.clean.flix)</visible>
</control>
<control type="label">
<include content="def_font" condition="Skin.HasSetting(homemenu.netflix)">
Expand All @@ -4088,7 +4094,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(tmdbhelper.enablecrop)] | [String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage)) + Skin.HasSetting(tmdbhelper.enablecrop)]]]] | !Skin.HasSetting(homemenu.netflix)]</visible>
</control>
</definition>
</include>
Expand Down
1 change: 1 addition & 0 deletions 1080i/Includes_Images.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
</variable>

<variable name="ClearLogoHome">
<value condition="Skin.HasSetting(tmdbhelper.enablecrop) + !String.IsEmpty(Window(Home).Property(TMDbHelper.ListItem.cropimage))">$INFO[Window(Home).Property(TMDbHelper.ListItem.cropimage)]</value>
<value condition="!String.IsEmpty(Container(301).ListItem.Art(tvshow.clearlogo))">$INFO[Container(301).ListItem.Art(tvshow.clearlogo)]</value>
<value condition="!String.IsEmpty(Container(301).ListItem.Art(clearlogo))">$INFO[Container(301).ListItem.Art(clearlogo)]</value>
<value condition="!String.IsEmpty(Container(301).ListItem.Art(artist.clearlogo))">$INFO[Container(301).ListItem.Art(artist.clearlogo)]</value>
Expand Down
8 changes: 8 additions & 0 deletions 1080i/SkinSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2792,6 +2792,14 @@
<selected>Skin.HasSetting(NewTime)</selected>
<onclick>Skin.ToggleSetting(NewTime)</onclick>
</control>
<control type="radiobutton" id="12044">
<width>1360</width>
<visible>ControlGroup(9100).HasFocus(9107)</visible>
<include>DefSettingsButtonGradientSkinSettings</include>
<label>31714</label>
<selected>Skin.HasSetting(tmdbhelper.enablecrop)</selected>
<onclick>Skin.ToggleSetting(tmdbhelper.enablecrop)</onclick>
</control>
<control type="radiobutton" id="12005">
<width>1360</width>
<visible>ControlGroup(9100).HasFocus(9107)</visible>
Expand Down
4 changes: 4 additions & 0 deletions language/resource.language.en_gb/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2609,6 +2609,10 @@ msgctxt "#31711"
msgid "Wikipedia"
msgstr ""

msgctxt "#31714"
msgid "Use TMDB helper for clear logo"
msgstr ""

msgctxt "#31718"
msgid "Sandy yellow"
msgstr ""