From c8f8fa5370d29d6203fc6908eaa8149be236cb90 Mon Sep 17 00:00:00 2001 From: realcopacetic Date: Wed, 30 Oct 2024 00:15:57 +0000 Subject: [PATCH] wip --- 16x9/Animations.xml | 9 +++++ 16x9/Components_OSD.xml | 4 +- 16x9/Components_Viewtypes.xml | 44 ++++++++++++++++----- 16x9/Templates_MyWindows.xml | 7 +++- 16x9/Timers.xml | 6 +++ 16x9/Variables_Labels_Media.xml | 6 ++- 16x9/_IDs | 1 + README.md | 13 +++--- addon.xml | 2 +- language/resource.language.en_gb/strings.po | 6 +++ 10 files changed, 77 insertions(+), 21 deletions(-) diff --git a/16x9/Animations.xml b/16x9/Animations.xml index 64290c9e..c329581b 100644 --- a/16x9/Animations.xml +++ b/16x9/Animations.xml @@ -278,6 +278,15 @@ + + + + + + + + + diff --git a/16x9/Components_OSD.xml b/16x9/Components_OSD.xml index 3f0f839f..590d9585 100644 --- a/16x9/Components_OSD.xml +++ b/16x9/Components_OSD.xml @@ -302,7 +302,7 @@ - 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)] + 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)] 360 50% @@ -400,7 +400,7 @@ - Conditional + Conditional diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml index e4376e7a..9c72df05 100644 --- a/16x9/Components_Viewtypes.xml +++ b/16x9/Components_Viewtypes.xml @@ -104,6 +104,8 @@ Skin.TimerStop(trailer_autoplay_home) PlayerControl(Stop) ClearProperty(Trailer_Autoplay,home) + + Skin.TimerStop(infoline_changer) SetProperty(Container_Addons_NonRepo,true,home) ClearProperty(Container_Addons_NonRepo,home) @@ -524,7 +526,7 @@ $PARAM[visible] $PARAM[gap] - auto + auto $PARAM[font] $PARAM[color] @@ -610,15 +612,37 @@ - - - - - - - - - + + + $PARAM[info_maxheight] + + Integer.IsLess(Skin.TimerElapsedSecs(infoline_changer),7) | String.IsEmpty(ListItem.Tagline) + + + + + + + + + + + + + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(infoline_changer),7) + !String.IsEmpty(ListItem.Tagline) + + + + + + + + + + + + + diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml index e508140c..2ac72189 100644 --- a/16x9/Templates_MyWindows.xml +++ b/16x9/Templates_MyWindows.xml @@ -41,6 +41,11 @@ Control.HasFocus(4014) Hidden + + + 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 + Hidden + false @@ -155,8 +160,8 @@ - $PARAM[visible] + diff --git a/16x9/Timers.xml b/16x9/Timers.xml index 156fb1ab..5efa014f 100644 --- a/16x9/Timers.xml +++ b/16x9/Timers.xml @@ -1,5 +1,11 @@ + + infoline_changer + Window.IsVisible(videos) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(infoline_changer),14) + !Window.IsVisible(videos) + home_visible Window.IsVisible(home) diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml index dbc4083d..1974b301 100644 --- a/16x9/Variables_Labels_Media.xml +++ b/16x9/Variables_Labels_Media.xml @@ -581,6 +581,7 @@ + [UPPERCASE]$LOCALIZE[31309] $VAR[Copacetic_Divider_Bold12Q3] $INFO[Player.SeekNumeric(hh:mm:ss)][/UPPERCASE] $INFO[Player.SeekStepSize] $INFO[Player.SeekOffset] [UPPERCASE]$INFO[PVR.TimeShiftOffset, -, $LOCALIZE[31308]][/UPPERCASE] @@ -594,7 +595,8 @@ x8 x16 x32 - + $INFO[PVR.EpgEventSeekTime]$INFO[PVR.EpgEventDuration, / ] + $INFO[Player.SeekTime]$INFO[Player.Duration, / ] @@ -1044,7 +1046,7 @@ $INFO[Window(home).Property(collection_unwatched)] $INFO[Container(3100).ListItem.Property(UnwatchedEpisodes)] - $INFO[Container.ListItem.Property(UnwatchedEpisodes)] + $INFO[ListItem.Property(UnwatchedEpisodes)] diff --git a/16x9/_IDs b/16x9/_IDs index 0d253517..0cc4ca65 100644 --- a/16x9/_IDs +++ b/16x9/_IDs @@ -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 diff --git a/README.md b/README.md index 39494e47..f0f1ae45 100644 --- a/README.md +++ b/README.md @@ -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 @@ -55,6 +53,11 @@ To do = - 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 diff --git a/addon.xml b/addon.xml index 8a4e8704..bb113cd7 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index ea83c935..01a01ec2 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -570,6 +570,12 @@ msgctxt "#31308" msgid "Timeshift" msgstr "" +#: NEW +#/16x9/Variables_Labels_Media.xml +msgctxt "#31309" +msgid "Jump to" +msgstr "" + #########################################################################################################