-
Jocelyn Turcotte authored
Also make sure that this version number appears in the user agent string and in the QML imports. The plan, unlike other Qt modules, is to keep our module and QML versions in sync to make it easy for developers to figure out what API is available in a given version. The QTWEBENGINECORE_VERSION_STR define is explicitly set in the .pro file since we don't call syncqt to generate a version header for the core module. The 0-major version currently causes the library name to start with libQt0 instead of libQt5, but this is something that we can fix in qtbase once we want to officially support linux desktop with QtWebEngine 1.0.0. Change-Id: I31915e84869b4db456416ef1f85a2296b8a06c99 Reviewed-by:
Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by:
Simon Hausmann <simon.hausmann@digia.com>
9e4cbda5
/******************************************************************************** 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.1import QtWebEngine 0.9import QtWebEngine.experimental 1.0import QtQuick.Controls 1.0import QtQuick.Controls.Styles 1.0import QtQuick.Layouts 1.0import QtQuick.Window 2.1import QtQuick.Controls.Private 1.0ApplicationWindow { id: browserWindow function load(url) { currentWebView.url = url } property Item currentWebView: tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item.webView : null property bool isFullScreen: visibility == Window.FullScreen onIsFullScreenChanged: { // This is for the case where the system forces us to leave fullscreen. if (currentWebView) currentWebView.state = isFullScreen ? "FullScreen" : "" } height: 600 width: 800 visible: true title: currentWebView && currentWebView.title // Make sure the Qt.WindowFullscreenButtonHint is set on Mac. Component.onCompleted: flags = flags | Qt.WindowFullscreenButtonHint // Create a styleItem to determine the platform.7172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140
// When using style "mac", ToolButtons are not supposed to accept focus.
StyleItem { id: styleItem }
property bool platformIsMac: styleItem.style == "mac"
Action {
id: focus
shortcut: "Ctrl+L"
onTriggered: {
addressBar.forceActiveFocus();
addressBar.selectAll();
}
}
Action {
shortcut: "Ctrl+R"
onTriggered: {
if (currentWebView)
currentWebView.reload()
}
}
Action {
shortcut: "Ctrl+T"
onTriggered: {
tabs.createEmptyTab()
addressBar.forceActiveFocus();
addressBar.selectAll();
}
}
Action {
shortcut: "Ctrl+W"
onTriggered: {
if (tabs.count == 1)
browserWindow.close()
else
tabs.removeTab(tabs.currentIndex)
}
}
Action {
shortcut: "Escape"
onTriggered: {
if (browserWindow.isFullScreen)
browserWindow.showNormal()
}
}
Menu {
id: backHistoryMenu
Instantiator {
model: currentWebView && currentWebView.experimental.navigationHistory.backItems
MenuItem {
text: model.title
onTriggered: currentWebView.experimental.goBackTo(index)
}
onObjectAdded: backHistoryMenu.insertItem(index, object)
onObjectRemoved: backHistoryMenu.removeItem(object)
}
}
Menu {
id: forwardHistoryMenu
Instantiator {
model: currentWebView && currentWebView.experimental.navigationHistory.forwardItems
MenuItem {
text: model.title
onTriggered: currentWebView.experimental.goForwardTo(index)
}
141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210
onObjectAdded: forwardHistoryMenu.insertItem(index, object)
onObjectRemoved: forwardHistoryMenu.removeItem(object)
}
}
toolBar: ToolBar {
id: navigationBar
RowLayout {
anchors.fill: parent;
ToolButton {
id: backButton
iconSource: "icons/go-previous.png"
onClicked: currentWebView.goBack()
enabled: currentWebView && currentWebView.canGoBack
activeFocusOnTab: !browserWindow.platformIsMac
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: backHistoryMenu.popup()
}
}
ToolButton {
id: forwardButton
iconSource: "icons/go-next.png"
onClicked: currentWebView.goForward()
enabled: currentWebView && currentWebView.canGoForward
activeFocusOnTab: !browserWindow.platformIsMac
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: forwardHistoryMenu.popup()
}
}
ToolButton {
id: reloadButton
iconSource: currentWebView && currentWebView.loading ? "icons/process-stop.png" : "icons/view-refresh.png"
onClicked: currentWebView && currentWebView.loading ? currentWebView.stop() : currentWebView.reload()
activeFocusOnTab: !browserWindow.platformIsMac
}
TextField {
id: addressBar
Image {
anchors.verticalCenter: addressBar.verticalCenter;
x: 5
z: 2
id: faviconImage
width: 16; height: 16
source: currentWebView && currentWebView.icon
}
style: TextFieldStyle {
padding {
left: 26;
}
}
focus: true
Layout.fillWidth: true
text: currentWebView && currentWebView.url
onAccepted: currentWebView.url = utils.fromUserInput(text)
}
}
ProgressBar {
id: progressBar
height: 3
anchors {
left: parent.left
top: parent.bottom
right: parent.right
211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280
leftMargin: -parent.leftMargin
rightMargin: -parent.rightMargin
}
style: ProgressBarStyle {
background: Item {}
}
z: -2;
minimumValue: 0
maximumValue: 100
value: (currentWebView && currentWebView.loadProgress < 100) ? currentWebView.loadProgress : 0
}
}
TabView {
id: tabs
function createEmptyTab() {
var tab = addTab("", tabComponent)
// We must do this first to make sure that tab.active gets set so that tab.item gets instantiated immediately.
tabs.currentIndex = tabs.count - 1
tab.title = Qt.binding(function() { return tab.item.title })
return tab
}
anchors.fill: parent
Component.onCompleted: createEmptyTab()
Component {
id: dialogComponent
Window {
property Item webView: _webView
width: 800
height: 600
visible: true
WebEngineView {
id: _webView
anchors.fill: parent
}
}
}
Component {
id: tabComponent
Item {
property alias webView: webEngineView
property alias title: webEngineView.title
FeaturePermissionBar {
id: permBar
view: webEngineView
anchors {
left: parent.left
right: parent.right
top: parent.top
}
z: 3
}
WebEngineView {
id: webEngineView
anchors {
fill: parent
top: permBar.bottom
}
focus: true
states: [
State {
name: "FullScreen"
PropertyChanges {
281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331
target: tabs
frameVisible: false
tabsVisible: false
}
PropertyChanges {
target: navigationBar
visible: false
}
}
]
experimental {
isFullScreen: webEngineView.state == "FullScreen" && browserWindow.isFullScreen
onFullScreenRequested: {
if (fullScreen) {
webEngineView.state = "FullScreen"
browserWindow.showFullScreen();
} else {
webEngineView.state = ""
browserWindow.showNormal();
}
}
onNewViewRequested: {
if (!request.userInitiated)
print("Warning: Blocked a popup window.")
else if (request.destination == WebEngineView.NewViewInTab) {
var tab = tabs.createEmptyTab()
request.openIn(tab.item.webView)
} else if (request.destination == WebEngineView.NewViewInDialog) {
var dialog = dialogComponent.createObject()
request.openIn(dialog.webView)
} else {
var component = Qt.createComponent("quickwindow.qml")
var window = component.createObject()
request.openIn(window.currentWebView)
}
}
onFeaturePermissionRequested: {
permBar.securityOrigin = securityOrigin;
permBar.requestedFeature = feature;
permBar.visible = true;
}
extraContextMenuEntriesComponent: ContextMenuExtras {}
}
}
}
}
}
}