Qt/EPG: Set the EPGView start time correctly.

[vlc] / modules / gui / qt4 / components / epg / EPGWidget.cpp

diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp
index 55bf2f82e349dd567f57c2f4ff3314f48fc455fc..948b83c090c2fe5eef161e16a82404e0766d4602 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGWidget.cpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.cpp
@@ -21,36 +21,33 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "EPGWidget.hpp"
 
-#include <QGridLayout>
+#include <QVBoxLayout>
 #include <QScrollBar>
 #include <QDebug>
 #include <QLabel>
-
-ChannelsWidget::ChannelsWidget( QWidget *parent ) : QWidget( parent )
-{
-    setContentsMargins( 0, 0, 0, 0 );
-    setMaximumWidth( 50 );
-    setFocusPolicy( Qt::ClickFocus );
-}
+#include "qt4.hpp"
 
 EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
 {
-    QGridLayout* layout = new QGridLayout( this );
-
     m_rulerWidget = new EPGRuler( this );
-    m_channelsWidget = new ChannelsWidget( this );
     m_epgView = new EPGView( this );
+    m_channelsWidget = new EPGChannels( this, m_epgView );
 
-    m_channelsWidget->setMinimumWidth( 40 );
+    m_channelsWidget->setMinimumWidth( 100 );
 
     m_epgView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
     setZoom( 1 );
 
-    layout->addWidget( m_rulerWidget,       0, 1 );
-    layout->addWidget( m_channelsWidget,    1, 0 );
-    layout->addWidget( m_epgView,           1, 1 );
+    QGridLayout* layout = new QGridLayout( this );
+    layout->addWidget( m_rulerWidget, 0, 1 );
+    layout->addWidget( m_channelsWidget, 1, 0 );
+    layout->addWidget( m_epgView, 1, 1 );
     layout->setSpacing( 0 );
     setLayout( layout );
 
@@ -60,6 +57,8 @@ EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
              m_rulerWidget, SLOT( setDuration(int) ) );
     connect( m_epgView->horizontalScrollBar(), SIGNAL( valueChanged(int) ),
              m_rulerWidget, SLOT( setOffset(int) ) );
+    connect( m_epgView->verticalScrollBar(), SIGNAL( valueChanged(int) ),
+             m_channelsWidget, SLOT( setOffset(int) ) );
     connect( m_epgView, SIGNAL( eventFocusedChanged(EPGEvent*)),
              this, SIGNAL(itemSelectionChanged(EPGEvent*)) );
 }
@@ -73,57 +72,46 @@ void EPGWidget::setZoom( int level )
 
 void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg )
 {
-    m_epgView->setStartTime( QDateTime::currentDateTime() );
     for ( int i = 0; i < i_epg; ++i )
     {
         vlc_epg_t *p_epg = pp_epg[i];
-        QString channelName = QString( p_epg->psz_name );
+        QString channelName = qfu( p_epg->psz_name );
 
         for ( int j = 0; j < p_epg->i_event; ++j )
         {
-            EPGEvent *item = NULL;
             vlc_epg_event_t *p_event = p_epg->pp_event[j];
-            QString eventName = QString( p_event->psz_name );
+            QString eventName = qfu( p_event->psz_name );
+            QDateTime eventStart = QDateTime::fromTime_t( p_event->i_start );
 
             QList<EPGEvent*> events = m_events.values( channelName );
 
+            EPGEvent *item = new EPGEvent( eventName );
+            item->description = qfu( p_event->psz_description );
+            item->shortDescription = qfu( p_event->psz_short_description );
+            item->start = eventStart;
+            item->duration = p_event->i_duration;
+            item->channelName = channelName;
+            item->current = ( p_epg->p_current == p_event ) ? true : false;
+
+            bool alreadyIn = false;
+
             for ( int k = 0; k < events.count(); ++k )
             {
-                if ( events.at( k )->name == eventName &&
-                     events.at( k )->channelName == channelName )
+                if ( *events.at( k ) == *item )
                 {
-                    item = events.at( k );
-                    item->updated = true;
-                    item->description = QString( p_event->psz_description );
-                    item->shortDescription = QString( p_event->psz_short_description );
-                    item->start = QDateTime::fromTime_t( p_event->i_start );
-                    item->duration = p_event->i_duration;
-                    item->current = ( p_epg->p_current == p_event ) ? true : false;
-
-                    if ( item->start < m_epgView->startTime() )
-                        m_epgView->setStartTime( item->start );
-
-                    m_epgView->updateEvent( item );
+                    alreadyIn = true;
+                    events.at( k )->updated = true;
                     break;
                 }
             }
 
-            if ( !item )
+            if ( !alreadyIn )
             {
-                item = new EPGEvent( eventName );
-                item->description = QString( p_event->psz_description );
-                item->shortDescription = QString( p_event->psz_short_description );
-                item->start = QDateTime::fromTime_t( p_event->i_start );
-                item->duration = p_event->i_duration;
-                item->channelName = channelName;
-                item->current = ( p_epg->p_current == p_event ) ? true : false;
                 m_events.insert( channelName, item );
-
-                if ( item->start < m_epgView->startTime() )
-                    m_epgView->setStartTime( item->start );
-
                 m_epgView->addEvent( item );
             }
+            else
+                delete item;
         }
     }
 
@@ -144,7 +132,8 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg )
         ++i;
     }
 
-    // Update the global duration
+    // Update the global duration and start time.
     m_epgView->updateDuration();
+    m_epgView->updateStartTime();
 }