]> git.sesse.net Git - vlc/commitdiff
Qt/EPG: Display the short description and the long one when available.
authorAdrien Maglo <magsoft@videolan.org>
Fri, 18 Jun 2010 17:51:53 +0000 (19:51 +0200)
committerAdrien Maglo <magsoft@videolan.org>
Fri, 18 Jun 2010 17:51:53 +0000 (19:51 +0200)
modules/gui/qt4/dialogs/epg.cpp

index 9b31c8f3028fb83e87bc64ec36f01aa4e2190128..afb16b1f98c87453c1466a3c27ca9c1e141fd977 100644 (file)
@@ -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()