diff options
| author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-08-11 19:55:33 +0200 |
|---|---|---|
| committer | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2019-08-14 22:00:11 +0200 |
| commit | 051e5126cff0e96ace2e16401d1cac6df2596ad0 (patch) | |
| tree | 36fc36e913defbf39dabfbd1c694304aa8cbb227 /addons | |
| parent | 4c90040943d9f38610a05bd920e49fbd4fbd6a75 (diff) | |
[Estuary] PictureInfoDialog: Fix picture title and and date when slideshow is active.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/DialogPictureInfo.xml | 4 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/addons/skin.estuary/xml/DialogPictureInfo.xml b/addons/skin.estuary/xml/DialogPictureInfo.xml index 92c2fe0405..2a6d20e2d0 100644 --- a/addons/skin.estuary/xml/DialogPictureInfo.xml +++ b/addons/skin.estuary/xml/DialogPictureInfo.xml @@ -119,8 +119,8 @@ </control> </control> <include content="InfoDialogTopBarInfo"> - <param name="main_label" value="$INFO[ListItem.Label]" /> - <param name="sub_label" value="$INFO[ListItem.PictureDateTime]" /> + <param name="main_label" value="$VAR[PictureInfoMainLabelVar]" /> + <param name="sub_label" value="$VAR[PictureInfoSubLabelVar]" /> </include> <include condition="Skin.HasSetting(touchmode)">TouchBackButton</include> </controls> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index 2755604acf..94a340cfa6 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -273,6 +273,14 @@ <value condition="Control.HasFocus(8)">$INFO[ListItem.LastPlayed,$LOCALIZE[568]: ]</value> <value condition="Control.HasFocus(6)">$INFO[ListItem.FileNameAndPath]</value> </variable> + <variable name="PictureInfoMainLabelVar"> + <value condition="Window.IsActive(Slideshow)">$INFO[SlideShow.Filename]</value> + <value>$INFO[ListItem.Label]</value> + </variable> + <variable name="PictureInfoSubLabelVar"> + <value condition="Window.IsActive(Slideshow)">$INFO[SlideShow.EXIFtime]</value> + <value>$INFO[ListItem.PictureDateTime]</value> + </variable> <variable name="NowPlayingBreadcrumbsVar"> <value condition="VideoPlayer.Content(livetv)">$INFO[VideoPlayer.Title]</value> <value condition="VideoPlayer.Content(episodes) + !String.IsEmpty(Player.Art(tvshow.clearlogo))">$INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.Title]</value> |