[vlc-devel] commit: Qt: initial EPG dialogs and DP integration (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jan 27 01:27:19 2010 +0100| [0a03829d9ec0d32fba8a2b175017fa7ebbf46b1d] | committer: Jean-Baptiste Kempf 

Qt: initial EPG dialogs and DP integration

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

 modules/gui/qt4/Modules.am           |    3 ++
 modules/gui/qt4/dialogs/epg.cpp      |   46 ++++++++++++++++++++++++++++++++++
 modules/gui/qt4/dialogs/epg.hpp      |   42 +++++++++++++++++++++++++++++++
 modules/gui/qt4/dialogs_provider.cpp |    6 ++++
 modules/gui/qt4/dialogs_provider.hpp |    1 +
 5 files changed, 98 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index c74c5f6..048df1b 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -28,6 +28,7 @@ nodist_SOURCES_qt4 = \
 		dialogs/mediainfo.moc.cpp \
 		dialogs/extended.moc.cpp \
 		dialogs/messages.moc.cpp \
+		dialogs/epg.moc.cpp \
 		dialogs/errors.moc.cpp \
 		dialogs/external.moc.cpp \
 		dialogs/plugins.moc.cpp \
@@ -225,6 +226,7 @@ SOURCES_qt4 = 	qt4.cpp \
 		dialogs/bookmarks.cpp \
 		dialogs/preferences.cpp \
 		dialogs/mediainfo.cpp \
+		dialogs/epg.cpp \
 		dialogs/extended.cpp \
 		dialogs/messages.cpp \
 		dialogs/errors.cpp \
@@ -281,6 +283,7 @@ noinst_HEADERS = \
 	dialogs/mediainfo.hpp \
 	dialogs/extended.hpp \
 	dialogs/messages.hpp \
+	dialogs/epg.hpp \
 	dialogs/errors.hpp \
 	dialogs/external.hpp \
 	dialogs/plugins.hpp \
diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp
new file mode 100644
index 0000000..b5213c3
--- /dev/null
+++ b/modules/gui/qt4/dialogs/epg.cpp
@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * Epg.cpp : Epg Viewer dialog
+ ****************************************************************************
+ * Copyright © 2010 VideoLAN and AUTHORS
+ *
+ * Authors:    Jean-Baptiste Kempf <jb at videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "dialogs/epg.hpp"
+
+#include "components/epg/EPGWidget.hpp"
+
+#include <QHBoxLayout>
+
+EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
+{
+    setTitle( "Program Guide" );
+
+    QHBoxLayout *layout = new QHBoxLayout( this );
+    EPGWidget *epg = new EPGWidget( this );
+
+    layout->addWidget( epg );
+}
+
+EpgDialog::~EpgDialog()
+{
+}
+
diff --git a/modules/gui/qt4/dialogs/epg.hpp b/modules/gui/qt4/dialogs/epg.hpp
new file mode 100644
index 0000000..1d6bedf
--- /dev/null
+++ b/modules/gui/qt4/dialogs/epg.hpp
@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * epg.cpp : EPG Viewer dialog
+ ****************************************************************************
+ * Copyright © 2010 VideoLAN and AUTHORS
+ *
+ * Authors:    Jean-Baptiste Kempf <jb at videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifndef QVLC_EPG_DIALOG_H_
+#define QVLC_EPG_DIALOG_H_ 1
+
+#include "util/qvlcframe.hpp"
+
+#include "util/singleton.hpp"
+
+
+class EpgDialog : public QVLCFrame, public Singleton<EpgDialog>
+{
+    Q_OBJECT;
+private:
+    EpgDialog( intf_thread_t * );
+    virtual ~EpgDialog();
+
+    friend class    Singleton<EpgDialog>;
+};
+
+#endif
+
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 3c68d30..a66c057 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -54,6 +54,7 @@
 #include "dialogs/plugins.hpp"
 #include "dialogs/external.hpp"
 #include "dialogs/errors.hpp"
+#include "dialogs/epg.hpp"
 
 #include <QEvent>
 #include <QApplication>
@@ -263,6 +264,11 @@ void DialogsProvider::pluginDialog()
     PluginDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::epgDialog()
+{
+    EpgDialog::getInstance( p_intf )->toggleVisible();
+}
+
 /* Generic open file */
 void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
 {
diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index e6c66b3..8bf708e 100644
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -158,6 +158,7 @@ public slots:
     void podcastConfigureDialog();
     void toolbarDialog();
     void pluginDialog();
+    void epgDialog();
 
     void openFileGenericDialog( intf_dialog_args_t * );