Skip to content

Commit

Permalink
kep in sync with script changes
Browse files Browse the repository at this point in the history
  • Loading branch information
realcopacetic committed Oct 15, 2024
1 parent 408ba17 commit 214c370
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 16 deletions.
6 changes: 4 additions & 2 deletions 16x9/Variables_Labels_Media.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@
<variable name="Background_Label">
<value condition="Window.IsVisible(loginscreen) + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Label]</value>
<value condition="!String.Contains(Container.FolderPath,plugin://) + $EXP[Content_HasBackground] + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Label]</value>
<value condition="Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_title)]</value>
<value condition="Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_title)]</value>
<value condition="Window.IsVisible(music) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_title)]</value>
<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,Videos) + !String.IsEmpty(Window(home).Property(background_video_title))">$INFO[Window(home).Property(background_video_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_tvshows_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>
Expand Down Expand Up @@ -932,6 +932,8 @@
<variable name="Title_Label">
<value condition="VideoPlayer.IsFullscreen + String.IsEmpty(VideoPlayer.DBID) + String.Contains(VideoPlayer.Title,.) + !String.IsEmpty(Window(home).Property(Return_Label))">$INFO[Window(home).Property(Return_Label)]</value>
<value condition="VideoPlayer.IsFullscreen + !String.IsEmpty(VideoPlayer.Title)">$INFO[VideoPlayer.Title]</value>
<value condition="VideoPlayer.IsFullscreen + Window.Is(videoosd) + String.isEqual(VideoPlayer.DBID,episode) + Integer.IsGreater(VideoPlayer.Episode,9)">$INFO[VideoPlayer.Season]$INFO[VideoPlayer.Episode,x]$INFO[VIdeoPlayer.Title,. ]</value>
<value condition="VideoPlayer.IsFullscreen + Window.Is(videoosd) + String.isEqual(VideoPlayer.DBID,episode) + Integer.IsGreater(VideoPlayer.Episode,0)">$INFO[VideoPlayer.Season]$INFO[VideoPlayer.Episode,x0]$INFO[VIdeoPlayer.Title,. ]</value>
<value condition="[Window.Is(pvrguideinfo) | Window.Is(tvsearch)] + !String.IsEmpty(ListItem.EpisodeName)">$INFO[ListItem.EpisodeName]</value>
<value condition="Window.Is(addoninformation) + !String.IsEmpty(ListItem.AddonName)">$INFO[ListItem.AddonName]</value>
<value condition="$EXP[Infoscreen_Widget_HasFocus]">$VAR[Title_Label_Infoscreen_Widgets]</value>
Expand Down
14 changes: 7 additions & 7 deletions 16x9/Variables_Textures_Artwork_Media.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<variable name="Background_Global_Texture">
<value condition="Window.IsVisible(loginscreen) + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
<value condition="!String.Contains(Container.FolderPath,plugin://) + $EXP[Content_HasBackground] + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
<value condition="Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_fanart)]</value>
<value condition="Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_fanart)]</value>
<value condition="Window.IsVisible(music) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Custom) + Skin.String(Background_Slideshow2_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_fanart))">$INFO[Window(home).Property(background_custom_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Global) + !String.IsEmpty(Window(home).Property(background_global_fanart))">$INFO[Window(home).Property(background_global_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Movies) + !String.IsEmpty(Window(home).Property(background_movies_fanart))">$INFO[Window(home).Property(background_movies_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_fanart))">$INFO[Window(home).Property(background_tvshows_fanart)]</value>
<value condition="Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Artists) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_fanart))">$INFO[Window(home).Property(background_custom_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(background_global_fanart))">$INFO[Window(home).Property(background_global_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(background_movies_fanart))">$INFO[Window(home).Property(background_movies_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_fanart))">$INFO[Window(home).Property(background_tvshows_fanart)]</value>
<value condition="Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_fanart)]</value>
Expand All @@ -23,13 +23,13 @@
<variable name="Background_Home_Texture">
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Custom) + Skin.String(Background_Slideshow2_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_fanart))">$INFO[Window(home).Property(background_custom_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Global) + !String.IsEmpty(Window(home).Property(background_global_fanart))">$INFO[Window(home).Property(background_global_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Movies) + !String.IsEmpty(Window(home).Property(background_movies_fanart))">$INFO[Window(home).Property(background_movies_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_fanart))">$INFO[Window(home).Property(background_tvshows_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Artists) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_fanart)]</value>
<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_fanart))">$INFO[Window(home).Property(background_custom_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(background_global_fanart))">$INFO[Window(home).Property(background_global_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_videos_fanart))">$INFO[Window(home).Property(background_videos_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_video_fanart))">$INFO[Window(home).Property(background_video_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(background_movies_fanart))">$INFO[Window(home).Property(background_movies_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_fanart))">$INFO[Window(home).Property(background_tvshows_fanart)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(background_artists_fanart))">$INFO[Window(home).Property(background_artists_fanart)]</value>
Expand All @@ -43,13 +43,13 @@
<variable name="Background_Home_Clearlogo_Texture">
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Custom) + Skin.String(Background_Slideshow2_Custom_Path) + !String.IsEmpty(Window(home).Property(background_custom_clearlogo))">$INFO[Window(home).Property(background_custom_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Global) + !String.IsEmpty(Window(home).Property(background_global_clearlogo))">$INFO[Window(home).Property(background_global_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_videos_clearlogo))">$INFO[Window(home).Property(background_videos_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Videos) + !String.IsEmpty(Window(home).Property(background_video_clearlogo))">$INFO[Window(home).Property(background_video_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Movies) + !String.IsEmpty(Window(home).Property(background_movies_clearlogo))">$INFO[Window(home).Property(background_movies_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_clearlogo))">$INFO[Window(home).Property(background_tvshows_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.HasSetting(Background_Slideshow2) + String.Contains(Window(home).Property(CurrentSlideshow),2) + Skin.String(Background_Slideshow2,Artists) + !String.IsEmpty(Window(home).Property(background_artists_clearlogo))">$INFO[Window(home).Property(background_artists_clearlogo)]</value>
<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_clearlogo))">$INFO[Window(home).Property(background_custom_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(background_global_clearlogo))">$INFO[Window(home).Property(background_global_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_videos_clearlogo))">$INFO[Window(home).Property(background_videos_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(background_video_clearlogo))">$INFO[Window(home).Property(background_video_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(background_movies_clearlogo))">$INFO[Window(home).Property(background_movies_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(background_tvshows_clearlogo))">$INFO[Window(home).Property(background_tvshows_clearlogo)]</value>
<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(background_artists_clearlogo))">$INFO[Window(home).Property(background_artists_clearlogo)]</value>
Expand Down
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc

### Changelog
---
**2.6.8**
- Fix for secondary slideshow time slider

**2.6.7**
- All views enabled for favouritesbrowser in Omega https://github.com/realcopacetic/skin.copacetic/issues/202
**2.6.9**

To do:
- !string.isempty(listitem(0).art(album.fanart))]
- Video player breadcrumb on OSD for episodes
- grid spotlight artwork glitch
- cast / role showin /role even when norole
- pvr switching from windows to fullscreen there's a transition animation but it should be instant
- detailed list
- progress bar
Expand Down Expand Up @@ -56,6 +54,13 @@ To do:
= <!-- temp fix to account for fact that DecreaseRating won't go lower than 1 for VideoPlayer.UserRating -->
- https://github.com/jurialmunkey/plugin.video.themoviedb.helper/wiki/Replacing-Extended-Info#direct-call-auto


**2.6.8**
- Fix for secondary slideshow time slider

**2.6.7**
- All views enabled for favouritesbrowser in Omega https://github.com/realcopacetic/skin.copacetic/issues/202

**2.6.6**
- Added second slideshow, configurable in Copacetic skin settings with option to set timers for both so you can switch between slideshows at different times of day. Useful e.g. for having kid-friendly slideshow in the daytime then switching to a different slideshow in the evening.
- Added more slideshow interval lengths (60 seconds, 5 minutes, 10 minutes, 15 minutes)
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
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="2.6.8" name="Copacetic" provider-name="realcopacetic">
<addon id="skin.copacetic" version="2.6.9" name="Copacetic" provider-name="realcopacetic">
<requires>
<import addon="xbmc.gui" version="5.17.0" />
<import addon="script.copacetic.helper" version="1.1.0" />
Expand Down
Binary file removed media/flags/studios/Sky 1.png
Binary file not shown.
Binary file removed media/flags/studios/Sky Arts.png
Binary file not shown.
Binary file removed media/flags/studios/Sky News.png
Binary file not shown.

0 comments on commit 214c370

Please sign in to comment.