feat: address bar, tabs support and nav buttons
This commit is contained in:
Richard Ramos
Iuri Matias
parent
3326c8b5f5
commit
b6066ef1dd
|
|
@ -74,3 +74,6 @@ QtObject:
|
|||
if value == "0x0":
|
||||
return "0"
|
||||
return stripTrailingZeroes(stint.toString(stint.fromHex(StUint[256], value)))
|
||||
|
||||
proc urlFromUserInput*(self: UtilsView, input: string): string {.slot.} =
|
||||
result = url_fromUserInput(input)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtWebEngine module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** 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 https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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 QtQuick.Window 2.2
|
||||
import QtWebEngine 1.9
|
||||
|
||||
Window {
|
||||
id: window
|
||||
property alias currentWebView: webView
|
||||
flags: Qt.Dialog | Qt.WindowStaysOnTopHint
|
||||
width: 800
|
||||
height: 600
|
||||
visible: true
|
||||
onClosing: destroy()
|
||||
WebEngineView {
|
||||
id: webView
|
||||
anchors.fill: parent
|
||||
|
||||
onGeometryChangeRequested: function(geometry) {
|
||||
window.x = geometry.x
|
||||
window.y = geometry.y
|
||||
window.width = geometry.width
|
||||
window.height = geometry.height
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,32 +1,32 @@
|
|||
import QtQuick 2.13
|
||||
import QtQuick.Controls 2.13
|
||||
import QtQuick.Controls 1.0 as QQC1
|
||||
import QtQuick.Layouts 1.13
|
||||
import QtWebEngine 1.10
|
||||
import QtWebChannel 1.13
|
||||
import Qt.labs.settings 1.0
|
||||
import QtQuick.Controls.Styles 1.0
|
||||
import QtQuick.Dialogs 1.2
|
||||
import "../../../shared"
|
||||
import "../../../imports"
|
||||
|
||||
// Code based on https://code.qt.io/cgit/qt/qtwebengine.git/tree/examples/webengine/quicknanobrowser/BrowserWindow.qml?h=5.15
|
||||
// Licensed under BSD
|
||||
|
||||
Item {
|
||||
id: browserView
|
||||
id: browserWindow
|
||||
|
||||
property Item currentWebView: tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null
|
||||
|
||||
property Component browserDialogComponent: BrowserDialog {
|
||||
onClosing: destroy()
|
||||
}
|
||||
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
||||
property var request: {"hostname": "", "permission": ""}
|
||||
|
||||
// TODO: example qml webbrowser available here:
|
||||
// https://doc.qt.io/qt-5/qtwebengine-webengine-quicknanobrowser-example.html
|
||||
|
||||
WebEngineProfile {
|
||||
id: webProfile
|
||||
offTheRecord: true // Private Mode on
|
||||
persistentCookiesPolicy: WebEngineProfile.NoPersistentCookies
|
||||
userScripts: [
|
||||
WebEngineScript {
|
||||
injectionPoint: WebEngineScript.DocumentCreation
|
||||
sourceUrl: Qt.resolvedUrl("provider.js")
|
||||
worldId: WebEngineScript.MainWorld // TODO: check https://doc.qt.io/qt-5/qml-qtwebengine-webenginescript.html#worldId-prop
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
function postMessage(isAllowed){
|
||||
request.isAllowed = isAllowed;
|
||||
|
|
@ -122,16 +122,651 @@ Item {
|
|||
registeredObjects: [provider]
|
||||
}
|
||||
|
||||
property QtObject defaultProfile: WebEngineProfile {
|
||||
storageName: "Profile"
|
||||
offTheRecord: false
|
||||
useForGlobalCertificateVerification: true
|
||||
userScripts: [
|
||||
WebEngineScript {
|
||||
injectionPoint: WebEngineScript.DocumentCreation
|
||||
sourceUrl: Qt.resolvedUrl("provider.js")
|
||||
worldId: WebEngineScript.MainWorld // TODO: check https://doc.qt.io/qt-5/qml-qtwebengine-webenginescript.html#worldId-prop
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
property QtObject otrProfile: WebEngineProfile {
|
||||
offTheRecord: true
|
||||
persistentCookiesPolicy: WebEngineProfile.NoPersistentCookies
|
||||
userScripts: [
|
||||
WebEngineScript {
|
||||
injectionPoint: WebEngineScript.DocumentCreation
|
||||
sourceUrl: Qt.resolvedUrl("provider.js")
|
||||
worldId: WebEngineScript.MainWorld // TODO: check https://doc.qt.io/qt-5/qml-qtwebengine-webenginescript.html#worldId-prop
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
onCurrentWebViewChanged: {
|
||||
findBar.reset();
|
||||
}
|
||||
|
||||
Settings {
|
||||
id : browserSettings
|
||||
property alias autoLoadImages: loadImages.checked
|
||||
property alias javaScriptEnabled: javaScriptEnabled.checked
|
||||
property alias errorPageEnabled: errorPageEnabled.checked
|
||||
property alias pluginsEnabled: pluginsEnabled.checked
|
||||
property alias autoLoadIconsForPage: autoLoadIconsForPage.checked
|
||||
property alias touchIconsEnabled: touchIconsEnabled.checked
|
||||
property alias webRTCPublicInterfacesOnly : webRTCPublicInterfacesOnly.checked
|
||||
property alias devToolsEnabled: devToolsEnabled.checked
|
||||
property alias pdfViewerEnabled: pdfViewerEnabled.checked
|
||||
}
|
||||
|
||||
Action {
|
||||
shortcut: "Ctrl+D"
|
||||
onTriggered: {
|
||||
downloadView.visible = !downloadView.visible;
|
||||
}
|
||||
}
|
||||
Action {
|
||||
id: focus
|
||||
shortcut: "Ctrl+L"
|
||||
onTriggered: {
|
||||
addressBar.forceActiveFocus();
|
||||
addressBar.selectAll();
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Refresh
|
||||
onTriggered: {
|
||||
if (currentWebView)
|
||||
currentWebView.reload();
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.AddTab
|
||||
onTriggered: {
|
||||
tabs.createEmptyTab(tabs.count != 0 ? currentWebView.profile : defaultProfile);
|
||||
tabs.currentIndex = tabs.count - 1;
|
||||
addressBar.forceActiveFocus();
|
||||
addressBar.selectAll();
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Close
|
||||
onTriggered: {
|
||||
currentWebView.triggerWebAction(WebEngineView.RequestClose);
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: "Escape"
|
||||
onTriggered: {
|
||||
if (findBar.visible)
|
||||
findBar.visible = false;
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: "Ctrl+0"
|
||||
onTriggered: currentWebView.zoomFactor = 1.0
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.ZoomOut
|
||||
onTriggered: currentWebView.zoomFactor -= 0.1
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.ZoomIn
|
||||
onTriggered: currentWebView.zoomFactor += 0.1
|
||||
}
|
||||
|
||||
Action {
|
||||
shortcut: StandardKey.Copy
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Copy)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Cut
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Cut)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Paste
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Paste)
|
||||
}
|
||||
Action {
|
||||
shortcut: "Shift+"+StandardKey.Paste
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.PasteAndMatchStyle)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.SelectAll
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.SelectAll)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Undo
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Undo)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Redo
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Redo)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Back
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Back)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Forward
|
||||
onTriggered: currentWebView.triggerWebAction(WebEngineView.Forward)
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.Find
|
||||
onTriggered: {
|
||||
if (!findBar.visible)
|
||||
findBar.visible = true;
|
||||
}
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.FindNext
|
||||
onTriggered: findBar.findNext()
|
||||
}
|
||||
Action {
|
||||
shortcut: StandardKey.FindPrevious
|
||||
onTriggered: findBar.findPrevious()
|
||||
}
|
||||
Action {
|
||||
shortcut: "F12"
|
||||
onTriggered: {
|
||||
browserSettings.devToolsEnabled = !browserSettings.devToolsEnabled
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: navigationBar
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
height: 45
|
||||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
|
||||
Menu {
|
||||
id: historyMenu
|
||||
Instantiator {
|
||||
model: currentWebView && currentWebView.navigationHistory.items
|
||||
MenuItem {
|
||||
text: model.title
|
||||
onTriggered: currentWebView.goBackOrForward(model.offset)
|
||||
checkable: !enabled
|
||||
checked: !enabled
|
||||
enabled: model.offset
|
||||
}
|
||||
onObjectAdded: function(index, object) {
|
||||
historyMenu.insertItem(index, object)
|
||||
}
|
||||
onObjectRemoved: function(index, object) {
|
||||
historyMenu.removeItem(object)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
id: backButton
|
||||
icon.source: "../../img/browser/back.png"
|
||||
onClicked: currentWebView.goBack()
|
||||
onPressAndHold: {
|
||||
if (currentWebView && (currentWebView.canGoBack || currentWebView.canGoForward)){
|
||||
historyMenu.popup(backButton.x, backButton.y + backButton.height)
|
||||
}
|
||||
}
|
||||
enabled: currentWebView && currentWebView.canGoBack
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
id: forwardButton
|
||||
icon.source: "../../img/browser/forward.png"
|
||||
onClicked: currentWebView.goForward()
|
||||
enabled: currentWebView && currentWebView.canGoForward
|
||||
onPressAndHold: {
|
||||
if (currentWebView && (currentWebView.canGoBack || currentWebView.canGoForward)){
|
||||
historyMenu.popup(forwardButton.x, forwardButton.y + forwardButton.height)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
id: reloadButton
|
||||
icon.source: currentWebView && currentWebView.loading ? "../../img/browser/stop.png" : "../../img/browser/refresh.png"
|
||||
onClicked: currentWebView && currentWebView.loading ? currentWebView.stop() : currentWebView.reload()
|
||||
}
|
||||
|
||||
StyledTextField {
|
||||
id: addressBar
|
||||
Layout.fillWidth: true
|
||||
background: Rectangle {
|
||||
border.color: Style.current.secondaryText
|
||||
border.width: 1
|
||||
radius: 2
|
||||
}
|
||||
leftPadding: 25
|
||||
Image {
|
||||
anchors.verticalCenter: addressBar.verticalCenter;
|
||||
x: 5
|
||||
z: 2
|
||||
id: faviconImage
|
||||
width: 16; height: 16
|
||||
sourceSize: Qt.size(width, height)
|
||||
source: currentWebView && currentWebView.icon ? currentWebView.icon : ""
|
||||
}
|
||||
focus: true
|
||||
text: currentWebView && currentWebView.url
|
||||
Keys.onPressed: {
|
||||
// TODO: disable browsing local files? file://
|
||||
if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return){
|
||||
currentWebView.url = utilsModel.urlFromUserInput(text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Menu {
|
||||
id: settingsMenu
|
||||
y: settingsMenuButton.height
|
||||
x: settingsMenuButton.x
|
||||
MenuItem {
|
||||
id: loadImages
|
||||
text: "Autoload images"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.autoLoadImages
|
||||
}
|
||||
MenuItem {
|
||||
id: javaScriptEnabled
|
||||
text: "JavaScript On"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.javascriptEnabled
|
||||
}
|
||||
MenuItem {
|
||||
id: errorPageEnabled
|
||||
text: "ErrorPage On"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.errorPageEnabled
|
||||
}
|
||||
MenuItem {
|
||||
id: pluginsEnabled
|
||||
text: "Plugins On"
|
||||
checkable: true
|
||||
checked: true
|
||||
}
|
||||
MenuItem {
|
||||
id: offTheRecordEnabled
|
||||
text: "Off The Record"
|
||||
checkable: true
|
||||
checked: currentWebView && currentWebView.profile === otrProfile
|
||||
onToggled: function(checked) {
|
||||
if (currentWebView) {
|
||||
currentWebView.profile = checked ? otrProfile : defaultProfile;
|
||||
}
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
id: httpDiskCacheEnabled
|
||||
text: "HTTP Disk Cache"
|
||||
checkable: currentWebView && !currentWebView.profile.offTheRecord
|
||||
checked: currentWebView && (currentWebView.profile.httpCacheType === WebEngineProfile.DiskHttpCache)
|
||||
onToggled: function(checked) {
|
||||
if (currentWebView) {
|
||||
currentWebView.profile.httpCacheType = checked ? WebEngineProfile.DiskHttpCache : WebEngineProfile.MemoryHttpCache;
|
||||
}
|
||||
}
|
||||
}
|
||||
MenuItem {
|
||||
id: autoLoadIconsForPage
|
||||
text: "Icons On"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.autoLoadIconsForPage
|
||||
}
|
||||
MenuItem {
|
||||
id: touchIconsEnabled
|
||||
text: "Touch Icons On"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.touchIconsEnabled
|
||||
enabled: autoLoadIconsForPage.checked
|
||||
}
|
||||
MenuItem {
|
||||
id: webRTCPublicInterfacesOnly
|
||||
text: "WebRTC Public Interfaces Only"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.webRTCPublicInterfacesOnly
|
||||
}
|
||||
MenuItem {
|
||||
id: devToolsEnabled
|
||||
text: "Open DevTools"
|
||||
checkable: true
|
||||
checked: false
|
||||
}
|
||||
MenuItem {
|
||||
id: pdfViewerEnabled
|
||||
text: "PDF viewer enabled"
|
||||
checkable: true
|
||||
checked: WebEngine.settings.pdfViewerEnabled
|
||||
}
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
id: settingsMenuButton
|
||||
text: qsTr("⋮")
|
||||
onClicked: settingsMenu.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QQC1.TabView {
|
||||
id: tabs
|
||||
function createEmptyTab(profile) {
|
||||
var tab = addTab("", tabComponent);
|
||||
// We must do this first to make sure that tab.active gets set so that tab.item gets instantiated immediately.
|
||||
tab.active = true;
|
||||
tab.title = Qt.binding(function() { return tab.item.title ? tab.item.title : qsTr("New Tab") });
|
||||
tab.item.profile = profile;
|
||||
return tab;
|
||||
}
|
||||
|
||||
function indexOfView(view) {
|
||||
for (let i = 0; i < tabs.count; ++i)
|
||||
if (tabs.getTab(i).item == view)
|
||||
return i
|
||||
return -1
|
||||
}
|
||||
|
||||
function removeView(index) {
|
||||
if (tabs.count > 1)
|
||||
tabs.removeTab(index)
|
||||
}
|
||||
|
||||
anchors.top: navigationBar.bottom
|
||||
anchors.bottom: devToolsView.top
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
Component.onCompleted: {
|
||||
var tab = createEmptyTab(defaultProfile)
|
||||
tab.item.url = "https://status-im.github.io/dapp"
|
||||
}
|
||||
|
||||
// Add custom tab view style so we can customize the tabs to include a close button
|
||||
style: TabViewStyle {
|
||||
property color frameColor: "#999"
|
||||
property color fillColor: "#eee"
|
||||
property color nonSelectedColor: "#ddd"
|
||||
frameOverlap: 1
|
||||
frame: Rectangle {
|
||||
color: "#eee"
|
||||
border.color: frameColor
|
||||
}
|
||||
tab: Rectangle {
|
||||
id: tabRectangle
|
||||
color: styleData.selected ? fillColor : nonSelectedColor
|
||||
border.width: 1
|
||||
border.color: frameColor
|
||||
implicitWidth: Math.max(text.width + 30, 80)
|
||||
implicitHeight: Math.max(text.height + 10, 20)
|
||||
Rectangle { height: 1 ; width: parent.width ; color: frameColor}
|
||||
Rectangle { height: parent.height ; width: 1; color: frameColor}
|
||||
Rectangle { x: parent.width - 2; height: parent.height ; width: 1; color: frameColor}
|
||||
Text {
|
||||
id: text
|
||||
anchors.left: parent.left
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.leftMargin: 6
|
||||
text: styleData.title
|
||||
elide: Text.ElideRight
|
||||
color: styleData.selected ? "black" : frameColor
|
||||
}
|
||||
|
||||
Image {
|
||||
visible: tabs.count > 1
|
||||
source: "../../img/browser/close.png"
|
||||
width: 12
|
||||
height: 16
|
||||
anchors.right: parent.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.rightMargin: 4
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
enabled: tabs.count > 1
|
||||
onClicked: tabs.removeView(styleData.index)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: tabComponent
|
||||
WebEngineView {
|
||||
id: webEngineView
|
||||
focus: true
|
||||
webChannel: channel
|
||||
onLinkHovered: function(hoveredUrl) {
|
||||
if (hoveredUrl == "")
|
||||
hideStatusText.start();
|
||||
else {
|
||||
statusText.text = hoveredUrl;
|
||||
statusBubble.visible = true;
|
||||
hideStatusText.stop();
|
||||
}
|
||||
}
|
||||
|
||||
settings.autoLoadImages: browserSettings.autoLoadImages
|
||||
settings.javascriptEnabled: browserSettings.javaScriptEnabled
|
||||
settings.errorPageEnabled: browserSettings.errorPageEnabled
|
||||
settings.pluginsEnabled: browserSettings.pluginsEnabled
|
||||
settings.autoLoadIconsForPage: browserSettings.autoLoadIconsForPage
|
||||
settings.touchIconsEnabled: browserSettings.touchIconsEnabled
|
||||
settings.webRTCPublicInterfacesOnly: browserSettings.webRTCPublicInterfacesOnly
|
||||
settings.pdfViewerEnabled: browserSettings.pdfViewerEnabled
|
||||
|
||||
onCertificateError: function(error) {
|
||||
error.defer();
|
||||
sslDialog.enqueue(error);
|
||||
}
|
||||
|
||||
onNewViewRequested: function(request) {
|
||||
if (!request.userInitiated)
|
||||
print("Warning: Blocked a popup window.");
|
||||
else if (request.destination === WebEngineView.NewViewInTab) {
|
||||
var tab = tabs.createEmptyTab(currentWebView.profile);
|
||||
tabs.currentIndex = tabs.count - 1;
|
||||
request.openIn(tab.item);
|
||||
} else if (request.destination === WebEngineView.NewViewInBackgroundTab) {
|
||||
var backgroundTab = tabs.createEmptyTab(currentWebView.profile);
|
||||
request.openIn(backgroundTab.item);
|
||||
} else if (request.destination === WebEngineView.NewViewInDialog) {
|
||||
var dialog = browserDialogComponent.createObject();
|
||||
dialog.currentWebView.profile = currentWebView.profile;
|
||||
request.openIn(dialog.currentWebView);
|
||||
} else {
|
||||
// Instead of opening a new window, we open a new tab
|
||||
// TODO: remove "open in new window" from context menu
|
||||
var tab = tabs.createEmptyTab(currentWebView.profile);
|
||||
tabs.currentIndex = tabs.count - 1;
|
||||
request.openIn(tab.item);
|
||||
}
|
||||
}
|
||||
|
||||
onQuotaRequested: function(request) {
|
||||
if (request.requestedSize <= 5 * 1024 * 1024)
|
||||
request.accept();
|
||||
else
|
||||
request.reject();
|
||||
}
|
||||
|
||||
onRegisterProtocolHandlerRequested: function(request) {
|
||||
console.log("accepting registerProtocolHandler request for "
|
||||
+ request.scheme + " from " + request.origin);
|
||||
request.accept();
|
||||
}
|
||||
|
||||
onRenderProcessTerminated: function(terminationStatus, exitCode) {
|
||||
var status = "";
|
||||
switch (terminationStatus) {
|
||||
case WebEngineView.NormalTerminationStatus:
|
||||
status = "(normal exit)";
|
||||
break;
|
||||
case WebEngineView.AbnormalTerminationStatus:
|
||||
status = "(abnormal exit)";
|
||||
break;
|
||||
case WebEngineView.CrashedTerminationStatus:
|
||||
status = "(crashed)";
|
||||
break;
|
||||
case WebEngineView.KilledTerminationStatus:
|
||||
status = "(killed)";
|
||||
break;
|
||||
}
|
||||
|
||||
print("Render process exited with code " + exitCode + " " + status);
|
||||
reloadTimer.running = true;
|
||||
}
|
||||
|
||||
onWindowCloseRequested: tabs.removeView(tabs.indexOfView(webEngineView))
|
||||
|
||||
onSelectClientCertificate: function(selection) {
|
||||
selection.certificates[0].select();
|
||||
}
|
||||
|
||||
onFindTextFinished: function(result) {
|
||||
if (!findBar.visible)
|
||||
findBar.visible = true;
|
||||
|
||||
findBar.numberOfMatches = result.numberOfMatches;
|
||||
findBar.activeMatch = result.activeMatch;
|
||||
}
|
||||
|
||||
onLoadingChanged: function(loadRequest) {
|
||||
if (loadRequest.status == WebEngineView.LoadStartedStatus)
|
||||
findBar.reset();
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: reloadTimer
|
||||
interval: 0
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered: currentWebView.reload()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ProgressBar {
|
||||
id: progressBar
|
||||
height: 3
|
||||
from: 0
|
||||
to: 100
|
||||
visible: value != 0 && value != 100
|
||||
value: (currentWebView && currentWebView.loadProgress < 100) ? currentWebView.loadProgress : 0
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: Style.current.padding
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: Style.current.padding
|
||||
}
|
||||
|
||||
WebEngineView {
|
||||
id: browserContainer
|
||||
anchors.fill: parent
|
||||
profile: webProfile
|
||||
url: "https://app.uniswap.org/#/"
|
||||
webChannel: channel
|
||||
id: devToolsView
|
||||
visible: devToolsEnabled.checked
|
||||
height: visible ? 400 : 0
|
||||
inspectedView: visible && tabs.currentIndex < tabs.count ? tabs.getTab(tabs.currentIndex).item : null
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
onNewViewRequested: function(request) {
|
||||
// TODO: rramos: tabs can be handled here. see: https://doc.qt.io/qt-5/qml-qtwebengine-webengineview.html#newViewRequested-signal
|
||||
// In the meantime, I'm opening the content in the same webengineview
|
||||
request.openIn(browserContainer)
|
||||
var tab = tabs.createEmptyTab(currentWebView.profile);
|
||||
tabs.currentIndex = tabs.count - 1;
|
||||
request.openIn(tab.item);
|
||||
}
|
||||
}
|
||||
|
||||
MessageDialog {
|
||||
id: sslDialog
|
||||
|
||||
property var certErrors: []
|
||||
icon: StandardIcon.Warning
|
||||
standardButtons: StandardButton.No | StandardButton.Yes
|
||||
title: qsTr("Server's certificate not trusted")
|
||||
text: qsTr("Do you wish to continue?")
|
||||
detailedText: qsTr("If you wish so, you may continue with an unverified certificate. Accepting an unverified certificate means you may not be connected with the host you tried to connect to.\nDo you wish to override the security check and continue?")
|
||||
onYes: {
|
||||
certErrors.shift().ignoreCertificateError();
|
||||
presentError();
|
||||
}
|
||||
onNo: reject()
|
||||
onRejected: reject()
|
||||
|
||||
function reject(){
|
||||
certErrors.shift().rejectCertificate();
|
||||
presentError();
|
||||
}
|
||||
function enqueue(error){
|
||||
certErrors.push(error);
|
||||
presentError();
|
||||
}
|
||||
function presentError(){
|
||||
visible = certErrors.length > 0
|
||||
}
|
||||
}
|
||||
|
||||
DownloadView {
|
||||
id: downloadView
|
||||
visible: false
|
||||
anchors.fill: parent
|
||||
}
|
||||
|
||||
function onDownloadRequested(download) {
|
||||
console.log("DOWNLOAD REQUESTED")
|
||||
downloadView.visible = true;
|
||||
downloadView.append(download);
|
||||
download.accept();
|
||||
}
|
||||
|
||||
FindBar {
|
||||
id: findBar
|
||||
visible: false
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 10
|
||||
anchors.top: parent.top
|
||||
|
||||
onFindNext: {
|
||||
if (text)
|
||||
currentWebView && currentWebView.findText(text);
|
||||
else if (!visible)
|
||||
visible = true;
|
||||
}
|
||||
onFindPrevious: {
|
||||
if (text)
|
||||
currentWebView && currentWebView.findText(text, WebEngineView.FindBackward);
|
||||
else if (!visible)
|
||||
visible = true;
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
id: statusBubble
|
||||
color: "oldlace"
|
||||
property int padding: 8
|
||||
visible: false
|
||||
|
||||
anchors.left: parent.left
|
||||
anchors.bottom: parent.bottom
|
||||
width: statusText.paintedWidth + padding
|
||||
height: statusText.paintedHeight + padding
|
||||
|
||||
Text {
|
||||
id: statusText
|
||||
anchors.centerIn: statusBubble
|
||||
elide: Qt.ElideMiddle
|
||||
|
||||
Timer {
|
||||
id: hideStatusText
|
||||
interval: 750
|
||||
onTriggered: {
|
||||
statusText.text = "";
|
||||
statusBubble.visible = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,175 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtWebEngine module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** 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 https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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 QtQuick.Controls 1.0
|
||||
import QtQuick.Controls.Styles 1.0
|
||||
import QtWebEngine 1.9
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Rectangle {
|
||||
id: downloadView
|
||||
color: "lightgray"
|
||||
|
||||
ListModel {
|
||||
id: downloadModel
|
||||
property var downloads: []
|
||||
}
|
||||
|
||||
function append(download) {
|
||||
downloadModel.append(download);
|
||||
downloadModel.downloads.push(download);
|
||||
}
|
||||
|
||||
Component {
|
||||
id: downloadItemDelegate
|
||||
|
||||
Rectangle {
|
||||
width: listView.width
|
||||
height: childrenRect.height
|
||||
anchors.margins: 10
|
||||
radius: 3
|
||||
color: "transparent"
|
||||
border.color: "black"
|
||||
Rectangle {
|
||||
id: progressBar
|
||||
|
||||
property real progress: downloadModel.downloads[index]
|
||||
? downloadModel.downloads[index].receivedBytes / downloadModel.downloads[index].totalBytes : 0
|
||||
|
||||
radius: 3
|
||||
color: width == listView.width ? "green" : "#2b74c7"
|
||||
width: listView.width * progress
|
||||
height: cancelButton.height
|
||||
|
||||
Behavior on width {
|
||||
SmoothedAnimation { duration: 100 }
|
||||
}
|
||||
}
|
||||
Rectangle {
|
||||
anchors {
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
leftMargin: 20
|
||||
}
|
||||
Label {
|
||||
id: label
|
||||
text: downloadDirectory + "/" + downloadFileName
|
||||
anchors {
|
||||
verticalCenter: cancelButton.verticalCenter
|
||||
left: parent.left
|
||||
right: cancelButton.left
|
||||
}
|
||||
}
|
||||
Button {
|
||||
id: cancelButton
|
||||
anchors.right: parent.right
|
||||
iconSource: "icons/process-stop.png"
|
||||
onClicked: {
|
||||
var download = downloadModel.downloads[index];
|
||||
|
||||
download.cancel();
|
||||
|
||||
downloadModel.downloads = downloadModel.downloads.filter(function (el) {
|
||||
return el.id !== download.id;
|
||||
});
|
||||
downloadModel.remove(index);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
ListView {
|
||||
id: listView
|
||||
anchors {
|
||||
topMargin: 10
|
||||
top: parent.top
|
||||
bottom: parent.bottom
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
width: parent.width - 20
|
||||
spacing: 5
|
||||
|
||||
model: downloadModel
|
||||
delegate: downloadItemDelegate
|
||||
|
||||
Text {
|
||||
visible: !listView.count
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
height: 30
|
||||
anchors {
|
||||
top: parent.top
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
font.pixelSize: 20
|
||||
text: qsTr("No active downloads.")
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
color: "gray"
|
||||
anchors {
|
||||
bottom: parent.bottom
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
}
|
||||
height: 30
|
||||
Button {
|
||||
id: okButton
|
||||
text: qsTr("OK")
|
||||
anchors.centerIn: parent
|
||||
onClicked: {
|
||||
downloadView.visible = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,146 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2019 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtWebEngine module of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** 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 https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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.5
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
import QtQuick.Layouts 1.0
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
|
||||
property int numberOfMatches: 0
|
||||
property int activeMatch: 0
|
||||
property alias text: findTextField.text
|
||||
|
||||
function reset() {
|
||||
numberOfMatches = 0;
|
||||
activeMatch = 0;
|
||||
visible = false;
|
||||
}
|
||||
|
||||
signal findNext()
|
||||
signal findPrevious()
|
||||
|
||||
width: 250
|
||||
height: 35
|
||||
radius: 2
|
||||
|
||||
border.width: 1
|
||||
border.color: "black"
|
||||
color: "white"
|
||||
|
||||
onVisibleChanged: {
|
||||
if (visible)
|
||||
findTextField.forceActiveFocus();
|
||||
}
|
||||
|
||||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
anchors.topMargin: 5
|
||||
anchors.bottomMargin: 5
|
||||
anchors.leftMargin: 10
|
||||
anchors.rightMargin: 10
|
||||
|
||||
spacing: 5
|
||||
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
TextField {
|
||||
id: findTextField
|
||||
anchors.fill: parent
|
||||
|
||||
style: TextFieldStyle {
|
||||
background: Rectangle {
|
||||
color: "transparent"
|
||||
}
|
||||
}
|
||||
|
||||
onAccepted: root.findNext()
|
||||
onTextChanged: root.findNext()
|
||||
onActiveFocusChanged: activeFocus ? selectAll() : deselect()
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
text: activeMatch + "/" + numberOfMatches
|
||||
visible: findTextField.text != ""
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
border.width: 1
|
||||
border.color: "#ddd"
|
||||
width: 2
|
||||
height: parent.height
|
||||
anchors.topMargin: 5
|
||||
anchors.bottomMargin: 5
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
text: "<"
|
||||
enabled: numberOfMatches > 0
|
||||
onClicked: root.findPrevious()
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
text: ">"
|
||||
enabled: numberOfMatches > 0
|
||||
onClicked: root.findNext()
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
text: "x"
|
||||
onClicked: root.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 184 B |
Binary file not shown.
|
After Width: | Height: | Size: 389 B |
Binary file not shown.
|
After Width: | Height: | Size: 173 B |
|
|
@ -0,0 +1,5 @@
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M7.25 8C7.25 7.58579 7.58579 7.25 8 7.25H10.5C10.9142 7.25 11.25 7.58579 11.25 8V15.5C11.25 15.9142 10.9142 16.25 10.5 16.25C10.0858 16.25 9.75 15.9142 9.75 15.5V8.75H8C7.58579 8.75 7.25 8.41421 7.25 8Z" fill="#4360DF"/>
|
||||
<path d="M10 5.75C10.6904 5.75 11.25 5.19036 11.25 4.5C11.25 3.80964 10.6904 3.25 10 3.25C9.30964 3.25 8.75 3.80964 8.75 4.5C8.75 5.19036 9.30964 5.75 10 5.75Z" fill="#4360DF"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M0 10C0 15.5228 4.47715 20 10 20C15.5228 20 20 15.5228 20 10C20 4.47715 15.5228 0 10 0C4.47715 0 0 4.47715 0 10ZM1.5 10C1.5 14.6944 5.30558 18.5 10 18.5C14.6944 18.5 18.5 14.6944 18.5 10C18.5 5.30558 14.6944 1.5 10 1.5C5.30558 1.5 1.5 5.30558 1.5 10Z" fill="#4360DF"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 829 B |
Binary file not shown.
|
After Width: | Height: | Size: 372 B |
Binary file not shown.
|
After Width: | Height: | Size: 630 B |
|
|
@ -1 +1 @@
|
|||
Subproject commit d663d22df625837f329aebd038d2b2e003c4dccb
|
||||
Subproject commit 89d18b95c69b353ab33715caaf1699bc9fd0b26e
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit d48ed1ea37a800793ed756ac5a69628d920b1dc0
|
||||
Subproject commit f1950c5d920860d9f2d0c86b7e4b7f022e32ae5b
|
||||
Loading…
Reference in New Issue