Update up to tmeshkova/qtmozembed#49

tmeshkova · Dec 3, 2013 · b98c76e · b98c76e
1 parent 537534d
commit b98c76e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/declarative/WindowCreator.cpp b/declarative/WindowCreator.cpp
@@ -19,7 +19,7 @@ MozWindowCreator::MozWindowCreator(const QString& aQmlstring, const bool& aGlwid
 }
 
 quint32
-MozWindowCreator::newWindowRequested(const QString& url, const unsigned& aParentID, QNewWindowResponse* response)
+MozWindowCreator::createView(const QString &url, const quint32 &aParentID)
 {
     QUrl newUrl;
     if (!url.contains(QString("://")) && !url.startsWith(QString("about:"))) {
@@ -68,9 +68,7 @@ MozWindowCreator::newWindowRequested(const QString& url, const unsigned& aParent
         view->showFullScreen();
     else
         view->show();
-    if (response) {
-        response->setNewWindowID(uniqueID);
-    }
+    return uniqueID;
 }
 
 void

diff --git a/declarative/WindowCreator.h b/declarative/WindowCreator.h
@@ -1,14 +1,12 @@
 #include <QDeclarativeView>
+#include "qmozviewcreator.h"
 
-class QNewWindowResponse;
-class MozWindowCreator : public QObject
+class MozWindowCreator : public QMozViewCreator
 {
-    Q_OBJECT
 public:
     MozWindowCreator(const QString& aQmlstring, const bool& aGlwidget, const bool& aIsFullScreen);
     QDeclarativeView* CreateNewWindow(const QString& url = QString("about:blank"), quint32* aUniqueID = 0, quint32 aParentID = 0);
-public Q_SLOTS:
-    quint32 newWindowRequested(const QString& url, const unsigned& aParentID, QNewWindowResponse* response);
+    virtual quint32 createView(const QString &url, const quint32 &parentId);
     void bringToFront();
 
 public:

diff --git a/declarative/main.cpp b/declarative/main.cpp
@@ -159,9 +159,7 @@ int main(int argc, char *argv[])
 
     qDebug() << "Starting Application!!!";
 
-    QObject::connect(QMozContext::GetInstance(),
-                     SIGNAL(newWindowRequested(const QString&, const unsigned&, QNewWindowResponse*)),
-                     &winCreator, SLOT(newWindowRequested(const QString&, const unsigned&, QNewWindowResponse*)));
+    QMozContext::GetInstance()->setViewCreator(&winCreator);
 
     QString componentPath(DEFAULT_COMPONENTS_PATH);
     qDebug() << "Load components from:" << componentPath + QString("/components") + QString("/EmbedLiteBinComponents.manifest");

diff --git a/declarative/qml/OverlayRightMenu.qml b/declarative/qml/OverlayRightMenu.qml
@@ -84,7 +84,7 @@ Rectangle {
                 iconSource: "../icons/plus.png"
 
                 onClicked: {
-                    MozContext.newWindow("about:blank", 0)
+                    MozContext.createView("about:blank", 0)
                     root.toggle()
                 }
             }