Skip to content

Commit

Permalink
now_playing expressions update
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Apr 3, 2024
1 parent d4b1657 commit 4d88995
Show file tree
Hide file tree
Showing 10 changed files with 130 additions and 25 deletions.
2 changes: 1 addition & 1 deletion 16x9/Components_Viewtype_502_Showcase.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
<control type="grouplist">
<left>30</left>
<right>30</right>
<visible>$EXP[ShowcaseView_Details_Overlay_IsVisible] + [[!Control.HasFocus(3100) + !$EXP[ListItem(0)_NowPlaying]] | [Control.HasFocus(3100) + !$EXP[Secondary_List_NowPlaying_External]]]</visible>
<visible>$EXP[ShowcaseView_Details_Overlay_IsVisible] + [[!Control.HasFocus(3100) + !$EXP[ListItem(0)_NowPlaying]] | $EXP[3100_ListItem(0)_NowPlaying]]</visible>
<orientation>vertical</orientation>
<align>center</align>
<itemgap>0</itemgap>
Expand Down
3 changes: 2 additions & 1 deletion 16x9/Components_Viewtype_50_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
<param name="aspectratio" default="scale" />
<param name="art_diffuse" default="!$EXP[ListView_Display_IsThumbnails] | Window.Is(videoplaylist)" />
<param name="has_progress" default="false" />
<param name="ken_burns" default="false" />
<definition>
<control type="group">
<include content="Ken_Burns_Effect_Animation_Views" condition="Skin.HasSetting(List_Ken_Burns_Effect) | Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
<include content="Ken_Burns_Effect_Animation_Views" condition="$PARAM[ken_burns] + [Skin.HasSetting(List_Ken_Burns_Effect) | Skin.HasSetting(Billboard_Ken_Burns_Effect)]" />
<visible>$PARAM[visible]</visible>
<include content="Secondary_List_Scroll_Animation" />
<width>$PARAM[width]</width>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Custom_1199_Test_Label.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</control>
<control type="label">
<align>right</align>
<label>$INFO[Window(home).Property(background_global_title)]</label>
<label>$INFO[Window(home).Property(VideoPlayer_SetID)]</label>
<height>200</height>
</control>
</controls>
Expand Down
118 changes: 108 additions & 10 deletions 16x9/Expressions.xml
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions 16x9/Extras_Secondary_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
<control type="group">
<control type="image">
<include content="Dialog_Over_Artwork_Fadediffuse_Animation" />
<animation effect="fadediffuse" end="ff808080" time="0" condition="$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | [$EXP[ShowcaseView_IsVisible] + $EXP[ShowcaseView_Details_Overlay_IsVisible] + !$EXP[Secondary_List_NowPlaying]]">Conditional</animation>
<animation effect="fadediffuse" end="ff555555" time="0" condition="$EXP[Secondary_List_NowPlaying] + [$EXP[ShowcaseView_IsVisible] | $EXP[StripView_IsVisible]]">Conditional</animation>
<animation effect="fadediffuse" end="ff808080" time="0" condition="$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible] | [$EXP[ShowcaseView_IsVisible] + $EXP[ShowcaseView_Details_Overlay_IsVisible] + !$EXP[3100_ListItem(0)_NowPlaying]]">Conditional</animation>
<animation effect="fadediffuse" end="ff555555" time="0" condition="$EXP[3100_ListItem(0)_NowPlaying] + [$EXP[ShowcaseView_IsVisible] | $EXP[StripView_IsVisible]]">Conditional</animation>
<texture background="true">$VAR[$PARAM[artwork](0)Content]</texture>
<aspectratio>scale</aspectratio>
</control>
Expand Down Expand Up @@ -114,7 +114,7 @@

<include name="Secondary_List_Now_Playing">
<control type="group">
<visible>$EXP[Secondary_List_NowPlaying] + [$EXP[ShowcaseView_IsVisible] | $EXP[StripView_IsVisible]]</visible>
<visible>$EXP[3100_ListItem(0)_NowPlaying] + [$EXP[ShowcaseView_IsVisible] | $EXP[StripView_IsVisible]]</visible>
<include content="Now_Playing_Icon">
<param name="size" value="Large" />
<param name="color" value="$VAR[Light_Color]" />
Expand Down
16 changes: 8 additions & 8 deletions 16x9/Notifications.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@
<!-- List Thumbnails -->
<include content="$PARAM[type]_Widget" condition="Window.IsVisible(videos) | Window.IsVisible(music) | Window.IsVisible(musicplaylist) | Window.IsVisible(addonbrowser) | Window.IsVisible(programs) | Window.IsVisible(pictures)">
<param name="id" value="6501" />
<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="progress_top" value="174" />
<param name="label_padding" value="30" />
Expand All @@ -557,7 +557,7 @@
<!-- Showcase -->
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music)] + Skin.HasSetting(ShowcaseView_Enabled)">
<param name="id" value="6502" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsPosters] + !$EXP[ShowcaseView_Details_Off] + $EXP[Music_Player_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsPosters] + !$EXP[ShowcaseView_Details_Off] + $EXP[Music_Player_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="height" value="360" />
<param name="align" value="left" />
Expand All @@ -571,7 +571,7 @@
<!-- Strip -->
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music) | Window.IsVisible(addonbrowser) | Window.IsVisible(programs)] + Skin.HasSetting(StripView_Enabled)">
<param name="id" value="6503" />
<param name="visible" value="$EXP[StripView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[StripView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="align" value="right" />
<param name="height" value="240" />
Expand All @@ -590,7 +590,7 @@
<!-- Grid -->
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music) | Window.IsVisible(addonbrowser) | Window.IsVisible(programs)] + Skin.HasSetting(GridView_Enabled)">
<param name="id" value="6504" />
<param name="visible" value="$EXP[GridView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[GridView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="height" value="180" />
<param name="label_padding" value="30" />
Expand Down Expand Up @@ -636,7 +636,7 @@
<!-- List Thumbnails -->
<include content="$PARAM[type]_Widget" condition="Window.IsVisible(videos) | Window.IsVisible(music) | Window.IsVisible(musicplaylist) | Window.IsVisible(addonbrowser) | Window.IsVisible(programs) | Window.IsVisible(pictures)">
<param name="id" value="6506" />
<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[ListView_Display_IsThumbnails] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="background_visible" value="$PARAM[background_visible]" />
<param name="label_width" value="960" />
Expand All @@ -650,7 +650,7 @@
<!-- Showcase -->
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music)] + Skin.HasSetting(ShowcaseView_Enabled)">
<param name="id" value="6507" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsSquare] + !$EXP[Background_IsFanart] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsSquare] + !$EXP[Background_IsFanart] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="background_visible" value="$PARAM[background_visible]" />
<param name="label_width" value="630" />
Expand All @@ -663,7 +663,7 @@
</include>
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music)] + Skin.HasSetting(ShowcaseView_Enabled)">
<param name="id" value="6508" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsPosters] + !$EXP[Background_IsFanart] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[ShowcaseView_Display_IsPosters] + !$EXP[Background_IsFanart] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="background_visible" value="$PARAM[background_visible]" />
<param name="label_width" value="1020" />
Expand All @@ -677,7 +677,7 @@
<!-- Grid -->
<include content="$PARAM[type]_Widget" condition="[Window.IsVisible(videos) | Window.IsVisible(music) | Window.IsVisible(addonbrowser) | Window.IsVisible(programs)] + Skin.HasSetting(GridView_Enabled)">
<param name="id" value="6509" />
<param name="visible" value="$EXP[GridView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible]" />
<param name="visible" value="$EXP[GridView_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[Trailer_Autoplay_IsVisible] + !Window.IsVisible(home)" />
<param name="content_visible" value="$PARAM[content_visible]" />
<param name="background_visible" value="$PARAM[background_visible]" />
<param name="label_width" value="900" />
Expand Down
1 change: 1 addition & 0 deletions 16x9/Viewtype_50_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<param name="visible" value="[$EXP[ListView_Display_IsBackground] + !$EXP[Containers_Background] + !Container.Content()] | Window.Is(videoplaylist)" />
<param name="target_id" value="$PARAM[id]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="ken_burns" value="true" />
</include>
</include>
</definition>
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc

### Changelog
---
**1.1.26**
- Added fix to prevent multiple volume bars showing when audio is muted and scrolling through home screen widgets
- Cleaned up Now_Playing expressions
- Added Now_Playing for current set using window property from script.copacetic.helper added in 1.0.13 https://github.com/realcopacetic/skin.copacetic/issues/132

**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.
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.copacetic" version="1.1.25" name="Copacetic" provider-name="realcopacetic">
<addon id="skin.copacetic" version="1.1.26" name="Copacetic" provider-name="realcopacetic">
<requires>
<import addon="xbmc.gui" version="5.16.0" />
<import addon="script.copacetic.helper" version="1.0.12" />
Expand Down
Binary file added media/flags/studios/Twentieth Century Fox.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4d88995

Please sign in to comment.