Bug 586722 - Incubator qt embedding should switch to QGraphicsWidgets. r=romaxa

Author: tmeshkova

qt/QMozView.cpp

@@ -123,8 +123,8 @@ void QMozViewListener::OnConsoleMessage(const char * message)
     emit pQMozView->consoleMessage(qt_message);
 }
 
-QMozView::QMozView(QWidget *parent, unsigned int flags) :
-    QWidget(parent),
+QMozView::QMozView(QGraphicsWidget *parent, unsigned int flags) :
+    QGraphicsWidget(parent),
     mPrivate(new Private(this))
 {
 #if defined Q_OS_WIN
@@ -140,7 +140,7 @@ QMozView::~QMozView()
     delete mPrivate;
 }
 
-void QMozView::resizeEvent(QResizeEvent* event)
+void QMozView::resizeEvent(QGraphicsSceneResizeEvent* event)
 {
     Q_UNUSED(event);
     mPrivate->mozView.SetPositionAndSize(0, 0, size().width(), size().height());

qt/QMozView.h

@@ -44,16 +44,17 @@
 #include "QMozEmbedExport.h"
 
 #include <QtGui/QWidget>
+#include <QtGui/QGraphicsWidget>
 
 class QMozViewListener;
 class nsIInterfaceRequestor;
 
-class Q_MOZEMBED_EXPORT QMozView : public QWidget
+class Q_MOZEMBED_EXPORT QMozView : public QGraphicsWidget
 {
     Q_OBJECT
 
 public:
-    explicit QMozView(QWidget *parent = 0, unsigned int flags = 0);
+    explicit QMozView(QGraphicsWidget *parent = 0, unsigned int flags = 0);
     virtual ~QMozView();
 
     void loadUri(const QString& uri);
@@ -75,7 +76,7 @@ class Q_MOZEMBED_EXPORT QMozView : public QWidget
     void exitModal();
 
 protected:
-    virtual void resizeEvent(QResizeEvent*);
+    virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
 
     virtual QMozView* openWindow(unsigned int flags);
 

qt/test/test.cpp

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Anton Rogaynis <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -36,90 +37,75 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <QApplication>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QLabel>
-#include <QUrl>
 #include <QDebug>
+#include <QPushButton>
+#include <QGraphicsProxyWidget>
 
 #include "test.h"
-#include "QMozApp.h"
 
-MyQMozView::MyQMozView(QWidget *parent, unsigned int flags)
-: QMozView(parent, flags)
-{}
-
-QMozView* MyQMozView::openWindow(unsigned int flags)
+MyQGraphicsView::MyQGraphicsView(QGraphicsScene* scene, QWidget* parent)
+ : QGraphicsView(scene, parent)
 {
-    MyBrowser* newBrowser = new MyBrowser(0, flags);
-    newBrowser->resize(400, 400);
-    newBrowser->show();
-    newBrowser->setAttribute(Qt::WA_DeleteOnClose);
-    return newBrowser->getQMozView();
-}
+    setAlignment(Qt::AlignLeft | Qt::AlignTop);
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-MyBrowser::MyBrowser(QWidget *parent, unsigned int flags)
-: QDialog(parent)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
+    mLayout = new QGraphicsGridLayout;
 
-    location = new QLineEdit(this);
-    layout->addWidget(location);
+    mTitle = new MyTextWidget("title");
+    mLayout->addItem(mTitle, 0, 0, 1, 2);
+    mLayout->setRowMaximumHeight(0, 20);
 
-    mozView = new MyQMozView(this, flags);
-    layout->addWidget(mozView, 1);
+    mLocation = new MyTextWidget("location");
+    mLayout->addItem(mLocation, 1, 0, 1, 2);
+    mLayout->setRowMaximumHeight(1, 20);
 
-    status = new QLabel(this);
-    layout->addWidget(status);
+    mForm = new QGraphicsWidget;
+    mForm->setLayout(mLayout);
+    scene->addItem(mForm);
 
-    connect(mozView, SIGNAL(locationChanged(const QString&)),
-            location, SLOT(setText(const QString&)));
+    mozView = new QMozView(mForm);
+    mLayout->addItem(mozView, 2, 0, 1, 2);
 
-    connect(mozView, SIGNAL(titleChanged(const QString&)),
-            this, SLOT(setWindowTitle(const QString&)));
+    mStatus = new MyTextWidget("status");
+    mLayout->addItem(mStatus, 3, 0);
+    mLayout->setRowMaximumHeight(3, 20);
 
-    connect(mozView, SIGNAL(statusChanged(const QString&)),
-            status, SLOT(setText(const QString&)));
+    QWidget* exitButton = new QPushButton("Exit");
+    mLayout->addItem(scene->addWidget(exitButton), 3, 1);
+    mLayout->setColumnMaximumWidth(1, 50);
 
-    connect(mozView, SIGNAL(startModal()),
-            this, SLOT(startModal()));
+    connect(mozView, SIGNAL(locationChanged(const QString&)),
+            mLocation, SLOT(setText(const QString&)));
 
-    connect(mozView, SIGNAL(exitModal()),
-            this, SLOT(exitModal()));
+    connect(mozView, SIGNAL(titleChanged(const QString&)),
+            mTitle, SLOT(setText(const QString&)));
 
-    connect(location, SIGNAL(returnPressed()),
-            this, SLOT(go()));
+    connect(mozView, SIGNAL(statusChanged(const QString&)),
+            mStatus, SLOT(setText(const QString&)));
 
-    connect(mozView, SIGNAL(consoleMessage(const QString &)),
-            this, SLOT(consoleMessage(const QString &)));
-}
+    connect(mozView, SIGNAL(consoleMessage(const QString&)),
+            this, SLOT(consoleMessage(const QString&)));
 
-void MyBrowser::loadUri(const QString& uri)
-{
-    location->setText(uri);
-    mozView->loadUri(uri);
+    connect(exitButton, SIGNAL(clicked()), this, SLOT(close()));
 }
 
-void MyBrowser::go()
+MyQGraphicsView::~MyQGraphicsView()
 {
-    mozView->loadUri(location->text());
 }
 
-void MyBrowser::startModal()
+void MyQGraphicsView::resizeEvent(QResizeEvent* event)
 {
-    hide();
-    exec();
+    mForm->resize(event->size());
+    QGraphicsView::resizeEvent(event);
 }
 
-void MyBrowser::exitModal()
+void MyQGraphicsView::loadUri(const QString& uri)
 {
-    done(0);
-    // have to delete mozView now to avoid JS context assertions
-    delete mozView;
+    mozView->loadUri(uri);
 }
 
-void MyBrowser::consoleMessage(const QString& message)
+void MyQGraphicsView::consoleMessage(const QString& message)
 {
     qDebug() << "CONSOLE:" << message;
 }
@@ -128,15 +114,14 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
-    MyBrowser window;
-
-    window.resize(400, 400);
-    window.show();
-
+    QGraphicsScene scene;
+    MyQGraphicsView view(&scene);
     if(argc > 1)
-        window.loadUri(argv[argc - 1]);
+        view.loadUri(argv[argc - 1]);
     else
-        window.loadUri("http://mozilla.org");
+        view.loadUri("http://mozilla.org");
+
+    view.showFullScreen();
 
     return app.exec();
 }

qt/test/test.h

@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Anton Rogaynis <[email protected]>
+ *   Tatiana Meshkova <[email protected]>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -38,38 +39,69 @@
 #ifndef __test_h_
 #define __test_h_
 
-#include <QDialog>
-#include "QMozView.h"
+#include <QGraphicsView>
+#include <QGraphicsWidget>
+#include <QGraphicsGridLayout>
 
-class QUrl;
-class QLineEdit;
-class QLabel;
+#include "QMozView.h"
+#include "QMozApp.h"
 
-class MyQMozView : public QMozView
+class MyTextWidget : public QGraphicsWidget
 {
+    Q_OBJECT
+
 public:
-    MyQMozView(QWidget *parent = 0, unsigned int flags = 0);
+    MyTextWidget(const QString& aText, QGraphicsItem* parent = 0)
+     : QGraphicsWidget(parent)
+     , text(aText)
+    {
+    }
+
 protected:
-    QMozView* openWindow(unsigned int flags);
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem*, QWidget*)
+    {
+        if (text.isEmpty())
+            return;
+
+        painter->drawText(boundingRect(), text);
+    }
+
+private slots:
+    void setText(const QString& aText)
+    {
+        text = aText;
+        update();
+    }
+
+private:
+    QString text;
+
 };
 
-class MyBrowser : public QDialog
+class MyQGraphicsView : public QGraphicsView
 {
-Q_OBJECT
+    Q_OBJECT
+
 public:
-    MyBrowser(QWidget *parent = 0, unsigned int flags = 0);
-    QMozView* getQMozView() {return mozView;}
+    MyQGraphicsView(QGraphicsScene* scene, QWidget* parent = 0);
+    ~MyQGraphicsView();
+
     void loadUri(const QString& uri);
-public slots:
-    void go();
-    void startModal();
-    void exitModal();
-    void consoleMessage(const QString &);
+
+protected:
+    void resizeEvent(QResizeEvent* event);
+
+private slots:
+    void consoleMessage(const QString& message);
 
 private:
-    QLineEdit* location;
-    MyQMozView* mozView;
-    QLabel* status;
+    QGraphicsWidget* mForm;
+    QGraphicsGridLayout* mLayout;
+    QMozView* mozView;
+
+    MyTextWidget* mTitle;
+    MyTextWidget* mLocation;
+    MyTextWidget* mStatus;
 };
 
 #endif /* __test_h_ */