[vlc-commits] commit: Qt/EPG: Display the short description and the long one when available. ( Adrien Maglo )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Adrien Maglo <magsoft at videolan.org> | Fri Jun 18 19:51:53 2010 +0200| [5b1e4391efdabe49d49964aa4231155df7351c6e] | committer: Jean-Baptiste Kempf 

Qt/EPG: Display the short description and the long one when available.
(cherry picked from commit 3f7e57a4c23b25054ce185dd3d650bfa52f9e09f)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=5b1e4391efdabe49d49964aa4231155df7351c6e
---

 modules/gui/qt4/dialogs/epg.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp
index 9b31c8f..afb16b1 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()