Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
realcopacetic committed Oct 30, 2024
1 parent eece636 commit c8f8fa5
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 21 deletions.
9 changes: 9 additions & 0 deletions 16x9/Animations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,15 @@
</include>
</include>

<include name="Infoline_Fade_Animation">
<include content="fade_animation">
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
<param name="condition" value="!Control.IsVisible(5007)" />
</include>
</include>

<include name="Ken_Burns_Effect_Animation">
<animation type="Conditional" pulse="true" condition="true" reversible="true">
<effect type="zoom" center="auto" end="108" time="21000" tween="sine" easing="inout" />
Expand Down
4 changes: 2 additions & 2 deletions 16x9/Components_OSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<include name="Player_Status_Icons_Label">
<definition>
<control type="label">
<visible>Player.Rewinding | Player.Forwarding | !String.IsEmpty(Player.SeekStepSize) | [!String.IsEmpty(Player.SeekOffset) + Player.HasPerformedSeek(3)] | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)]</visible>
<visible>Player.Rewinding | Player.Forwarding | Player.Seeking | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(Player.SeekStepSize) | [!String.IsEmpty(Player.SeekOffset) + Player.HasPerformedSeek(3)] | [Window.Is(videoosd) + VideoPlayer.Content(livetv) + !String.IsEmpty(PVR.TimeShiftOffset)]</visible>
<include content="Visible_Fade_Delayed_Animation" />
<width>360</width>
<centerleft>50%</centerleft>
Expand Down Expand Up @@ -400,7 +400,7 @@
<include content="Player_Status_Icons_Label" condition="$PARAM[large_label]">
<param name="color" value="$PARAM[color]" />
<param name="font" value="Player_Status" />
<animation effect="slide" end="0,90" condition="true">Conditional</animation>
<animation effect="slide" end="0,90" condition="Player.Rewinding | Player.Forwarding">Conditional</animation>
</include>
<include content="Player_Status_Icons_Label" condition="$PARAM[small_label]">
<param name="color" value="$PARAM[color]" />
Expand Down
44 changes: 34 additions & 10 deletions 16x9/Components_Viewtypes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
<onunfocus condition="Skin.TimerIsRunning(trailer_autoplay_home)">Skin.TimerStop(trailer_autoplay_home)</onunfocus>
<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunfocus>
<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunfocus>
<!-- infoline_changer timer -->
<onfocus condition="Skin.TimerIsRunning(infoline_changer)">Skin.TimerStop(infoline_changer)</onfocus>
<!-- Settings transition from addonbrowser -->
<onfocus condition="Window.Is(addonbrowser) + $EXP[Container_Addons_NonRepo]">SetProperty(Container_Addons_NonRepo,true,home)</onfocus>
<onfocus condition="Window.Is(addonbrowser) + !$EXP[Container_Addons_NonRepo]">ClearProperty(Container_Addons_NonRepo,home)</onfocus>
Expand Down Expand Up @@ -524,7 +526,7 @@
<control type="textbox">
<visible>$PARAM[visible]</visible>
<top>$PARAM[gap]</top>
<height min = "35" max="$PARAM[maxheight]">auto</height>
<height min="35" max="$PARAM[maxheight]">auto</height>
<font>$PARAM[font]</font>
<textcolor>$PARAM[color]</textcolor>
<label>$PARAM[label]</label>
Expand Down Expand Up @@ -610,15 +612,37 @@
<param name="maxheight" value="$PARAM[title_maxheight]" />
<param name="align" value="center" />
</include>
<include content="Common_Details_Info">
<param name="visible" value="$EXP[$PARAM[viewtype_label]View_Details_Info_IsVisible] | Window.Is(home) | $EXP[Infoscreen_Widget_HasFocus]" />
<param name="gap" value="$PARAM[info_gap]" />
<param name="maxheight" value="$PARAM[info_maxheight]" />
<param name="font" value="$PARAM[viewtype_label]_Info" />
<param name="color" value="$PARAM[title_color]" />
<param name="label" value="$PARAM[info_label]" />
<param name="align" value="$PARAM[align]" />
</include>
<!-- info -->
<control type="group">
<height>$PARAM[info_maxheight]</height>
<control type="group">
<visible>Integer.IsLess(Skin.TimerElapsedSecs(infoline_changer),7) | String.IsEmpty(ListItem.Tagline)</visible>
<include content="Infoline_Fade_Animation" />
<include content="Common_Details_Info">
<param name="visible" value="$EXP[$PARAM[viewtype_label]View_Details_Info_IsVisible] | Window.Is(home) | $EXP[Infoscreen_Widget_HasFocus]" />
<param name="gap" value="$PARAM[info_gap]" />
<param name="maxheight" value="$PARAM[info_maxheight]" />
<param name="font" value="$PARAM[viewtype_label]_Info" />
<param name="color" value="$PARAM[title_color]" />
<param name="label" value="$PARAM[info_label]" />
<param name="align" value="$PARAM[align]" />
</include>
</control>
<control type="group">
<visible>Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(infoline_changer),7) + !String.IsEmpty(ListItem.Tagline)</visible>
<include content="Infoline_Fade_Animation" />
<include content="Common_Details_Info">
<param name="visible" value="$EXP[$PARAM[viewtype_label]View_Details_Info_IsVisible] | Window.Is(home) | $EXP[Infoscreen_Widget_HasFocus]" />
<param name="gap" value="$PARAM[info_gap]" />
<param name="maxheight" value="$PARAM[info_maxheight]" />
<param name="font" value="$PARAM[viewtype_label]_Info" />
<param name="color" value="$PARAM[title_color]" />
<param name="label" value="[UPPERCASE]$INFO[ListItem.Tagline][/UPPERCASE]" />
<param name="align" value="$PARAM[align]" />
</include>
</control>
</control>
<!-- plot -->
<include content="Common_Details_Textbox" condition="Window.Is(addonbrowser) | Window.Is(music) | Window.Is(programs) | Window.Is(videos)">
<param name="visible" value="$EXP[$PARAM[viewtype_label]View_Details_Plot_IsVisible] + !String.IsEmpty(Control.GetLabel(6003)) + ![Control.HasFocus(3100) + Container.Content(tvshows)]" />
<param name="gap" value="60" />
Expand Down
7 changes: 6 additions & 1 deletion 16x9/Templates_MyWindows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
<visible>Control.HasFocus(4014)</visible>
<animation effect="slide" end="0,0" time="Default_Transition_1x" reversible="false">Hidden</animation>
</control>
<!-- Break info_line animation in first period after a user scroll -->
<control type="group" id="5007">
<visible>Container.OnPrevious | Container(50).OnPrevious | Container(3201).OnPrevious | Container(3202).OnPrevious | Container(3203).OnPrevious | Container(3204).OnPrevious | Container(3205).OnPrevious | Container(3206).OnPrevious | Container(3207).OnPrevious | Container(3208).OnPrevious | Container(3209).OnPrevious | Container.OnNext | Container(50).OnNext | Container(3201).OnNext | Container(3202).OnNext | Container(3203).OnNext | Container(3204).OnNext | Container(3205).OnNext | Container(3206).OnNext | Container(3207).OnNext | Container(3208).OnNext | Container(3209).OnNext</visible>
<animation effect="slide" end="0,0" time="Default_Transition_5x" reversible="false">Hidden</animation>
</control>
<!-- Container Update Bounce Test For Info_Infoscreens_Label -->
<control type="button" id="6001">
<visible allowhiddenfocus="true">false</visible>
Expand Down Expand Up @@ -155,8 +160,8 @@
<!-- Layer 1 -->
<control type="group">
<include content="WindowOpenClose_Fade_Delayed_Animation" />
<include content="Dialog_Over_Artwork_Fadediffuse_Animation" />
<visible>$PARAM[visible]</visible>
<include content="Dialog_Over_Artwork_Fadediffuse_Animation" />
<include content="Visible_Fade_Delayed_Animation" />
<include content="ListView_Display">
<param name="visible" value="!$EXP[TransparentDialog_IsVisible]" />
Expand Down
6 changes: 6 additions & 0 deletions 16x9/Timers.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<timers>
<timer>
<name>infoline_changer</name>
<start reset="true">Window.IsVisible(videos)</start>
<reset>Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(infoline_changer),14)</reset>
<stop>!Window.IsVisible(videos)</stop>
</timer>
<timer>
<name>home_visible</name>
<start reset="true">Window.IsVisible(home)</start>
Expand Down
6 changes: 4 additions & 2 deletions 16x9/Variables_Labels_Media.xml
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@
</variable>

<variable name="Player_Status_Label">
<value condition="!String.IsEmpty(Player.SeekNumeric)">[UPPERCASE]$LOCALIZE[31309] $VAR[Copacetic_Divider_Bold12Q3] $INFO[Player.SeekNumeric(hh:mm:ss)][/UPPERCASE]</value>
<value condition="!String.IsEmpty(Player.SeekStepSize)">$INFO[Player.SeekStepSize]</value>
<value condition="!String.IsEmpty(Player.SeekOffset) + Player.HasPerformedSeek(3)">$INFO[Player.SeekOffset]</value>
<value condition="VideoPlayer.Content(livetv) + Integer.IsGreater(PVR.TimeShiftOffset,5)">[UPPERCASE]$INFO[PVR.TimeShiftOffset, -, $LOCALIZE[31308]][/UPPERCASE]</value>
Expand All @@ -594,7 +595,8 @@
<value condition="Player.Rewinding8x">x8</value>
<value condition="Player.Rewinding16x">x16</value>
<value condition="Player.Rewinding32x">x32</value>

<value condition="Player.Seeking + VideoPlayer.HasEPG">$INFO[PVR.EpgEventSeekTime]$INFO[PVR.EpgEventDuration, / ]</value>
<value condition="Player.Seeking">$INFO[Player.SeekTime]$INFO[Player.Duration, / ]</value>
</variable>

<variable name="Plot_Label">
Expand Down Expand Up @@ -1044,7 +1046,7 @@
<variable name="Unwatched_Indicator_Label">
<value condition="ListItem.IsCollection + !String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !String.IsEmpty(Window(home).Property(collection_unwatched))">$INFO[Window(home).Property(collection_unwatched)]</value>
<value condition="Control.HasFocus(3100)">$INFO[Container(3100).ListItem.Property(UnwatchedEpisodes)]</value>
<value>$INFO[Container.ListItem.Property(UnwatchedEpisodes)]</value>
<value>$INFO[ListItem.Property(UnwatchedEpisodes)]</value>
</variable>

<variable name="Viewtype_Label">
Expand Down
1 change: 1 addition & 0 deletions 16x9/_IDs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ANIMATION DELAYS
5004 Secondary list user scroll next delay
5005 Options menu settings change
5006 Container Switching delay (to hide multiart following container transition)
5007 infoline_fade animation break window

CHECKERS
6001 Container update bounce test
Expand Down
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc

### Changelog
---
**2.6.9**
- Updates to account for script.copacetic.helper code refactoring
- Updated video breadcrumb label at start of playback for episodes
- fixed bug in widget artwork preventing lanscape artwork from displaying at -2 position
- fixed bug causing '/' to be shown after actor name in infoscreen cast widget even if there was no role to be displayed after the /
**2.7.0**
- Info line will now fade in and out with the tagline if it is present, switching every 7 seconds https://github.com/realcopacetic/skin.copacetic/issues/212
- Added Player.SeekNumeric label when user entering numeric seek time https://github.com/realcopacetic/skin.copacetic/issues/210

To do
- pvr switching from windows to fullscreen there's a transition animation but it should be instant
Expand Down Expand Up @@ -55,6 +53,11 @@ 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.9**
- Updates to account for script.copacetic.helper code refactoring
- Updated video breadcrumb label at start of playback for episodes
- fixed bug in widget artwork preventing lanscape artwork from displaying at -2 position
- fixed bug causing '/' to be shown after actor name in infoscreen cast widget even if there was no role to be displayed after the /

**2.6.8**
- Fix for secondary slideshow time slider
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.9" name="Copacetic" provider-name="realcopacetic">
<addon id="skin.copacetic" version="2.7.0" 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
6 changes: 6 additions & 0 deletions language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,12 @@ msgctxt "#31308"
msgid "Timeshift"
msgstr ""

#: NEW
#/16x9/Variables_Labels_Media.xml
msgctxt "#31309"
msgid "Jump to"
msgstr ""



#########################################################################################################
Expand Down

0 comments on commit c8f8fa5

Please sign in to comment.