Skip to content

Commit

Permalink
Background label
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Mar 30, 2024
1 parent ef9be99 commit 15a41b0
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 36 deletions.
42 changes: 23 additions & 19 deletions 16x9/Components.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
<param name="content_source" default="Background_Global_Content" />
<param name="fadein_animation_condition" default="true" />
<param name="fadeout_animation_condition" default="true" />
<param name="include_label" default="true" />
<definition>
<include content="Background_List" condition="$PARAM[include_list]">
<param name="content_source" value="$PARAM[content_source]" />
Expand All @@ -108,17 +109,31 @@
<include content="Background_Multiart_Template">
<param name="transition_time" value="$PARAM[time]" />
</include>
<control type="multiimage">
<control type="group">
<include content="WindowOpenClose_Fade_Delayed_Animation">
<param name="fadein_condition" value="$PARAM[fadein_animation_condition]" />
<param name="fadeout_condition" value="$PARAM[fadeout_animation_condition]" />
</include>
<imagepath>$PARAM[texture_path]</imagepath>
<colordiffuse>$PARAM[colordiffuse]</colordiffuse>
<aspectratio>scale</aspectratio>
<fadetime>$PARAM[fadetime]</fadetime>
<timeperimage>$PARAM[time]</timeperimage>
<randomize>true</randomize>
<control type="multiimage">
<imagepath>$PARAM[texture_path]</imagepath>
<colordiffuse>$PARAM[colordiffuse]</colordiffuse>
<aspectratio>scale</aspectratio>
<fadetime>$PARAM[fadetime]</fadetime>
<timeperimage>$PARAM[time]</timeperimage>
<randomize>true</randomize>
</control>
<include content="Common_Details_Textbox" condition="$PARAM[include_label] + [[Window.Is(home) + Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled)] | Skin.HasSetting(Background_Label_Enabled)]">
<param name="visible" value="[Window.Is(home) + Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled) + String.IsEmpty(Control.Getlabel(6310)) + Control.HasFocus(4300) + !$EXP[TransparentDialog_IsVisible]] | Skin.HasSetting(Background_Label_Enabled)" />
<param name="gap" value="1010" />
<param name="maxheight" value="60" />
<param name="font" value="Description" />
<param name="color" value="$VAR[Unfocused_Color]" />
<param name="label" value="$VAR[Background_Label]" />
<param name="align" value="left" />
<include content="Visible_Fade_Delayed_Animation" />
<left>10</left>
<right>10</right>
</include>
</control>
</definition>
</include>
Expand All @@ -136,6 +151,7 @@
<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
<param name="texture_path" value="$PARAM[texture_path]" />
<param name="fadetime" value="0" />
<param name="include_label" value="false" />
<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
</include>
Expand Down Expand Up @@ -218,18 +234,6 @@
<bottom>60</bottom>
<fadetime>360</fadetime>
</include>
<include content="Common_Details_Textbox" condition="Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled)">
<param name="visible" value="String.IsEmpty(Control.Getlabel(6310)) + Control.HasFocus(4300) + !$EXP[TransparentDialog_IsVisible]" />
<param name="gap" value="990" />
<param name="maxheight" value="60" />
<param name="font" value="Default_Settings_List" />
<param name="color" value="$VAR[Unfocused_Color]" />
<param name="label" value="$VAR[Background_Home_Label]" />
<param name="align" value="left" />
<include content="Visible_Fade_Delayed_Animation" />
<left>30</left>
<right>30</right>
</include>
</include>

<include name="Embedded_VideoPlayer">
Expand Down
15 changes: 11 additions & 4 deletions 16x9/Content_Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<param name="label" value="$LOCALIZE[31426]" />
<param name="label2" value="$VAR[skinsettings_Background_Slideshow_Label]" />
<param name="category" value="16" />
<param name="previous" value="1607" />
<param name="previous" value="1608" />
<param name="id" value="1601" />
<param name="next" value="1602" />
</include>
Expand Down Expand Up @@ -424,18 +424,25 @@
<param name="id" value="1605" />
<param name="next" value="1606" />
</include>
<control type="label" id="1606">
<control type="radiobutton" id="1606">
<description>Show the name of currently displaying background artworks</description>
<visible>ControlGroup(9).HasFocus(16)</visible>
<label>$LOCALIZE[31495]</label>
<onclick>Skin.ToggleSetting(Background_Label_Enabled)</onclick>
<selected>Skin.HasSetting(Background_Label_Enabled)</selected>
</control>
<control type="label" id="1607">
<description>Home</description>
<visible>ControlGroup(9).HasFocus(16)</visible>
<include content="skinsettings_Default_Label" />
<label>$LOCALIZE[31401]</label>
</control>
<control type="radiobutton" id="1607">
<control type="radiobutton" id="1608">
<description>Override home menu backgrounds</description>
<visible>ControlGroup(9).HasFocus(16)</visible>
<label>$LOCALIZE[31433]</label>
<onclick>Skin.ToggleSetting(Home_Background_Override_Enabled)</onclick>
<selected>Skin.HasSetting(Home_Background_Override_Enabled)</selected>
<visible>ControlGroup(9).HasFocus(16)</visible>
</control>

<!--Home-->
Expand Down
24 changes: 11 additions & 13 deletions 16x9/Variables_Labels_Media.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,21 @@
<value>$LOCALIZE[31474] $VAR[Copacetic_Divider] $LOCALIZE[34222]</value>
</variable>

<variable name="Background_Home_Label">
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_title))">$INFO[Window(home).Property(background_custom_title)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(background_global_title))">$INFO[Window(home).Property(background_global_title)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_videos_title))">$INFO[Window(home).Property(background_videos_title)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(background_movies_title))">$INFO[Window(home).Property(background_movies_title)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_title))">$INFO[Window(home).Property(background_tvhsows_title)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(background_artists_title))">$INFO[Window(home).Property(background_artists_title)]</value>
<value condition="!Skin.HasSetting(Home_Background_Override_Enabled) + !String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist)) + !String.IsEmpty(Container(3300).ListItem.Label)">$INFO[Container(3300).ListItem.Label]</value>
<value condition="!Skin.HasSetting(Home_Background_Override_Enabled) + !String.IsEmpty(Container(3000).ListItem.Property(background)) + !String.IsEmpty(Container(3000).ListItem.Label)">$INFO[Container(3000).ListItem.Label]</value>
<value condition="!Skin.HasSetting(Home_Background_Override_Enabled) + !String.IsEmpty(Container(3300).ListItem.Label)">$INFO[Container(3300).ListItem.Label]</value>
<value>xx</value>
<variable name="Background_Label">
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_title))">$INFO[Window(home).Property(background_custom_title)]</value>
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(background_global_title))">$INFO[Window(home).Property(background_global_title)]</value>
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_videos_title))">$INFO[Window(home).Property(background_videos_title)]</value>
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(background_movies_title))">$INFO[Window(home).Property(background_movies_title)]</value>
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_title))">$INFO[Window(home).Property(background_tvhsows_title)]</value>
<value condition="[Skin.HasSetting(Home_Background_Override_Enabled) | !Window.Is(home)] + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(background_artists_title))">$INFO[Window(home).Property(background_artists_title)]</value>
<value condition="Window.Is(home) + !Skin.HasSetting(Home_Background_Override_Enabled) + !String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist))">$INFO[Container(3300).ListItem.Label]</value>
<value condition="Window.Is(home) + !Skin.HasSetting(Home_Background_Override_Enabled) + String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist)) + String.IsEmpty(Container(3000).ListItem.Property(background))">$INFO[Container(3300).ListItem.Label]</value>
</variable>

<variable name="Genre_Label">
<!-- Genres / Genre -->
<value condition="String.Contains(ListItem.Genre,/)">$LOCALIZE[135]</value>
<value>$LOCALIZE[]515</value>
<value condition="String.Contains(ListItem.Genre)">$LOCALIZE[135]</value>
<value>$LOCALIZE[515]</value>
</variable>

<variable name="Info_Label">
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
---
**1.1.25**
- Fixed label to show on homescreen screensaver when no clearlogo present
- Added option to make artwork label presistent all the time on all background screens.
- Fixed typo causing wrong localised label to display for genre on infosceen https://github.com/realcopacetic/skin.copacetic/issues/116
- Added always available background label to show name of currently displayed fanart. Enable it in Settings > Copacetic > Background. If disabled, the label will be shown as a fallback during home screensaver if option to show clearlogos is enabled, but clearlogo for current listitem is not present https://github.com/realcopacetic/skin.copacetic/issues/124 https://github.com/realcopacetic/skin.copacetic/issues/120
Still to do:
- OSD : (still to update --> Buttons, Settings, Stars, icon_Player)
- login background
Expand Down
6 changes: 6 additions & 0 deletions language/resource.language.en_gb/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,12 @@ msgctxt "#31532"
msgid "Customise background slideshows, brightness and panel opacity"
msgstr ""

#: NEW
#/16x9/Content_Settings.xml
msgctxt "#31495"
msgid "Show the name of the current displayed background"
msgstr ""

#/16x9/Content_Settings.xml
msgctxt "#31433"
msgid "Override home background with global slideshow"
Expand Down

0 comments on commit 15a41b0

Please sign in to comment.