From 73f3bbf1ab31023a9a1414f0f22f3e849f7a310a Mon Sep 17 00:00:00 2001 From: theDeadMan Date: Thu, 28 Sep 2017 14:36:29 +0100 Subject: [PATCH] pictures updated --- 1080i/DialogConfirm.xml | 2 +- 1080i/Includes_animations.xml | 2 +- 1080i/Includes_hubOptionsItems.xml | 2 +- 1080i/Includes_variables.xml | 6 +- 1080i/MyPics.xml | 35 +-- 1080i/View_Photos.xml | 24 +- 1080i/custom_musicPlayerFullscreen.xml | 312 ++++++++----------------- changelog.txt | 2 + shortcuts/picturessubmenu.DATA.xml | 7 - 9 files changed, 124 insertions(+), 268 deletions(-) diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml index 3a40c50..a93b1a8 100644 --- a/1080i/DialogConfirm.xml +++ b/1080i/DialogConfirm.xml @@ -17,7 +17,7 @@ 8-col-gutter 2-row true - pageTitle + regularStrong textActive diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml index 7898131..ab61aa7 100644 --- a/1080i/Includes_animations.xml +++ b/1080i/Includes_animations.xml @@ -19,7 +19,7 @@ - + diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml index cf9cc78..f0317ab 100644 --- a/1080i/Includes_hubOptionsItems.xml +++ b/1080i/Includes_hubOptionsItems.xml @@ -185,7 +185,7 @@ - + 6-col colors/white.png diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml index 7f33930..4313a2b 100644 --- a/1080i/Includes_variables.xml +++ b/1080i/Includes_variables.xml @@ -27,6 +27,8 @@ $LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR] $LOCALIZE[10506] $LOCALIZE[31123] + $LOCALIZE[31056] + $INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly] @@ -36,7 +38,9 @@ $INFO[container.numitems] $LOCALIZE[31165] $INFO[container.Numitems,, $LOCALIZE[31145]] $INFO[container.Numitems,, $LOCALIZE[31014]] - + $INFO[container.Numitems,, $LOCALIZE[31038]] + $INFO[container.foldername,,] $INFO[container.Numitems,(, $LOCALIZE[31050])] + $INFO[Listitem.duration,, $LOCALIZE[31018]] diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml index 495b168..4eba136 100644 --- a/1080i/MyPics.xml +++ b/1080i/MyPics.xml @@ -27,41 +27,10 @@ 9999 - + - col-1-begin - row-1-begin - - - 0 - 0 - 14-col - pageTitle - - textActive - - - - IntegerGreaterThan(container.Numitems,0) + Container.HasFolders - 0 - 45 - 24-col - regular - - textActive - - - IntegerGreaterThan(container.Numitems,0) + !Container.HasFolders - 0 - 45 - 24-col - regular - - textActive - + pageHeader - - dateTime hubMenu diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml index 2d5c2b3..292735d 100644 --- a/1080i/View_Photos.xml +++ b/1080i/View_Photos.xml @@ -20,10 +20,10 @@ 6-col-gutter 4-col-gutter scale - DefaultPoster.png - colors/black.png + colors/black.png + colors/black.png 6 - 44FFFFFF + overlay 0 @@ -31,10 +31,8 @@ 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] - colors/black.png + $INFO[Listitem.thumb] 6 - ffffffff 12 @@ -60,14 +58,24 @@ focusThumb + + 0 + 0 + 6-col-gutter + 4-col-gutter + scale + colors/black.png + colors/white.png + 6 + FF000000 + 0 0 6-col-gutter 4-col-gutter scale - $INFO[Listitem.thumb] - colors/white.png + $INFO[Listitem.thumb] 6 diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml index 771a6e2..e095d92 100644 --- a/1080i/custom_musicPlayerFullscreen.xml +++ b/1080i/custom_musicPlayerFullscreen.xml @@ -1,219 +1,99 @@ - 9876 - RunScript(script.artistslideshow) - control.setfocus(9999) - - globalBackground - - fadeInOut - - - - isempty(Window(Visualisation).Property(ArtistSlideshow)) - 0 - 0 - dimensionsFullscreen - $INFO[player.art(fanart)] - stretch - kenBurnsey - 44ffffff - - - - !isempty(Window(Visualisation).Property(ArtistSlideshow)) - dimensionsFullscreen - scale - 15000 - true - 1000 - yes - $INFO[Window(Visualisation).Property(ArtistSlideshow)] - kenBurnsey - 88ffffff - - - - !SlideShow.IsActive - visualisation - 0 - 0 - dimensionsFullscreen - - - - - col-1-begin - row-23-begin - - - 0 - 0 - 5-row - 182 - stretch - DefaultAlbumCover.png - colors/black.png - 6 - overlay - - - 0 - 0 - 5-row - 182 - stretch - $INFO[player.art(thumb)] - - - - 182 - 0 - - 0 - 0 - 9-col - 71 - colors/white.png - highlight - - - 24 - 0 - 542 - 2-row - regularStrong - textActive - true - - - - 8-col - 0 - 612 - 2-row - regularStrong - textActive - true - - - - 0 - 2-row - 9-col - 1-row - colors/white.png - FFFFFFFF - - - 24 - 2-row - 612 - 1-row - smallStrong - black - false - - - - 0 - 3-row - 9-col - 2-row - colors/black.png - 99000000 - - - Duration - 0 - 3-row - 9-col - 2-row - false - - - - - colors/white.png - - - - - Player.Progress - - - 24 - 3-row - 612 - 2-row - regularStrong - left - textActive - - - false - - - - 9-col-gutter - 3-row - 612 - 2-row - regularStrong - right - textActive - - - false - - - - Playlist.IsRepeat | Playlist.IsRepeatOne - 5-col-gutter - 3-row - 612 - 2-row - symbolLarge - right - textActive - - - - - - Playlist.IsRandom - 384 - 3-row - 612 - 2-row - symbolLarge - right - textActive - - - - - - - - - - 0 - 0 - dimensionsFullscreen - vignette.png - ffffffff - stretch - - - - -100 - -100 - 1-col - 1-col - VolumeUp - VolumeDown - playercontrol(previous) - playercontrol(next) - activatewindow(1105) - - - DebugGrid - - DialogID - - - + 9876 + RunScript(script.artistslideshow) + control.setfocus(9999) + + globalBackground + + fadeInOut + + + + isempty(Window(Visualisation).Property(ArtistSlideshow)) + 0 + 0 + dimensionsFullscreen + $INFO[player.art(fanart)] + stretch + kenBurnsey + 44ffffff + + + + !isempty(Window(Visualisation).Property(ArtistSlideshow)) + dimensionsFullscreen + scale + 15000 + true + 1000 + yes + $INFO[Window(Visualisation).Property(ArtistSlideshow)] + kenBurnsey + 88ffffff + + + + !SlideShow.IsActive + visualisation + 0 + 0 + dimensionsFullscreen + + + + + col-1-begin + row-20-begin + vertical + 10 + + 10-col + auto + mediumStrong + textActive + true + false + 33000000 + + + + 10-col + auto + regular + textActive + false + 33000000 + + + + 10-col + 1-row + buttonTitle + textActive + false + 33000000 + + + + + + + -100 + -100 + 1-col + 1-col + VolumeUp + VolumeDown + playercontrol(previous) + playercontrol(next) + activatewindow(1105) + + + DebugGrid + + DialogID + + + diff --git a/changelog.txt b/changelog.txt index cf9d064..280bd6c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,8 @@ DONE - recent tvshow episode listing not working DONE - Add progress bar to resumable content DONE - playlist titles not working. (See Github for random label) +Librelec settings + [V1.2.4] - [UPDATED] French language file - [UPDATED] Norwegian language file diff --git a/shortcuts/picturessubmenu.DATA.xml b/shortcuts/picturessubmenu.DATA.xml index d1d21f5..7328f75 100644 --- a/shortcuts/picturessubmenu.DATA.xml +++ b/shortcuts/picturessubmenu.DATA.xml @@ -1,12 +1,5 @@ - - - 32034 - DefaultAddon.png - - RunScript(script.globalsearch) - 32020