diff options
| author | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-05-05 15:31:49 +0200 |
|---|---|---|
| committer | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-05-10 22:45:04 +0200 |
| commit | 4bd3e88fa399790522f048cba92fbb61b1fbe7d9 (patch) | |
| tree | f67be66106e083d255b1c889e8ab11f15cf9e61e /addons | |
| parent | 4a0eeaa3aff652e8e6c1f6f9d6c1596fc91d8c9a (diff) | |
[Estuary][PVR] Guide window: If both channel icon and programme thumbnail are available, show both, like we already do in fullscreen OSD.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.estuary/xml/Includes_PVR.xml | 47 | ||||
| -rw-r--r-- | addons/skin.estuary/xml/MyPVRGuide.xml | 56 |
2 files changed, 66 insertions, 37 deletions
diff --git a/addons/skin.estuary/xml/Includes_PVR.xml b/addons/skin.estuary/xml/Includes_PVR.xml index 951cdfeeb8..c482d2b708 100644 --- a/addons/skin.estuary/xml/Includes_PVR.xml +++ b/addons/skin.estuary/xml/Includes_PVR.xml @@ -526,6 +526,53 @@ <visible>!String.IsEmpty(PVR.ChannelNumberInput)</visible> </control> </include> + <include name="EpgEventDetails"> + <definition> + <control type="group"> + <top>0</top> + <left>350</left> + <right>$PARAM[right]</right> + <control type="label"> + <width>100%</width> + <height>30</height> + <label>[B]$INFO[ListItem.EpgEventTitle][/B] $INFO[ListItem.Year,([COLOR grey],[/COLOR])]</label> + </control> + <control type="label"> + <top>35</top> + <width>100%</width> + <height>30</height> + <label>$VAR[FlagDashLabel][I][COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white],[/COLOR]][/I]</label> + </control> + </control> + <control type="textbox"> + <left>350</left> + <top>85</top> + <right>$PARAM[right]</right> + <height>130</height> + <align>justify</align> + <label>$INFO[ListItem.Plot]</label> + <autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll> + </control> + <control type="group"> + <top>220</top> + <left>350</left> + <control type="label"> + <top>0</top> + <width>25%</width> + <height>30</height> + <label>$INFO[ListItem.StartTime,[COLOR button_focus]$LOCALIZE[555]:[/COLOR] ]$INFO[ListItem.EndTime, - ]</label> + </control> + <control type="label"> + <top>0</top> + <right>$PARAM[right]</right> + <width>75%</width> + <height>30</height> + <align>right</align> + <label>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:[/COLOR] ]</label> + </control> + </control> + </definition> + </include> <include name="EpgGrid"> <definition> <control type="epggrid" id="$PARAM[control_id]"> diff --git a/addons/skin.estuary/xml/MyPVRGuide.xml b/addons/skin.estuary/xml/MyPVRGuide.xml index c84b51c15a..80e866422f 100644 --- a/addons/skin.estuary/xml/MyPVRGuide.xml +++ b/addons/skin.estuary/xml/MyPVRGuide.xml @@ -178,47 +178,29 @@ <height>250</height> <aspectratio align="center" aligny="center">keep</aspectratio> <fadetime>400</fadetime> - <texture>$INFO[ListItem.Icon]</texture> + <texture>$INFO[ListItem.ChannelLogo]</texture> </control> <control type="group"> - <top>0</top> - <left>350</left> - <control type="label"> - <width>70%</width> - <height>30</height> - <label>[B]$INFO[ListItem.EpgEventTitle][/B] $INFO[ListItem.Year,([COLOR grey],[/COLOR])]</label> - </control> - <control type="label"> - <top>0</top> - <right>30</right> - <width>30%</width> - <height>30</height> - <align>right</align> - <label>[COLOR button_focus]$INFO[ListItem.StartTime,[COLOR grey]$LOCALIZE[555]:[/COLOR] ][/COLOR]$INFO[ListItem.EndTime,[COLOR button_focus] - ,[/COLOR]]</label> - </control> - <control type="label"> - <top>35</top> - <width>60%</width> - <height>30</height> - <label>$VAR[FlagDashLabel][I][COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white],[/COLOR]][/I]</label> - </control> - <control type="label"> - <top>35</top> - <right>30</right> - <width>40%</width> - <height>30</height> - <align>right</align> - <label>$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]:[/COLOR] ]</label> - </control> + <visible>String.IsEmpty(ListItem.EpgEventIcon)</visible> + <include content="EpgEventDetails"> + <param name="right" value="30"/> + </include> </control> - <control type="textbox"> - <left>350</left> - <top>85</top> + <control type="group"> + <visible>!String.IsEmpty(ListItem.EpgEventIcon)</visible> + <include content="EpgEventDetails"> + <param name="right" value="350"/> + </include> + </control> + <control type="image"> + <top>10</top> <right>30</right> - <height>170</height> - <align>justify</align> - <label>$INFO[ListItem.Plot]</label> - <autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll> + <width>290</width> + <height>250</height> + <aspectratio align="center" aligny="center">keep</aspectratio> + <fadetime>400</fadetime> + <texture>$INFO[ListItem.EpgEventIcon]</texture> + <visible>!String.IsEmpty(ListItem.EpgEventIcon)</visible> </control> </control> </control> |