diff options
| author | fuzzard <bmurphy@bcmcs.net> | 2018-01-04 13:42:03 +1000 |
|---|---|---|
| committer | fuzzard <bmurphy@bcmcs.net> | 2018-01-04 22:39:38 +1000 |
| commit | a67145167d48dbe730bf16f4534bb99cb42f4edc (patch) | |
| tree | 1d6aa0900e90e48e5607bf73f038acab0a6f7a9e /addons | |
| parent | daed233cb9104828aa37cfe47c3cbaa149ce4f82 (diff) | |
[Estuary][PVR] Season/Ep info in PVRGuide
Show season and episode on main Guide screen when available. Move Episode Title
to same line with ep/season when available, similar to DialogPVRInfo.xml
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/DialogPVRInfo.xml | 2 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/MyPVRGuide.xml | 11 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/Variables.xml | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/addons/skin.estuary/xml/DialogPVRInfo.xml b/addons/skin.estuary/xml/DialogPVRInfo.xml index eb06d6f17e..a8903e96cb 100644 --- a/addons/skin.estuary/xml/DialogPVRInfo.xml +++ b/addons/skin.estuary/xml/DialogPVRInfo.xml @@ -119,7 +119,7 @@ </control> <include content="InfoDialogTopBarInfo"> <param name="main_label" value="$INFO[ListItem.Title]" /> - <param name="sub_label" value="$VAR[SeasonEpisodeLabel]" /> + <param name="sub_label" value="[COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white][B],[/B][/COLOR]]" /> <param name="posy" value="40" /> </include> </control> diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml index 7e22beab15..08a7471253 100644 --- a/addons/skin.estuary/xml/MyPVRGuide.xml +++ b/addons/skin.estuary/xml/MyPVRGuide.xml @@ -64,11 +64,18 @@ <left>300</left> <right>60</right> <height>30</height> - <label>[COLOR button_focus]$INFO[ListItem.StartTime][/COLOR]$INFO[ListItem.EndTime,[COLOR button_focus] - ,[/COLOR]] $INFO[ListItem.EpgEventTitle]$INFO[ListItem.EpisodeName, (,)]$INFO[ListItem.Genre, [COLOR grey]$LOCALIZE[515]:[/COLOR] ]</label> + <label>[COLOR button_focus]$INFO[ListItem.StartTime][/COLOR]$INFO[ListItem.EndTime,[COLOR button_focus] - ,[/COLOR]] $INFO[ListItem.EpgEventTitle]$INFO[ListItem.Genre, [COLOR grey]$LOCALIZE[515]:[/COLOR] ]</label> + </control> + <control type="label"> + <top>29</top> + <left>300</left> + <right>60</right> + <height>30</height> + <label>[COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white],[/COLOR]]</label> </control> <control type="textbox"> <left>300</left> - <top>38</top> + <top>67</top> <right>60</right> <height>173</height> <label>$INFO[ListItem.Plot]</label> diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml index f59f13f5d5..7a6c2b95c9 100644 --- a/addons/skin.estuary/xml/Variables.xml +++ b/addons/skin.estuary/xml/Variables.xml @@ -409,9 +409,8 @@ <value condition="ListItem.HasTimer">icons/pvr/PVR-HasTimer.png</value> </variable> <variable name="SeasonEpisodeLabel"> - <value condition="String.IsEmpty(ListItem.Season) + String.IsEmpty(ListItem.Episode)">$INFO[ListItem.EpisodeName,[B],[/B]]</value> - <value condition="String.IsEmpty(ListItem.EpisodeName)">$INFO[ListItem.Season,[COLOR grey]S,[/COLOR]]$INFO[ListItem.Episode,[COLOR grey]E,[/COLOR]]</value> - <value>$INFO[ListItem.Season,[COLOR grey]S,[/COLOR]]$INFO[ListItem.Episode,[COLOR grey]E,[/COLOR]]: [B]$INFO[ListItem.EpisodeName][/B]</value> + <value condition="String.IsEmpty(ListItem.EpisodeName)">$INFO[ListItem.Season,S]$INFO[ListItem.Episode,E]</value> + <value>$INFO[ListItem.Season,S]$INFO[ListItem.Episode,E,: ]</value> </variable> <variable name="ExpirationDateTimeLabel"> <value condition="!String.IsEmpty(ListItem.ExpirationDate)">[COLOR grey]$LOCALIZE[19299]:[/COLOR] $INFO[ListItem.ExpirationDate] $INFO[ListItem.ExpirationTime][CR]</value> |