From 3f7e57a4c23b25054ce185dd3d650bfa52f9e09f Mon Sep 17 00:00:00 2001 From: Adrien Maglo Date: Fri, 18 Jun 2010 19:51:53 +0200 Subject: [PATCH] Qt/EPG: Display the short description and the long one when available. --- modules/gui/qt4/dialogs/epg.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp index 9b31c8f302..afb16b1f98 100644 --- a/modules/gui/qt4/dialogs/epg.cpp +++ b/modules/gui/qt4/dialogs/epg.cpp @@ -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() -- 2.39.2