From 34550fda821da804c91c83e9e779243f1a207f56 Mon Sep 17 00:00:00 2001 From: Chris Bevan Date: Sun, 3 Jan 2016 20:01:45 +0000 Subject: [PATCH] various --- 1080i/DialogSeekBar.xml | 112 +++----------------- 1080i/MyMusicPlaylist.xml | 3 +- 1080i/MyPVRChannels.xml | 3 +- 1080i/MyPVRGuide.xml | 3 +- 1080i/MyPVRRecordings.xml | 3 +- 1080i/View_Songs.xml | 3 - 1080i/custom_musicPlayerFullscreen.xml | 140 +++++++++++++------------ changelog.txt | 6 +- 8 files changed, 100 insertions(+), 173 deletions(-) diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml index f5505a0..8d5f56b 100644 --- a/1080i/DialogSeekBar.xml +++ b/1080i/DialogSeekBar.xml @@ -1,7 +1,5 @@ - 901 - !window.isactive(videoosd) + !window.isactive(123) + !window.isactive(124) + !Window.IsActive(1104) + !Window.IsActive(DialogSubtitles.xml) + !Window.IsVisible(fullscreeninfo) + [VideoPlayer.IsFullscreen + !Window.IsVisible(visualisation)] + [Player.Seeking | Player.DisplayAfterSeek | Player.Paused | Player.Forwarding | Player.Rewinding] @@ -14,7 +12,7 @@ col-4-begin row-24-begin - Player.Playing | player.seeking + Player.Playing 0 -32 18-col @@ -99,105 +97,29 @@ - - - - 10-col - row-12-begin - - 3-col - 0 - 3-col - 1-col - smallStrong - textActive - - - - - - 3-col - 1-col - 1-col - 1-col - symbol - - 25 - colors/black.png - - - 2-col-gutter - 2-col - 3-col - 1-col - right - smallStrong - textActive - - - - - - 2-col - 2-col - 1-col - 1-col - symbol - - 25 - colors/black.png - - - 372 - 2-col - 3-col - 1-col - smallStrong - textActive - - - - - - 4-col - 2-col - 1-col - 1-col - symbol - - 25 - colors/black.png - - - 3-col - 4-col - 3-col - 1-col - smallStrong - textActive - - - - - - 3-col - 3-col - 1-col - 1-col - symbol - - 25 - colors/black.png - - - col-1-begin - row-24-begin + Player.seeking + 12-col + row-21-begin - Player.Rewinding | Player.Forwarding 0 - -12 - 24-col + 0 + 1-col center + symbolVeryLarge + textActive + + - + + + 1-col-indent + 0 + 24-col + left pageTitle textActive - + - diff --git a/1080i/MyMusicPlaylist.xml b/1080i/MyMusicPlaylist.xml index b7dd4b9..60cf648 100644 --- a/1080i/MyMusicPlaylist.xml +++ b/1080i/MyMusicPlaylist.xml @@ -36,8 +36,7 @@ - - + diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml index 6734f7f..4382345 100644 --- a/1080i/MyPVRChannels.xml +++ b/1080i/MyPVRChannels.xml @@ -20,8 +20,7 @@ - - + diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml index e1cce03..666e5e1 100644 --- a/1080i/MyPVRGuide.xml +++ b/1080i/MyPVRGuide.xml @@ -20,8 +20,7 @@ - - + diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml index 23b68dd..5fc28fb 100644 --- a/1080i/MyPVRRecordings.xml +++ b/1080i/MyPVRRecordings.xml @@ -20,8 +20,7 @@ - - + diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml index c628796..81d0f4a 100644 --- a/1080i/View_Songs.xml +++ b/1080i/View_Songs.xml @@ -17,7 +17,6 @@ stretch - container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://) col-1-begin @@ -42,7 +41,6 @@ windowopen - container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://) @@ -66,7 +64,6 @@ - container.content(songs) + !Substring(Container.folderpath,addons://sources/audio) + !Substring(Container.folderpath,plugin://) + Substring(Container.folderpath,musicdb://) col-10-begin diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index f8d1aaf..5585bca 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -41,89 +41,97 @@ - 36 + col-1-begin row-23-begin - - + + + + + 0 - 1-row - 10-col - 3-row - colors/white.png - aaFFFFFF + -412 + 6-col + 6-col + keep + $INFO[ListItem.art(thumb)] + 500 - 12 + 0 0 - + 0 - 48 - 684 - pageTitle - cc000000 + 0 + 6-col + 71 + colors/white.png + $INFO[skin.string(highlightColor)] + + + 24 + 0 + 396 + 2-row + regularStrong + textActive false - - !Pvr.IsPlayingRadio - 0 - 96 - 684 - itemTitle - cc000000 - false - - - - Pvr.IsPlayingRadio - 0 - 96 - 684 - itemTitle - cc000000 - false - - - - 0 - 4-row - 12-col - 2-row - pageTitle - left - aaFFFFFF - false - - - - Fake button - decorative only - MusicPlayer.HasNext - 4-col - 164 - 2-col-gutter + + 0 + 2-row + 6-col 1-row - smallStrong - center - black - black - colors/white.png - colors/white.png - - noop + colors/white.png + FFFFFFFF - 424 - 165 - 4-col-gutter - itemSubTitle - left - aaFFFFFF + 24 + 2-row + 396 + 1-row + smallStrong + black false - + + + + 0 + 3-row + 6-col + 2-row + colors/black.png + overlay + + + Duration + 0 + 3-row + 6-col + 2-row + false + - + - + colors/white.png + - + - + Player.Progress + + + 24 + 3-row + 10-col + 2-row + regularStrong + left + textActive + 99000000 + false + diff --git a/changelog.txt b/changelog.txt index a5f179a..d7c052a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -34,9 +34,13 @@ ***To do*** +Revise initial zoom + +Global search results needs a reboot + Revise fullscreenmusic. Use album art as default background. -DialogProgress Player controls (include details of UDLR skip levels - check skip heading from paused) +DialogProgress Player controls (fix pause indicator to show seek level etc) Fullscreen music view - add star rating selector