From e46886912858e9b233fb099bb211e288dd7d57b5 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Fri, 6 Dec 2013 14:18:04 +0100 Subject: Pave the way for our UI delegation strategy. Starting with the context Menus for QtQuick. Add default UI delegates as a subproject. We allow ourselves to use Qt Quick Controls there for in order to get a nice "out of the box" experience for things like context menus, dialogs, etc while leaving the door open for system embedders to override this. Opting out of the deployment of these QML files is still very primitive but can be done by passing WEBENGINE_CONFIG+=no_ui_delegates at qmake time. Customization of context menus could be done via a qml component, which is probably best kept in experimental for now while we address its shortcomings. Change-Id: I0705b20d5ddd3bb010f9371b65a181c6b02a03e1 Reviewed-by: Jocelyn Turcotte --- .../quick/quicknanobrowser/ContextMenuExtras.qml | 61 ++++++++++++++++++++++ .../quick/quicknanobrowser/quicknanobrowser.pro | 6 ++- examples/quick/quicknanobrowser/quickwindow.qml | 3 +- examples/quick/quicknanobrowser/resources.qrc | 7 +-- 4 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 examples/quick/quicknanobrowser/ContextMenuExtras.qml (limited to 'examples') diff --git a/examples/quick/quicknanobrowser/ContextMenuExtras.qml b/examples/quick/quicknanobrowser/ContextMenuExtras.qml new file mode 100644 index 000000000..cf54e9ba0 --- /dev/null +++ b/examples/quick/quicknanobrowser/ContextMenuExtras.qml @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtWebEngine module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.1 +import QtWebEngine.UIDelegates 1.0 + +VisualItemModel { + MenuItem { + text: "An application specific entry" + onTriggered: console.log("Application specific action triggered") + } + Menu { + title: "Extras Submenu" + MenuItem { + text: "something" + onTriggered: console.log("something triggered") + } + MenuItem { + text: "something else" + enabled: false + } + } +} + diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/quick/quicknanobrowser/quicknanobrowser.pro index 2c4ae9080..3455f02e0 100644 --- a/examples/quick/quicknanobrowser/quicknanobrowser.pro +++ b/examples/quick/quicknanobrowser/quicknanobrowser.pro @@ -4,9 +4,11 @@ TARGET = quicknanobrowser macx: CONFIG -= app_bundle HEADERS = quickwindow.h -SOURCES = quickwindow.cpp main.cpp +SOURCES = quickwindow.cpp \ + main.cpp -OTHER_FILES += quickwindow.qml +OTHER_FILES += ContextMenuExtras.qml \ + quickwindow.qml RESOURCES += resources.qrc RESOURCES += ../../common/common_resources.qrc diff --git a/examples/quick/quicknanobrowser/quickwindow.qml b/examples/quick/quicknanobrowser/quickwindow.qml index b99b6ff25..0aff9e36a 100644 --- a/examples/quick/quicknanobrowser/quickwindow.qml +++ b/examples/quick/quicknanobrowser/quickwindow.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtWebEngine 1.0 import QtWebEngine.experimental 1.0 import QtQuick.Controls 1.0 @@ -177,6 +177,7 @@ ApplicationWindow { window.adoptHandle(newViewHandle) } } + extraContextMenuEntriesComponent: ContextMenuExtras {} } } } diff --git a/examples/quick/quicknanobrowser/resources.qrc b/examples/quick/quicknanobrowser/resources.qrc index de8232440..5294b7ff6 100644 --- a/examples/quick/quicknanobrowser/resources.qrc +++ b/examples/quick/quicknanobrowser/resources.qrc @@ -1,5 +1,6 @@ - - quickwindow.qml - + + quickwindow.qml + ContextMenuExtras.qml + -- cgit v1.2.3