From f5c4c3a380f974aac954628d120ec3b0e028e36e Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Mon, 7 May 2018 12:24:06 +0300 Subject: Remove qtwebbrowser submodule Task-number: QTBUG-62793 Change-Id: I3ef7323ebaed7b16014e139a5110f1784240520a Reviewed-by: Samuli Piippo --- basicsuite/qtwebbrowser/tqtc-qtwebbrowser | 1 - 1 file changed, 1 deletion(-) delete mode 160000 basicsuite/qtwebbrowser/tqtc-qtwebbrowser (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml') diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser deleted file mode 160000 index c86bb8a..0000000 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c86bb8a400f79be205025598310926df5d01c7bc -- cgit v1.2.3 From e513aed3b9cb8ff3124c21ed01e45128fa686eee Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Tue, 17 Apr 2018 16:18:56 +0300 Subject: Update QtWebBrowser demo to new UI theme Task-number: QTBUG-62793 Change-Id: I8e1a0dcb229dc1b445a1b3a7787e6b818f246249 Reviewed-by: Teemu Holappa --- .../tqtc-qtwebbrowser/src/qml/SettingsView.qml | 195 +++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml') diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml new file mode 100644 index 0000000..678b966 --- /dev/null +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml @@ -0,0 +1,195 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtBrowser project. +** +** $QT_BEGIN_LICENSE:GPL$ +** 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 General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPLv2 included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 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 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.5 +import QtQuick.Layouts 1.0 +import QtQuick.Controls 1.4 +import QtQuick.Controls.Styles 1.4 +import Qt.labs.settings 1.0 + +import WebBrowser 1.0 + +Rectangle { + id: root + color: "#09102b" + property bool privateBrowsingEnabled: appSettings[0].active + property bool httpDiskCacheEnabled: appSettings[1].active + property bool autoLoadImages: appSettings[2].active + property bool javaScriptDisabled: appSettings[3].active + // property bool pluginsEnabled: appSettings[4].active + + property var appSettings: [ + { "name": "Private Browsing", "active": false, "notify": function(v) { privateBrowsingEnabled = v; } }, + { "name": "Enable HTTP Disk Cache", "active": true, "notify": function(v) { httpDiskCacheEnabled = v; } }, + { "name": "Auto Load Images", "active": true, "notify": function(v) { autoLoadImages = v; } }, + { "name": "Disable JavaScript", "active": false, "notify": function(v) { javaScriptDisabled = v; } }, +// { "name": "Enable Plugins", "active": false, "notify": function(v) { pluginsEnabled = v; } } + ] + + function save() { + for (var i = 0; i < appSettings.length; ++i) { + var setting = appSettings[i] + + listModel.get(i).active = setting.active + // Do not persist private browsing mode + if (setting.name === "Private Browsing") + continue + AppEngine.saveSetting(setting.name, setting.active) + } + } + + Rectangle{ + color: "#9d9faa" + height: 2 + anchors.top: root.top + anchors.right: root.right + anchors.left: root.left + z: 100 + } + + state: "disabled" + + states: [ + State { + name: "enabled" + AnchorChanges { + target: root + anchors.top: navigation.bottom + } + PropertyChanges { + target: settingsToolBar + opacity: 1.0 + } + }, + State { + name: "disabled" + AnchorChanges { + target: root + anchors.top: root.parent.bottom + } + PropertyChanges { + target: settingsToolBar + opacity: 0.0 + } + } + ] + + transitions: Transition { + AnchorAnimation { duration: animationDuration; easing.type : Easing.InSine } + } + + ListModel { + id: listModel + } + + ListView { + id: listView + leftMargin: 230 + rightMargin: leftMargin + anchors.fill: parent + model: listModel + delegate: Rectangle { + color: "transparent" + height: 100 + width: 560 + Text { + anchors.verticalCenter: parent.verticalCenter + font.family: defaultFontFamily + font.pixelSize: 28 + text: name + color: sw.enabled ? "white" : "#848895" + } + Rectangle { + anchors { + right: parent.right + verticalCenter: parent.verticalCenter + } + CustomSwitch { + id: sw + onCheckedChanged: { + var setting = appSettings[index] + setting.active = checked + setting.notify(checked) + } + enabled: { + var ok = appSettings[index].name.indexOf("Disk Cache") < 0 + return ok || !privateBrowsingEnabled + } + anchors.centerIn: parent + checked: { + if (enabled) + return active + return false + } + /*style: SwitchStyle { + handle: Rectangle { + width: 42 + height: 42 + radius: height / 2 + color: "white" + border.color: control.checked ? "#5caa14" : "#9b9b9b" + border.width: 1 + } + + groove: Rectangle { + implicitWidth: 72 + height: 42 + radius: height / 2 + border.color: control.checked ? "#5caa14" : "#9b9b9b" + color: control.checked ? "#5cff14" : "white" + border.width: 1 + } + }*/ + } + } + } + + Component.onCompleted: { + for (var i = 0; i < appSettings.length; ++i) { + var setting = appSettings[i] + var active = JSON.parse(AppEngine.restoreSetting(setting.name, setting.active)) + if (setting.active !== active) { + setting.active = active + setting.notify(active) + } + listModel.append(setting) + } + listView.forceLayout() + } + Component.onDestruction: root.save() + } +} -- cgit v1.2.3 From da6035233fc3bcfbc4a3d65075ee4099349c09d0 Mon Sep 17 00:00:00 2001 From: Juho Annunen Date: Mon, 23 Apr 2018 15:17:33 +0300 Subject: Move common definitions to shared settings Task-number: QTBUG-65302 Change-Id: I2153e2f2b4aa295e87098256354ed034480294df Reviewed-by: Teemu Holappa --- basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml') diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml index 678b966..81397fd 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml @@ -73,7 +73,7 @@ Rectangle { } Rectangle{ - color: "#9d9faa" + color: toolBarSeparatorColor height: 2 anchors.top: root.top anchors.right: root.right -- cgit v1.2.3