Skip to content

V
vlc-2-2
Commit 3f7e57a4 authored by Adrien Maglo's avatar Adrien Maglo
Browse files
Options

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

parent 330016cb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
modules/gui/qt4/dialogs/epg.cpp
View file @ 3f7e57a4
...@@ -96,12 +96,11 @@ void EpgDialog::showEvent( EPGEvent *event ) ...@@ -96,12 +96,11 @@ void EpgDialog::showEvent( EPGEvent *event )
QDateTime end = event->start.addSecs( event->duration ); QDateTime end = event->start.addSecs( event->duration );
title->setText( event->start.toString( "hh:mm" ) + " - " title->setText( event->start.toString( "hh:mm" ) + " - "
+ end.toString( "hh:mm" ) + " : " + end.toString( "hh:mm" ) + " : "
+ event->name ); + event->name
+ ( event->shortDescription.isEmpty()
? "" : " - " + event->shortDescription ) );
if( !event->description.isEmpty() ) description->setText( event->description );
description->setText( event->description );
else
description->setText( event->shortDescription );
} }
void EpgDialog::updateInfos() 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