Commit 30d93b5f authored by Ludovic Fauvet's avatar Ludovic Fauvet Committed by Jean-Baptiste Kempf

epg: remove the external channels widget

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 45ac6e578e11e63c69a6ee537ade1b02ba5697db)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 79cf82b1
...@@ -27,35 +27,23 @@ ...@@ -27,35 +27,23 @@
#include "EPGWidget.hpp" #include "EPGWidget.hpp"
#include <QGridLayout> #include <QVBoxLayout>
#include <QScrollBar> #include <QScrollBar>
#include <QDebug> #include <QDebug>
#include <QLabel> #include <QLabel>
#include "qt4.hpp" #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 ) EPGWidget::EPGWidget( QWidget *parent ) : QWidget( parent )
{ {
QGridLayout* layout = new QGridLayout( this );
m_rulerWidget = new EPGRuler( this ); m_rulerWidget = new EPGRuler( this );
m_channelsWidget = new ChannelsWidget( this );
m_epgView = new EPGView( this ); m_epgView = new EPGView( this );
m_channelsWidget->setMinimumWidth( 40 );
m_epgView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ); m_epgView->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
setZoom( 1 ); setZoom( 1 );
layout->addWidget( m_rulerWidget, 0, 1 ); QVBoxLayout* layout = new QVBoxLayout( this );
layout->addWidget( m_channelsWidget, 1, 0 ); layout->addWidget( m_rulerWidget );
layout->addWidget( m_epgView, 1, 1 ); layout->addWidget( m_epgView );
layout->setSpacing( 0 ); layout->setSpacing( 0 );
setLayout( layout ); setLayout( layout );
......
...@@ -36,13 +36,6 @@ ...@@ -36,13 +36,6 @@
class QDateTime; class QDateTime;
class ChannelsWidget : public QWidget
{
Q_OBJECT
public:
explicit ChannelsWidget( QWidget* parent = 0 );
};
class EPGWidget : public QWidget class EPGWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -54,7 +47,6 @@ public slots: ...@@ -54,7 +47,6 @@ public slots:
void updateEPG( vlc_epg_t **pp_epg, int i_epg ); void updateEPG( vlc_epg_t **pp_epg, int i_epg );
private: private:
ChannelsWidget* m_channelsWidget;
EPGRuler* m_rulerWidget; EPGRuler* m_rulerWidget;
EPGView* m_epgView; EPGView* m_epgView;
......
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