[vlc-commits] Qt: epg: show date on non current day

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Dec 16 14:38:35 2016 +0100| [ff69c44bcf2869f07a259f673eeb6ea44593494a] | committer: Francois Cartegnie

Qt: epg: show date on non current day

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

 modules/gui/qt/dialogs/epg.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/dialogs/epg.cpp b/modules/gui/qt/dialogs/epg.cpp
index 481557b..0485bbc 100644
--- a/modules/gui/qt/dialogs/epg.cpp
+++ b/modules/gui/qt/dialogs/epg.cpp
@@ -134,11 +134,20 @@ void EpgDialog::displayEvent( EPGItem *epgItem )
         return;
     }
 
+    QDateTime now = QDateTime::currentDateTime();
+    QDateTime enddate = epgItem->start().addSecs( epgItem->duration() );
+
+    QString start, end;
+    if( epgItem->start().daysTo(now) != 0 )
+        start = epgItem->start().toString( Qt::SystemLocaleLongDate );
+    else
+        start = epgItem->start().time().toString( "hh:mm" );
+
+    end = enddate.time().toString( "hh:mm" );
 
-    QDateTime end = epgItem->start().addSecs( epgItem->duration() );
     title->setText( QString("%1 - %2 : %3%4")
-                   .arg( epgItem->start().toString( "hh:mm" ) )
-                   .arg( end.toString( "hh:mm" ) )
+                   .arg( start )
+                   .arg( end )
                    .arg( epgItem->name() )
                    .arg( epgItem->rating() ?
                              qtr(" (%1+ rated)").arg( epgItem->rating() ) :