From 2fba26ca80b63683da1fb8a715b8bbefc09dbbc3 Mon Sep 17 00:00:00 2001 From: faush01 Date: Mon, 8 Apr 2019 13:29:43 +1000 Subject: [PATCH] dont show seek bar when seeing or puased --- addon.xml | 2 +- resources/lib/widgets.py | 2 +- .../skin.estuary/18/xml/DialogSeekBar.xml | 2 +- .../skins/skin.estuary/18/xml/VideoOSD.xml | 255 ++++++++++++++++++ 4 files changed, 258 insertions(+), 3 deletions(-) create mode 100644 resources/skins/skin.estuary/18/xml/VideoOSD.xml diff --git a/addon.xml b/addon.xml index c0ede41..73512eb 100644 --- a/addon.xml +++ b/addon.xml @@ -1,7 +1,7 @@ diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py index ce9afda..6b2de4d 100644 --- a/resources/lib/widgets.py +++ b/resources/lib/widgets.py @@ -286,7 +286,7 @@ def getWidgetContent(handle, params): xbmcplugin.setContent(handle, 'episodes') items_url = ('{server}/emby/Users/{userid}/Items/Latest' + '?GroupItems=true' + - '&Limit={ItemLimit}' + + '&Limit=45' + '&Recursive=true' + '&SortBy=DateCreated' + '&SortOrder=Descending' + diff --git a/resources/skins/skin.estuary/18/xml/DialogSeekBar.xml b/resources/skins/skin.estuary/18/xml/DialogSeekBar.xml index f929295..7a3f222 100644 --- a/resources/skins/skin.estuary/18/xml/DialogSeekBar.xml +++ b/resources/skins/skin.estuary/18/xml/DialogSeekBar.xml @@ -1,6 +1,6 @@ - Player.Seeking | Player.DisplayAfterSeek | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) + Player.Forwarding | Player.Rewinding | Player.ShowInfo | Player.ShowTime | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput) !Player.Paused + [![Window.IsActive(sliderdialog) | Window.IsActive(pvrosdchannels)]] !Player.Paused + [Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)] Animation_BottomSlide diff --git a/resources/skins/skin.estuary/18/xml/VideoOSD.xml b/resources/skins/skin.estuary/18/xml/VideoOSD.xml new file mode 100644 index 0000000..27fd6ef --- /dev/null +++ b/resources/skins/skin.estuary/18/xml/VideoOSD.xml @@ -0,0 +1,255 @@ + + + SetFocus(603) + 602 + Animation_BottomSlide + DepthOSD + + + background close area + 0 + 0 + 100% + 280 + + + Action(close) + + + 0 + 180 + ![Window.IsVisible(SliderDialog) | Window.IsVisible(osdaudiosettings) | Window.IsVisible(osdvideosettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(playerprocessinfo) | Window.IsVisible(osdcmssettings) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(pvrchannelguide)] + VisibleChange + + conditional + 20 + 0 + right + center + 1000 + 50 + + !Player.ShowInfo + + + + 20 + 90 + 100% + 135 + 20 + 200 + horizontal + 87 + noop + 70043 + 70040 + + + + + PlayerControl(Previous) + Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | Player.SeekEnabled + + + osd/fullscreen/buttons/play.png + osd/fullscreen/buttons/play.png + osd/fullscreen/buttons/pause.png + osd/fullscreen/buttons/pause.png + osd/fullscreen/buttons/button-fo.png + 76 + Focus + 76 + 74 + 74 + + + 1 + 0 + Player.Paused + PlayerControl(Play) + Player.PauseEnabled + + + + + + PlayerControl(Stop) + + + + + + PlayerControl(Next) + Player.ChapterCount | Integer.IsGreater(Playlist.Length(video),1) | [VideoPlayer.Content(LiveTV) + Player.SeekEnabled] + + + + + + PlayerControl(ShowVideoMenu) + VideoPlayer.HasMenu + + + osd/fullscreen/buttons/record-white.png + osd/fullscreen/buttons/record-white.png + osd/fullscreen/buttons/record.png + osd/fullscreen/buttons/record.png + osd/fullscreen/buttons/button-fo.png + 76 + Focus + 76 + 74 + 74 + + + 1 + 0 + !PVR.IsRecordingPlayingChannel + PVR.ToggleRecordPlayingChannel + PVR.CanRecordPlayingChannel + VideoPlayer.Content(livetv) + + + + 50 + 90 + 1800 + 135 + right + 20 + 200 + horizontal + 87 + 11104 + 12104 + 13103 + 606 + 600 + + + + + Info + + + + + + Dialog.Close(VideoOSD) + ActivateWindow(PVROSDChannels) + VideoPlayer.Content(livetv) + + + + + + Dialog.Close(VideoOSD) + ActivateWindow(pvrchannelguide) + VideoPlayer.Content(livetv) + VideoPlayer.HasEPG + + + + + + ActivateWindow(videobookmarks) + !VideoPlayer.Content(livetv) + + + + + + Dialog.Close(VideoOSD) + ActivateWindow(Teletext) + VideoPlayer.HasTeletext + + + + + + ActivateWindow(osdsubtitlesettings) + !VideoPlayer.Content(LiveTV) | VideoPlayer.HasSubtitles + + + + + + VideoPlayer.IsStereoscopic + SetProperty(settingslist_content,3d,home) + SetProperty(settingslist_header,$LOCALIZE[36501],home) + ActivateWindow(1101) + + + + + + SetProperty(settingslist_content,osd,home) + SetProperty(settingslist_header,$LOCALIZE[5],home) + ActivateWindow(1101) + + + + + 60 + Player.SeekEnabled + !Player.Paused + + HiddenObject + 200 + PlayerControl(Play) + 200 + StepForward + StepBack + PlayerControl(Play) + + + -5 + 0 + 100% + 26 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + Player.Progress + seek + !Control.HasFocus(87) + !VideoPlayer.Content(LiveTV) + + + -5 + 0 + 100% + 26 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + Player.Progress + seek + Control.HasFocus(87) + !VideoPlayer.Content(LiveTV) + + + -5 + 0 + 100% + 26 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + PVR.TimeshiftProgressPlayPos + pvr.seek + !Control.HasFocus(87) + VideoPlayer.Content(LiveTV) + + + -5 + 0 + 100% + 26 + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + osd/progress/nub_leftright.png + PVR.TimeshiftProgressPlayPos + pvr.seek + Control.HasFocus(87) + VideoPlayer.Content(LiveTV) + + + + +