Commit 5b1e4391 authored by Adrien Maglo's avatar Adrien Maglo Committed by Jean-Baptiste Kempf

Qt/EPG: Display the short description and the long one when available.

(cherry picked from commit 3f7e57a4)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 48514572
......@@ -96,12 +96,11 @@ void EpgDialog::showEvent( EPGEvent *event )
QDateTime end = event->start.addSecs( event->duration );
title->setText( event->start.toString( "hh:mm" ) + " - "
+ end.toString( "hh:mm" ) + " : "
+ event->name );
+ event->name
+ ( event->shortDescription.isEmpty()
? "" : " - " + event->shortDescription ) );
if( !event->description.isEmpty() )
description->setText( event->description );
else
description->setText( event->shortDescription );
description->setText( event->description );
}
void EpgDialog::updateInfos()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment