Add support for html color input

Change-Id: I501125631946f70aae1ff039b0e5bcb9198e7242
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

6 files changed, 94 insertions, 0 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index f266fdce6..19ef590b8 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -331,6 +331,11 @@ void QQuickWebEngineViewPrivate::runGeolocationPermissionRequest(const QUrl &url
     Q_EMIT q->featurePermissionRequested(url, QQuickWebEngineView::Geolocation);
 }
 
+void QQuickWebEngineViewPrivate::showColorDialog(QSharedPointer<ColorChooserController> controller)
+{
+    ui()->showColorDialog(controller);
+}
+
 void QQuickWebEngineViewPrivate::runFileChooser(FilePickerController* controller)
 {
     ui()->showFilePicker(controller);
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 748944a69..7fca79b7a 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -150,6 +150,7 @@ public:
     virtual void navigationRequested(int navigationType, const QUrl &url, int &navigationRequestAction, bool isMainFrame) Q_DECL_OVERRIDE;
     virtual void javascriptDialog(QSharedPointer<QtWebEngineCore::JavaScriptDialogController>) Q_DECL_OVERRIDE;
     virtual void runFileChooser(QtWebEngineCore::FilePickerController *controller) Q_DECL_OVERRIDE;
+    virtual void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) Q_DECL_OVERRIDE;
     virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE;
     virtual void didFetchDocumentMarkup(quint64, const QString&) Q_DECL_OVERRIDE { }
     virtual void didFetchDocumentInnerText(quint64, const QString&) Q_DECL_OVERRIDE { }
diff --git a/src/webengine/ui/ColorDialog.qml b/src/webengine/ui/ColorDialog.qml
new file mode 100644
index 000000000..27245d7f7
--- /dev/null
+++ b/src/webengine/ui/ColorDialog.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick.Dialogs 1.2
+
+ColorDialog {
+    id: colorDialog
+
+    signal selectedColor(var color)
+
+    onAccepted: {
+        selectedColor(colorDialog.currentColor)
+    }
+}
diff --git a/src/webengine/ui/ui.pro b/src/webengine/ui/ui.pro
index 28ea691b2..249d7dcfd 100644
--- a/src/webengine/ui/ui.pro
+++ b/src/webengine/ui/ui.pro
@@ -5,6 +5,7 @@ QML_FILES += \
     AuthenticationDialog.qml \
     # JS Dialogs
     AlertDialog.qml \
+    ColorDialog.qml \
     ConfirmDialog.qml \
     FilePicker.qml \
     PromptDialog.qml \
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index 2e686b1b1..2714af9ab 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -38,6 +38,7 @@
 
 #include "api/qquickwebengineview_p.h"
 #include <authentication_dialog_controller.h>
+#include <color_chooser_controller.h>
 #include <file_picker_controller.h>
 #include <javascript_dialog_controller.h>
 #include <web_contents_adapter_client.h>
@@ -318,6 +319,43 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> d
     QMetaObject::invokeMethod(dialog, "open");
 }
 
+void UIDelegatesManager::showColorDialog(QSharedPointer<ColorChooserController> controller)
+{
+    if (!ensureComponentLoaded(ColorDialog)) {
+        // Let the controller know it couldn't be loaded
+        qWarning("Failed to load dialog, rejecting.");
+        controller->reject();
+        return;
+    }
+
+    QQmlContext *context = qmlContext(m_view);
+    QObject *colorDialog = colorDialogComponent->beginCreate(context);
+    if (QQuickItem* item = qobject_cast<QQuickItem*>(colorDialog))
+        item->setParentItem(m_view);
+    colorDialog->setParent(m_view);
+
+    if (controller->initialColor().isValid())
+        colorDialog->setProperty("color", controller->initialColor());
+
+    QQmlProperty selectedColorSignal(colorDialog, QStringLiteral("onSelectedColor"));
+    CHECK_QML_SIGNAL_PROPERTY(selectedColorSignal, colorDialogComponent->url());
+    QQmlProperty rejectedSignal(colorDialog, QStringLiteral("onRejected"));
+    CHECK_QML_SIGNAL_PROPERTY(rejectedSignal, colorDialogComponent->url());
+
+    static int acceptIndex = controller->metaObject()->indexOfSlot("accept(QVariant)");
+    QObject::connect(colorDialog, selectedColorSignal.method(), controller.data(), controller->metaObject()->method(acceptIndex));
+    static int rejectIndex = controller->metaObject()->indexOfSlot("reject()");
+    QObject::connect(colorDialog, rejectedSignal.method(), controller.data(), controller->metaObject()->method(rejectIndex));
+
+     // delete later
+     static int deleteLaterIndex = colorDialog->metaObject()->indexOfSlot("deleteLater()");
+     QObject::connect(colorDialog, selectedColorSignal.method(), colorDialog, colorDialog->metaObject()->method(deleteLaterIndex));
+     QObject::connect(colorDialog, rejectedSignal.method(), colorDialog, colorDialog->metaObject()->method(deleteLaterIndex));
+
+    colorDialogComponent->completeCreate();
+    QMetaObject::invokeMethod(colorDialog, "open");
+}
+
 void UIDelegatesManager::showDialog(QSharedPointer<AuthenticationDialogController> dialogController)
 {
     Q_ASSERT(!dialogController.isNull());
diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h
index 7a87c1eee..71d2e2fb0 100644
--- a/src/webengine/ui_delegates_manager.h
+++ b/src/webengine/ui_delegates_manager.h
@@ -51,6 +51,7 @@
     F(MenuItem, menuItem) SEPARATOR \
     F(MenuSeparator, menuSeparator) SEPARATOR \
     F(AlertDialog, alertDialog) SEPARATOR \
+    F(ColorDialog, colorDialog) SEPARATOR \
     F(ConfirmDialog, confirmDialog) SEPARATOR \
     F(PromptDialog, promptDialog) SEPARATOR \
     F(FilePicker, filePicker) SEPARATOR \
@@ -103,6 +104,7 @@ public:
     void addMenuSeparator(QObject *menu);
     QObject *addMenu(QObject *parentMenu, const QString &title, const QPoint &pos = QPoint());
     QQmlContext *creationContextForComponent(QQmlComponent *);
+    void showColorDialog(QSharedPointer<ColorChooserController>);
     void showDialog(QSharedPointer<JavaScriptDialogController>);
     void showDialog(QSharedPointer<AuthenticationDialogController>);
     void showFilePicker(FilePickerController *controller);