Skip to content

Commit

Permalink
artwork indicator
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed May 2, 2024
1 parent 8304140 commit 40d5ddc
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 11 deletions.
2 changes: 1 addition & 1 deletion 16x9/Components_Viewtype_501_Billboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<include content="Artwork_Transition_Fade">
<param name="target_id" value="$PARAM[target_id]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<include content="Ken_Burns_Effect_Animation" condition="Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
<param name="kenburns" value="Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
</include>
</include>
</includes>
3 changes: 3 additions & 0 deletions 16x9/Components_Viewtype_504_Strip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<param name="height" value="$PARAM[height]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="art_diffuse" value="false" />
<param name="icon_width" value="50" />
<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
<param name="fallback" value="$PARAM[fallback]" />
<nested />
Expand Down Expand Up @@ -68,6 +69,7 @@
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="fallback" value="$PARAM[fallback]" />
<param name="art_diffuse" value="false" />
<param name="icon_width" value="$PARAM[icon_width]" />
<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
<param name="animationtype" value="$PARAM[animationtype]" />
<param name="animationeffect" value="$PARAM[animationeffect]" />
Expand Down Expand Up @@ -396,6 +398,7 @@
<param name="height" value="$PARAM[item_height]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="fallback" value="$PARAM[fallback]" />
<param name="icon_width" value="50" />
<param name="animationtype" value="Hidden" />
<param name="animationcondition" value="true" />
<param name="animationeffect" value="zoom" />
Expand Down
10 changes: 10 additions & 0 deletions 16x9/Components_Viewtype_505_Grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<param name="left" value="10" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="fallback" value="views/dark_grey_100.png" />
<param name="indicator" value="false" />
<param name="watched_diffuse" value="[Skin.HasSetting(GridView_WatchedStatus_Enabled) + String.IsEqual(ListItem.Overlay,OverlayWatched.png)] | [Container.Content(addons) + !ListItem.Property(Addon.IsEnabled)]" />
<param name="now_playing" value="$EXP[ListItem(0)_NowPlaying]" />
<include content="Visible_Fade_Animation" />
Expand All @@ -49,6 +50,10 @@
<param name="icon" value="Special_Addonbrowser_focused" />
<param name="visible" value="[!String.Contains(Container.FolderPath,/user/) + [ListItem.Property(Addon.IsInstalled) | String.Contains(ListItem.Label,Copacetic)]] | [$EXP[Container_Addons_NonRepo] + String.Contains(Container.FolderPath,/user/) + ListItem.Property(Addon.IsInstalled) + !ListItem.Property(Addon.IsEnabled)]" />
</include>
<include content="Icon_Component_Indicator_Grid" condition="Skin.HasSetting(Secondary_List_Enabled)">
<param name="visible" value="ListItem.IsCollection | [ListItem.HasVideoVersions + !String.IsEqual(Container.FolderName,ListItem.Title)]" />
<param name="backing" value="false" />
</include>
</include>
</include>

Expand Down Expand Up @@ -153,6 +158,7 @@
<include content="ListIcon_Static_Focused">
<param name="visible" value="$EXP[GridView_Display_Is$PARAM[displaytype_label]]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="indicator" value="false" />
<param name="now_playing" value="$EXP[ListItem(0)_NowPlaying]" />
<param name="fallback" value="views/dark_grey_100.png" />
<!-- Multiart -->
Expand Down Expand Up @@ -220,6 +226,10 @@
<param name="icon" value="Special_Addonbrowser_focused" />
<param name="visible" value="[!String.Contains(Container.FolderPath,/user/) + [ListItem.Property(Addon.IsInstalled) | String.Contains(ListItem.Label,Copacetic)]] | [$EXP[Container_Addons_NonRepo] + String.Contains(Container.FolderPath,/user/) + ListItem.Property(Addon.IsInstalled) + !ListItem.Property(Addon.IsEnabled)]" />
</include>
<!-- Indicator -->
<include content="Icon_Component_Indicator_Grid" condition="Skin.HasSetting(Secondary_List_Enabled)">
<param name="visible" value="ListItem.IsCollection | [ListItem.HasVideoVersions + !String.IsEqual(Container.FolderName,ListItem.Title)]" />
</include>
</control>
</definition>
</include>
Expand Down
6 changes: 6 additions & 0 deletions 16x9/Components_Viewtype_50_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<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="kenburns" default="false" />
<definition>
<control type="group">
<visible>$PARAM[visible]</visible>
Expand All @@ -26,6 +27,7 @@
<param name="art_diffuse" value="$PARAM[art_diffuse]" />
<param name="now_playing" value="false" />
<param name="fadetime" value="45" />
<include content="Ken_Burns_Effect_Animation" condition="$PARAM[kenburns]" />
</include>
<include content="Icon_Art">
<param name="texture" value="$VAR[$PARAM[art_icon](0)Content]" />
Expand All @@ -34,6 +36,10 @@
<param name="art_diffuse" value="$PARAM[art_diffuse]" />
<param name="now_playing" value="false" />
<param name="fadetime" value="360" />
<include content="Ken_Burns_Effect_Animation" condition="$PARAM[kenburns]" />
</include>
<include content="Icon_Component_Indicator" condition="Skin.HasSetting(Secondary_List_Enabled)">
<param name="visible" value="Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).IsCollection | [Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).HasVideoVersions + !String.IsEqual(Container($PARAM[target_id]).FolderName,Container.ListItemNoWrap($PARAM[position]).Title)]" />
</include>
<!-- Progress overlay -->
<include content="Icon_Component_Progress_Overlay" condition="$PARAM[has_progress] + [Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)]">
Expand Down
10 changes: 9 additions & 1 deletion 16x9/Content_Viewtype_Options.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,15 @@
<include name="Common_Menu_Options">
<param name="target_id" default="50" />
<definition>
<!-- Shared -->
<!-- globalsearch -->
<item>
<onclick>SetFocus(50)</onclick>
<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
<label>$LOCALIZE[137]</label>
<label2>$LOCALIZE[137]</label2>
<visible>Control.IsEnabled(8)</visible>
</item>
<!-- Shared -->
<!-- Sort -->
<item id="2">
<onclick>SetFocus($PARAM[target_id])</onclick>
Expand Down
64 changes: 64 additions & 0 deletions 16x9/Templates_Artwork.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,55 @@
</definition>
</include>

<include name="Icon_Component_Indicator">
<param name="visible" />
<param name="top" default="0" />
<param name="width" default="60" />
<definition>
<control type="group">
<visible>$PARAM[visible]</visible>
<nested />
<right>0</right>
<top>$PARAM[top]</top>
<width>$PARAM[width]</width>
<height>$PARAM[width]</height>
<control type="image">
<visible>!$EXP[TransparentDialog_IsVisible]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<texture colordiffuse="$VAR[Light_Color]">views/collection_indicator.png</texture>
</control>
</control>
</definition>
</include>

<include name="Icon_Component_Indicator_Grid">
<param name="visible" />
<param name="top" default="0" />
<param name="width" default="30" />
<param name="backing" default="true" />
<definition>
<control type="group">
<visible>$PARAM[visible]</visible>
<nested />
<right>0</right>
<top>$PARAM[top]</top>
<width>$PARAM[width]</width>
<height>$PARAM[width]</height>
<control type="group">
<visible>!$EXP[TransparentDialog_IsVisible]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<control type="image">
<visible>$PARAM[backing]</visible>
<texture colordiffuse="$VAR[Accent_Color]">views/white_100.png</texture>
</control>
<control type="image">
<texture colordiffuse="$VAR[Light_Color]">views/collection_indicator_grid.png</texture>
</control>
</control>
</control>
</definition>
</include>

<include name="Icon_Component_Progress_Overlay">
<param name="visible" default="true" />
<definition>
Expand Down Expand Up @@ -217,6 +266,7 @@
<param name="width" default="100%" />
<param name="height" default="100%" />
<param name="art_icon" default="Thumbnail" />
<param name="indicator" default="true" />
<param name="fadetime" default="0" />
<param name="now_playing_size" default="Large" />
<definition>
Expand All @@ -237,6 +287,10 @@
<param name="now_playing" value="$PARAM[now_playing]" />
</include>
<nested />
<include content="Icon_Component_Indicator" condition="Skin.HasSetting(Secondary_List_Enabled) + $PARAM[indicator]">
<param name="visible" value="Container.ListItemNoWrap($PARAM[position]).IsCollection | [Container.ListItemNoWrap($PARAM[position]).HasVideoVersions + !String.IsEqual(Container.FolderName,Container.ListItemNoWrap($PARAM[position]).Title)]" />
<param name="width" value="$PARAM[icon_width]" />
</include>
<!-- Now Playing icon -->
<include content="Now_Playing_Icon" condition="!Window.Is(loginscreen) + !Window.Is(addoninformation) + !Window.Is(videobookmarks)">
<param name="visible" value="$PARAM[now_playing]" />
Expand All @@ -255,6 +309,7 @@
<param name="width" default="100%" />
<param name="height" default="100%" />
<param name="art_icon" default="Thumbnail" />
<param name="indicator" default="true" />
<param name="now_playing_size" default="Large" />
<definition>
<control type="group">
Expand All @@ -276,6 +331,10 @@
<param name="now_playing" value="$PARAM[now_playing]" />
</include>
<nested />
<include content="Icon_Component_Indicator" condition="Skin.HasSetting(Secondary_List_Enabled) + $PARAM[indicator]">
<param name="visible" value="Container.ListItemNoWrap($PARAM[position]).IsCollection | [Container.ListItemNoWrap($PARAM[position]).HasVideoVersions + !String.IsEqual(Container.FolderName,Container.ListItemNoWrap($PARAM[position]).Title)]" />
<include content="Secondary_List_Scroll_Animation" />
</include>
<!-- Now Playing icon -->
<control type="group">
<include content="Secondary_List_Scroll_Animation" />
Expand All @@ -298,6 +357,7 @@
<param name="width" default="100%" />
<param name="height" default="100%" />
<param name="art_icon" default="Thumbnail" />
<param name="indicator" default="true" />
<param name="now_playing_size" default="Large" />
<param name="animationeffect" default="fade" />
<param name="animationend" default="100" />
Expand All @@ -324,6 +384,10 @@
<param name="now_playing" value="$PARAM[now_playing]" />
</include>
<nested />
<include content="Icon_Component_Indicator" condition="Skin.HasSetting(Secondary_List_Enabled) + $PARAM[indicator]">
<param name="visible" value="Container.ListItemNoWrap($PARAM[position]).IsCollection | [Container.ListItemNoWrap($PARAM[position]).HasVideoVersions + !String.IsEqual(Container.FolderName,Container.ListItemNoWrap($PARAM[position]).Title)]" />
<param name="width" value="$PARAM[icon_width]" />
</include>
<include content="Now_Playing_Icon" condition="!Window.Is(loginscreen) + !Window.Is(addoninformation) + !Window.Is(videobookmarks)">
<param name="visible" value="$PARAM[now_playing]" />
<param name="size" value="$PARAM[now_playing_size]" />
Expand Down
7 changes: 0 additions & 7 deletions 16x9/Templates_MyWindows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,13 +766,6 @@
</include>
</focusedlayout>
<content>
<item>
<onclick>SetFocus(50)</onclick>
<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
<label>$LOCALIZE[137]</label>
<label2>$LOCALIZE[137]</label2>
<visible>Control.IsEnabled(8)</visible>
</item>
<include content="ListView_Menu_Options" condition="!Skin.HasSetting(Kiosk_Mode)" />
<include content="BillboardView_Menu_Options" condition="$EXP[BillboardView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
<include content="ShowcaseView_Menu_Options" condition="$EXP[ShowcaseView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Viewtype_50_List.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<param name="visible" value="[$EXP[ListView_Display_IsBackground] + !$EXP[Content_HasBackground] + !Container.Content()] | Window.Is(videoplaylist)" />
<param name="target_id" value="$PARAM[id]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<include content="Ken_Burns_Effect_Animation_Views" condition="Skin.HasSetting(List_Ken_Burns_Effect)" />
<param name="kenburns" value="Skin.HasSetting(List_Ken_Burns_Effect)" />
</include>
</include>
</definition>
Expand Down
7 changes: 7 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc

### Changelog
---
**1.3.4**
- Added visual listitem indicator for Collections (sets) and items with VideoVersions
- Added tvchannels window
- Improved tvguide window
- Fixed issue with path tracer when navigating from one infoscreen widget to a new infoscreen. On pressing back, instead of going to the back to the previous infoscreen, Copacetic was closing all dialogs and the main lists were remaining hidden.
- Staying idle on global search home button will now trigger screensaver if it is active

**1.3.4**
- fix for globalsearch scrollbar colour

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.3.4" name="Copacetic" provider-name="realcopacetic">
<addon id="skin.copacetic" version="1.3.5" name="Copacetic" provider-name="realcopacetic">
<requires>
<import addon="xbmc.gui" version="5.17.0" />
<import addon="script.copacetic.helper" version="1.0.12" />
Expand Down
Binary file added media/views/collection_indicator.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.
Binary file added media/views/collection_indicator_grid.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 40d5ddc

Please sign in to comment.