From 45ac6e578e11e63c69a6ee537ade1b02ba5697db Mon Sep 17 00:00:00 2001 From: Ludovic Fauvet Date: Wed, 2 Jun 2010 11:06:05 +0200 Subject: [PATCH] epg: remove the external channels widget Signed-off-by: Jean-Baptiste Kempf --- modules/gui/qt4/components/epg/EPGWidget.cpp | 20 ++++---------------- modules/gui/qt4/components/epg/EPGWidget.hpp | 8 -------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp index 9441eff1c7..d5f235dbd1 100644 --- a/modules/gui/qt4/components/epg/EPGWidget.cpp +++ b/modules/gui/qt4/components/epg/EPGWidget.cpp @@ -27,35 +27,23 @@ #include "EPGWidget.hpp" -#include +#include #include #include #include #include "qt4.hpp" -ChannelsWidget::ChannelsWidget( QWidget *parent ) : QWidget( parent ) -{ - setContentsMargins( 0, 0, 0, 0 ); - setMaximumWidth( 50 ); - setFocusPolicy( Qt::ClickFocus ); -} - 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->setMinimumWidth( 40 ); - 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 ); + QVBoxLayout* layout = new QVBoxLayout( this ); + layout->addWidget( m_rulerWidget ); + layout->addWidget( m_epgView ); layout->setSpacing( 0 ); setLayout( layout ); diff --git a/modules/gui/qt4/components/epg/EPGWidget.hpp b/modules/gui/qt4/components/epg/EPGWidget.hpp index 4a99a0b2cc..41bcba7bae 100644 --- a/modules/gui/qt4/components/epg/EPGWidget.hpp +++ b/modules/gui/qt4/components/epg/EPGWidget.hpp @@ -36,13 +36,6 @@ class QDateTime; -class ChannelsWidget : public QWidget -{ - Q_OBJECT -public: - explicit ChannelsWidget( QWidget* parent = 0 ); -}; - class EPGWidget : public QWidget { Q_OBJECT @@ -54,7 +47,6 @@ public slots: void updateEPG( vlc_epg_t **pp_epg, int i_epg ); private: - ChannelsWidget* m_channelsWidget; EPGRuler* m_rulerWidget; EPGView* m_epgView; -- 2.39.2