From 38d01e324174d864ec7c439c89a599c2984eae92 Mon Sep 17 00:00:00 2001 From: "Ch1llb0/skin.osmc" <36623079+Ch1llb0@users.noreply.github.com> Date: Wed, 16 Aug 2023 13:19:48 +0200 Subject: [PATCH] Merge addition of new composer info to music windows and various fixes --- Changelog.md | 227 ++++++------------------- addon.xml | 4 +- xml/Coordinates_DialogSeekBar.xml | 117 ++----------- xml/Coordinates_MusicVisualisation.xml | 40 ++--- xml/Coordinates_Viewtype52.xml | 6 +- xml/Coordinates_Viewtype53.xml | 6 +- xml/DialogMusicInfo.xml | 38 +++++ xml/DialogSeekBar.xml | 49 +----- xml/DialogVideoInfo.xml | 4 +- xml/Includes_Windows_Dialogs.xml | 4 +- xml/MusicOSD.xml | 2 +- xml/MusicVisualisation.xml | 39 +++-- xml/Variables.xml | 9 +- xml/VideoFullScreen.xml | 19 +++ xml/Viewtype511.xml | 4 +- xml/Viewtype53.xml | 4 +- 16 files changed, 209 insertions(+), 363 deletions(-) diff --git a/Changelog.md b/Changelog.md index ad7b6c02..e6e9691a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,21 @@ --- -**_v20.0.0_** +**_v20.1.0_** + +_New_ +- add composer info to fullscreen music playback window and music info dialog + +_Improved_ +- rework seek indicator and button behaviour + +_Fixed_ +- fix watched indicator background in wide and wall views +- fix episodes image to properly react to hide thumbs for unwatched episode setting + +--- + +**_v20.0.0 - June 2023_** _New_ - Support Nexus skin engine features @@ -20,7 +34,7 @@ _Fixed_ --- -**_v19.1.4_** +**_v19.1.4 - May 2023_** _Improved_ - improve background overlay rendering @@ -33,7 +47,7 @@ _Fixed_ --- -**_v19.1.3_** +**_v19.1.3 - September 2022_** _Improved_ - improve window draw performance @@ -45,7 +59,20 @@ _Fixed_ --- -**_v19.1.1_** +**_v19.1.2 - March 2022_** + +_New_ +- reset textboxes to top scrolling position during dialog or window switches + +_Improved_ +- improve inital window/dialog focus fix (only apply where needed) + +_Fixed_ +- always show OSD playlist button when expected + +--- + +**_v19.1.1 - December 2021_** _New_ - add new video/music OSD seek slider button functionality (also adds frame advance feature) @@ -60,7 +87,7 @@ _Fixed_ --- -**_v19.1.0_** +**_v19.1.0 - August 2021_** _New_ - add ENABLE option for new skinshortcuts version @@ -445,189 +472,45 @@ Release --- -**Changelog v20.0.0** - -_add new colors.xml file for new colour picker_ -_add new Coordinates_DialogColorPicker.xml and DialogColorPicker.xml files_ -_add new Coordinates_MyFavourites.xml and MyFavourites.xml files_ -_add new Coordinates_SettingsScreenCalibration.xml file_ -_add new Includes_GameControllers.xml file_ -_remove deprecates Coordinates_script-skin_helper_service-ColorPicker.xml and script-skin_helper_service-ColorPicker.xml files_ -_add new DialogPVRGuideControls.xml and Coordinates_DialogPVRGuideControls.xml files_ -_rename music and videos template files for skinshortcuts script_ - -strings.po: -- update localizes for new colour picker (31026, 31037, 31050, 31060, 31295, 31297, 31298, 31299, 31300, 31405, 31407, 31435) - -Textures.xbt: -- update textures file with new and updated calibrate window textures -- update textures file with button icon for new video OSD Audio and Subtitle stream selection - -mainmenu.DATA.xml: -- adjust default favourites main menu link to point to new favourites window - -movies-1.DATA.xml: -- add new recently added movies widget entry +**Changelog v20.1.0** -music-1.DATA.xml: -- add new recently added albums widget entry +Coordinates_DialogSeekBar.xml: +- remove deprecated coordinates includes -overrides.xml: -- adjust favourites main menu entry template to point to new favourites window -- add new default recently added movies, recently added albums and in-progress tv shows widget entries -- fix default program add-ons widget entry +Coordinates_MusicVisualisation.xml: +- adjust position and height of now and next playing information -programs-1.DATA.xml: -- fix name label of program add-ons widget +Coordinates_Viewtype52.xml: +- fix position of watched status banner -tvhsows-1.DATA.xml: -- add new in-progress tv shows widget entry - -Coordinates_DialogButtonMenu.xml: -- rework coordinates for new power menu structure - -Coordinates_DialogGameControllers.xml: -- add new coordinates includes for new game controller ports dialog - -Coordinates_GameOSD.xml: -- adjust height of game OSD dialog for new game controller ports entry - -Coordinates_SkinSettings.xml: -- adjust coordinates of colour settings entries - -Coordinates_VideoOSD.xml: -- adjust width of Controls and Options grouplists -- add VideoOSD_coords12 include for new Audio and Subtitle stream selection grouplists - -Coordinates_Viewtype523.xml: -- add new favourites image includes - -Coordinates_Viewtype535.xml: -- add new favourites image includes - -Coordinates_Viewtype537.xml: -- add new favourites image includes - -Custom_Overlay_Debug.xml: -- add new entry for new favourites window and new colour picker dialog -- remove entry of deprecates colour picker script dialog -- add new entry for new PVR guide controls dialog - -Defaults.xml: -- add new colorbutton control - -DialogAddonInfo.xml: -- remove deprecated WindowDialogFocus include -- remove deprecated button grouplist defaultcontrol tag -- add new AddonInfoDialogButtonFocus include for proper inital info dialog button focus behaviour -- revert button order to former default - -DialogButtonMenu.xml: -- rework power menu to match new PVR guide controls dialog - -DialogGameControllers.xml: -- rework game controllers dialog to use includes depending on which dialog is called (game controller profiles or game controller ports dialog) - -DialogKeyboard.xml: -- add new show/hide password buttin +Coordinates_Viewtype53.xml: +- fix position of watched status banner DialogMusicInfo.xml: -- remove deprecated WindowDialogFocus include -- remove deprecated button grouplist defaultcontrol tag -- add new MusicInfoDialogButtonFocus include for proper inital info dialog button focus behaviour - -DialogPlayerProcessInfo.xml: -- add new video scan type info label - -DialogPVRInfo.xml: -- remove deprecated WindowDialogFocus include -- remove deprecated button grouplist defaultcontrol tag -- add new PVRInfoDialogButtonFocus include for proper inital info dialog button focus behaviour -- revert button order to former default +- add new composer info DialogSeekBar.xml: -- replace deprecated Player.DisplayAfterSeek by new Player.HasPerformedSeek(3) built-in +- remove deprecated controls DialogVideoInfo.xml: -- remove deprecated WindowDialogFocus include -- remove deprecated button grouplist defaultcontrol tag -- add new VideoInfoDialogButtonFocus include for proper inital info dialog button focus behaviour -- revert button order to former default - -GameOSD.xml: -- adjust visibility conditions with new game controller ports window condition -- add new game controller ports entry - -Includes.xml: -- add new Coordinates_DialogColorPicker.xml and Coordinates_MyFavourites.xml include files -- remove deprevated Coordinates_script-skin_helper_service-ColorPicker.xml include file -- adjust onloads to set default colour value to "Default" instead of "None" -- add new Coordinates_SettingsScreenCalibration.xml include file -- add new Includes_GameControllers.xml include file -- add new Coordinates_DialogPVRGuideControls.xml include file - -Includes_SubMenu.xml: -- add sub menu for new favourites window -- fix include and visible conditions for view type suppression in video media window while force video addon view setting is enabled +- add missing fallback to episode image Includes_Windows_Dialogs.xml: -- remove deprecated WindowDialogFocus include -- add new AddonInfoDialogButtonFocus, MusicInfoDialogButtonFocus, PVRInfoDialogButtonFocus and VideoInfoDialogButtonFocus includes - -script-skinshortcuts-static.xml: -- adjust default favourites main menu link to point to new favourites window -- add new default recently added movies, recently added albums and in-progress tv shows widget entries -- fix name label and default layout of program add-ons widget - -SettingsCategory.xml: -- add new default color button +- fix video image fallback -SettingsScreenCalibration.xml: -- add new movingspeed tags to mover and resize controls -- add new calibration reset control -- add missing calibration value label - -SkinSettings.xml: -- rework colour settings for new Kodi colour picker -- remove entry for deprecated Skin Helper Service ColorPicker addon +MusicVisualisation.xml: +- add missing seek slider controls +- add new composer info Variables.xml: -- add condition to mediaImages variable utilizing new hideunwatchedepisodethumbs boolean -- add condition to HeadingLabelPrimary for new favourites window heading -- rework StatusOverlay and StatusOverlayWide variables to show percentage based watch status for TV shows and seasons -- rework VideoResolution variable to incorporate new HDR info -- add new HDRType variable -- add new SubtitleLanguageOSD variable for new video OSD Subtitle stream selection -- add new conditions to VideoResolution variable to support new OSMC specific video width and height infolabels - -Variables_Colours.xml: -- rework colour variables with new default colour value "Default" -- remove deprecated SolidBackgroundColor-Name variable - -Variables_Settings.xml: -- rework skin settings explanation variable after colour skin settings rework and removal of deprecated Skin Helper Service ColorPicker addon -- add skin settings explanations for new colour skin settings -- remove deprecated addon-skinhelpercolorpicker variable +- rework mediaImages and VideoInfoImage variables to properly react to hide thumbs for unwatched episode setting VideoFullScreen.xml: -- replace deprecated Player.DisplayAfterSeek by new Player.HasPerformedSeek(3) built-in - -VideoOSD.xml: -- adjust visibility condition and fade animations of Options grouplist for new Audio and Subtitle stream selection -- adjust Audio Settings and Subtitles buttons to open new Audio and Subtitle stream selection, if more than one audio or subtitle stream is present and playback isn't live TV -- add new Audio and Subtitle stream selection - -Viewtype50.xml: -- add new favourites image include - -Viewtype523.xml: -- adjust list visibility condition for new favourites content type - -Viewtype535.xml: -- adjust list visibility condition for new favourites content type +- add missing seek slider controls -Viewtype537.xml: -- adjust list visibility condition for new favourites content type +Addon.xml: +- bump version to 20.1.0 +- update changelog -addon.xml: -- bump version to 20.0.0 +Changelog.md: +- update changelog diff --git a/addon.xml b/addon.xml index c3934652..e4c53d0f 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -17,6 +17,6 @@ resources/icon.png resources/fanart.jpg - [B]New[/B][CR]- Support Nexus skin engine features[CR]- remove Skin Helper Service ColorPicker support[CR]- add new video OSD audio and subtitle selection[CR]- add missing PVR guide controls dialog[CR]- use new OSMC specific video width and height info for media flags[CR]- add new default widgets to movies, tv shows and music home screen items[CR][CR][B]Improved[/B][CR]- improve inital info dialog button focus behaviour[CR][CR][B]Fixed[/B][CR]- fix view type button supression behaviour in video media window while video addon force view setting is enabled + [B]New[/B][CR]- add composer info to fullscreen music playback window and music info dialog[CR][CR][B]Improved[/B][CR]- rework seek indicator and button behaviour[CR][CR][B]Fixed[/B][CR]- fix watched indicator background in wide and wall views[CR]- fix episodes image to properly react to hide thumbs for unwatched episode setting diff --git a/xml/Coordinates_DialogSeekBar.xml b/xml/Coordinates_DialogSeekBar.xml index 623b759b..ad9cd5bc 100644 --- a/xml/Coordinates_DialogSeekBar.xml +++ b/xml/Coordinates_DialogSeekBar.xml @@ -8,113 +8,28 @@ DialogSeekBar_coords1_4:3 - 150 - 75 - 1620 - 930 + 0 + 0 + 0 + 0 - 150 - 75 - 2260 - 930 + 0 + 0 + 0 + 0 - 150 - 255 - 2260 - 930 + 0 + 0 + 0 + 0 - 150 - 75 - 1140 - 930 - - - - DialogSeekBar_coords2_16:9 - DialogSeekBar_coords2_21:9 - DialogSeekBar_coords2_21:9_masked - DialogSeekBar_coords2_4:3 - - - 795 - 1620 - 60 - - - 795 - 2260 - 60 - - - 795 - 2260 - 60 - - - 795 - 1140 - 60 - - - - DialogSeekBar_coords3_16:9 - DialogSeekBar_coords3_21:9 - DialogSeekBar_coords3_21:9_masked - DialogSeekBar_coords3_4:3 - - - 75 - 1620 - 60 - - - 75 - 2260 - 60 - - - 75 - 2260 - 60 - - - 75 - 1140 - 60 - - - - DialogSeekBar_coords4_16:9 - DialogSeekBar_coords4_21:9 - DialogSeekBar_coords4_21:9_masked - DialogSeekBar_coords4_4:3 - - - 280 - 12 - 920 - 20 - - - 280 - 12 - 1560 - 20 - - - 280 - 12 - 1560 - 20 - - - 280 - 12 - 440 - 20 + 0 + 0 + 0 + 0 \ No newline at end of file diff --git a/xml/Coordinates_MusicVisualisation.xml b/xml/Coordinates_MusicVisualisation.xml index 4237617c..c863f0ca 100644 --- a/xml/Coordinates_MusicVisualisation.xml +++ b/xml/Coordinates_MusicVisualisation.xml @@ -436,22 +436,22 @@ MusicVisualisation_coords17_4:3 - 150 + 177 470 516 - 150 + 177 470 516 - 150 + 177 470 516 - 150 + 177 470 516 @@ -464,23 +464,23 @@ 520 - 150 - 276 + 177 + 324 520 - 150 - 276 + 177 + 324 520 - 150 - 276 + 177 + 324 520 - 150 - 276 + 177 + 324 @@ -564,22 +564,22 @@ 520 - 486 + 513 180 520 - 486 + 513 180 520 - 486 + 513 180 520 - 486 + 513 180 @@ -591,25 +591,25 @@ 520 - 150 + 177 516 1100 520 - 150 + 177 516 1740 520 - 150 + 177 516 1740 520 - 150 + 177 516 620 diff --git a/xml/Coordinates_Viewtype52.xml b/xml/Coordinates_Viewtype52.xml index d98122f8..30cd295c 100644 --- a/xml/Coordinates_Viewtype52.xml +++ b/xml/Coordinates_Viewtype52.xml @@ -373,19 +373,19 @@ Viewtype52_coords8_4:3 - 10 + 7 120 240 26 - 10 + 15 120 240 26 - 10 + 15 120 240 26 diff --git a/xml/Coordinates_Viewtype53.xml b/xml/Coordinates_Viewtype53.xml index c0975d23..c062a0e4 100644 --- a/xml/Coordinates_Viewtype53.xml +++ b/xml/Coordinates_Viewtype53.xml @@ -361,19 +361,19 @@ Viewtype53_coords8_4:3 - 43 + 35 15 200 22 - 43 + 41 15 200 22 - 43 + 41 15 200 22 diff --git a/xml/DialogMusicInfo.xml b/xml/DialogMusicInfo.xml index ea32e891..95ac7fc8 100644 --- a/xml/DialogMusicInfo.xml +++ b/xml/DialogMusicInfo.xml @@ -148,6 +148,25 @@ $VAR[TextColorFO] + + + + DialogMusicInfo_coords5 + !String.IsEmpty(ListItem.Property(Role.Composer)) + + DialogMusicInfo_coords6 + right + Font36 + + $VAR[TextColorNF] + + + DialogMusicInfo_coords7 + Font36 + + $VAR[TextColorFO] + + @@ -388,6 +407,25 @@ $VAR[TextColorFO] + + + + DialogMusicInfo_coords5 + !String.IsEmpty(ListItem.Property(Role.Composer)) + + DialogMusicInfo_coords6 + right + Font36 + + $VAR[TextColorNF] + + + DialogMusicInfo_coords7 + Font36 + + $VAR[TextColorFO] + + diff --git a/xml/DialogSeekBar.xml b/xml/DialogSeekBar.xml index b6774b15..be4bf9de 100644 --- a/xml/DialogSeekBar.xml +++ b/xml/DialogSeekBar.xml @@ -11,47 +11,16 @@ - - DialogDepth - DialogSeekBar_coords1 - - - DialogSeekBar_coords2 - Conditional - Conditional - Conditional - Conditional - Conditional - Conditional - Conditional - Conditional - WindowFadeAnimation - - - DialogSeekBar_coords3 + + + + + - - DialogSeekBar_coords4 - osd/OSDSliderBack.png - osd/OSDSliderNibBig.png - osd/OSDSliderNibBig.png - Player.Seeking + !Pvr.IsPlayingTv - VisibleFadeAnimation - - - - DialogSeekBar_coords4 - osd/OSDSliderBack.png - osd/OSDSliderNibBig.png - osd/OSDSliderNibBig.png - Player.Seeking + Pvr.IsPlayingTv + VideoPlayer.HasEpg - VisibleFadeAnimation - - - - - - + + + + diff --git a/xml/DialogVideoInfo.xml b/xml/DialogVideoInfo.xml index a9dddefe..3c7775e5 100644 --- a/xml/DialogVideoInfo.xml +++ b/xml/DialogVideoInfo.xml @@ -37,7 +37,7 @@ DialogVideoInfo_coords1 100 - $VAR[VideoInfoImage] + $VAR[VideoInfoImage] keep @@ -66,7 +66,7 @@ - + String.IsEqual(ListItem.DBTYPE,musicvideo) DialogVideoInfo_coords1 diff --git a/xml/Includes_Windows_Dialogs.xml b/xml/Includes_Windows_Dialogs.xml index a096be28..c964e5a9 100644 --- a/xml/Includes_Windows_Dialogs.xml +++ b/xml/Includes_Windows_Dialogs.xml @@ -704,7 +704,7 @@ - DefaultVideos.png + DefaultVideo.png False @@ -735,7 +735,7 @@ - DefaultVideos.png + DefaultVideo.png False diff --git a/xml/MusicOSD.xml b/xml/MusicOSD.xml index b2874f15..64013116 100644 --- a/xml/MusicOSD.xml +++ b/xml/MusicOSD.xml @@ -23,7 +23,7 @@ - VideoOSD_coords1 + MusicOSD_coords1 5 5 StepBack diff --git a/xml/MusicVisualisation.xml b/xml/MusicVisualisation.xml index 8dec6f83..fc406c67 100644 --- a/xml/MusicVisualisation.xml +++ b/xml/MusicVisualisation.xml @@ -218,7 +218,26 @@ - + + MusicVisualisation_coords13 + Player.Seekbar + osd/OSDSliderBack.png + osd/OSDSliderNibBig.png + osd/OSDSliderNibBig.png + Player.Seeking + !Pvr.IsPlayingTv + VisibleFadeAnimation + + + MusicVisualisation_coords13 + PVR.TimeShiftSeekbar + osd/OSDSliderBack.png + osd/OSDSliderNibBig.png + osd/OSDSliderNibBig.png + Player.Seeking + Pvr.IsPlayingTv + VideoPlayer.HasEpg + VisibleFadeAnimation + + + MusicVisualisation_coords13 Player.Progress osd/OSDSliderBack.png @@ -227,7 +246,7 @@ !String.IsEmpty(Window(12006).Property(MusicOSDSlider)) + Player.SeekEnabled + !Player.Seeking + !Pvr.IsPlayingRadio VisibleFadeAnimation - + MusicVisualisation_coords13 PVR.TimeshiftProgressPlayPos osd/OSDSliderBack.png @@ -363,39 +382,39 @@ - + MusicVisualisation_coords19 - !String.IsEmpty(MusicPlayer.Genre) + !String.IsEmpty(MusicPlayer.Property(Role.Composer)) MusicVisualisation_coords20 right Font36 - + $VAR[TextColorNF] MusicVisualisation_coords21 Font36 - + - + MusicVisualisation_coords19 - !String.IsEmpty(MusicPlayer.Comment) + !String.IsEmpty(MusicPlayer.Genre) MusicVisualisation_coords20 right Font36 - + $VAR[TextColorNF] MusicVisualisation_coords21 Font36 - + diff --git a/xml/Variables.xml b/xml/Variables.xml index 8f9b1011..73521c60 100644 --- a/xml/Variables.xml +++ b/xml/Variables.xml @@ -138,8 +138,9 @@ DefaultFolderBack.png $INFO[ListItem.Art(season.poster)] $INFO[ListItem.Art(tvshow.poster)] - $INFO[ListItem.Icon] - + $INFO[ListItem.Icon] + $INFO[ListItem.Art(fanart)] + DefaultTVShows.png $INFO[ListItem.Art(poster)] $INFO[ListItem.Icon] @@ -436,7 +437,9 @@ - $INFO[ListItem.Icon] + $INFO[ListItem.Icon] + $INFO[ListItem.Art(fanart)] + DefaultTVShows.png $INFO[ListItem.Art(poster)] $INFO[ListItem.Icon] diff --git a/xml/VideoFullScreen.xml b/xml/VideoFullScreen.xml index ed181e01..031f640f 100644 --- a/xml/VideoFullScreen.xml +++ b/xml/VideoFullScreen.xml @@ -312,6 +312,25 @@ + + VideoFullScreen_coords23 + Player.Seekbar + osd/OSDSliderBack.png + osd/OSDSliderNibBig.png + osd/OSDSliderNibBig.png + Player.Seeking + !Pvr.IsPlayingTv + VisibleFadeAnimation + + + VideoFullScreen_coords23 + PVR.TimeShiftSeekbar + osd/OSDSliderBack.png + osd/OSDSliderNibBig.png + osd/OSDSliderNibBig.png + Player.Seeking + Pvr.IsPlayingTv + VideoPlayer.HasEpg + VisibleFadeAnimation + + VideoFullScreen_coords23 Player.Progress diff --git a/xml/Viewtype511.xml b/xml/Viewtype511.xml index fab27463..e05b5661 100644 --- a/xml/Viewtype511.xml +++ b/xml/Viewtype511.xml @@ -153,7 +153,7 @@ - DefaultVideos.png + DefaultVideo.png False @@ -168,7 +168,7 @@ - DefaultVideos.png + DefaultVideo.png False diff --git a/xml/Viewtype53.xml b/xml/Viewtype53.xml index befb506f..b1340299 100644 --- a/xml/Viewtype53.xml +++ b/xml/Viewtype53.xml @@ -54,7 +54,7 @@ - DefaultVideos.png + DefaultVideo.png False @@ -69,7 +69,7 @@ - DefaultVideos.png + DefaultVideo.png False