From 44261b4f75d9ce46ab32d97803b3b816756a3652 Mon Sep 17 00:00:00 2001 From: Pavel Tumakaev Date: Mon, 21 Feb 2022 16:34:36 +0300 Subject: [PATCH] [sailfish-browser] Add user agent override management page. Contributes to JB#31240 --- apps/browser/qml/pages/SettingsPage.qml | 26 +++++ apps/browser/qml/pages/UserAgentPage.qml | 135 +++++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 apps/browser/qml/pages/UserAgentPage.qml diff --git a/apps/browser/qml/pages/SettingsPage.qml b/apps/browser/qml/pages/SettingsPage.qml index b83f2f1098bc..a33735d11f01 100644 --- a/apps/browser/qml/pages/SettingsPage.qml +++ b/apps/browser/qml/pages/SettingsPage.qml @@ -232,6 +232,32 @@ Page { onClicked: pageStack.push("PermissionPage.qml") } + BackgroundItem { + width: parent.width + contentHeight: Theme.itemSizeMedium + Row { + width: parent.width - 2*Theme.horizontalPageMargin + x: Theme.horizontalPageMargin + spacing: Theme.paddingMedium + anchors.verticalCenter: parent.verticalCenter + + Icon { + id: userAgentsIcon + source: "image://theme/icon-m-browser-user-agents" + width: Theme.iconSizeMedium + height: Theme.iconSizeMedium + } + Label { + width: parent.width - parent.spacing - userAgentsIcon.width + //: The label for the button for accessing user agent overrides management + //% "User agent overrides" + text: qsTrId("settings_browser-la-user_agent_overrides") + anchors.verticalCenter: userAgentsIcon.verticalCenter + } + } + onClicked: pageStack.push("UserAgentPage.qml") + } + BackgroundItem { width: parent.width contentHeight: Theme.itemSizeMedium diff --git a/apps/browser/qml/pages/UserAgentPage.qml b/apps/browser/qml/pages/UserAgentPage.qml new file mode 100644 index 000000000000..5be442b445f6 --- /dev/null +++ b/apps/browser/qml/pages/UserAgentPage.qml @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (c) 2022 Open Mobile Platform LLC. +** +****************************************************************************/ + +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +import QtQuick 2.5 +import Sailfish.Silica 1.0 +import Sailfish.Browser 1.0 +import "useragenthelper.js" as UserAgentHelper +import "components" + +Page { + UserAgentFilterModel { + id: userAgentFilterModel + sourceModel: UserAgentModel { + id: userAgentModel + } + } + + SilicaListView { + id: view + + anchors.fill: parent + model: userAgentFilterModel + currentIndex: -1 + header: Column { + width: parent.width + PageHeader { + //% "User agent overrides" + title: qsTrId("sailfish_browser-he-user_agent_overrides") + } + SearchField { + width: parent.width + //% "Search" + placeholderText: qsTrId("sailfish_browser-ph-usera_gent_override_search") + EnterKey.onClicked: focus = false + onTextChanged: userAgentFilterModel.search = text + inputMethodHints: Qt.ImhPreferLowercase | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText + visible: userAgentModel.count > 0 + } + } + + delegate: ListItem { + id: listItem + + width: parent.width + contentHeight: Theme.itemSizeMedium + ListView.onAdd: AddAnimation { target: listItem } + ListView.onRemove: animateRemoval() + + function remove(host) { + remorseDelete(function() { + userAgentModel.unsetUserAgentOverride(host) + }) + } + + onClicked: openMenu() + + Row { + width: parent.width - 2 * Theme.horizontalPageMargin + x: Theme.horizontalPageMargin + spacing: Theme.paddingMedium + anchors.verticalCenter: parent.verticalCenter + + FavoriteIcon { + id: loginsIcon + + anchors.verticalCenter: parent.verticalCenter + icon: model.favicon + sourceSize.width: Theme.iconSizeMedium + sourceSize.height: Theme.iconSizeMedium + width: Theme.iconSizeMedium + height: Theme.iconSizeMedium + } + + Column { + anchors.verticalCenter: parent.verticalCenter + width: parent.width - parent.spacing - loginsIcon.width + Label { + width: parent.width + text: Theme.highlightText(model.host, + userAgentFilterModel.search, + Theme.highlightColor) + textFormat: Text.StyledText + } + + Label { + width: parent.width + text: UserAgentHelper.getUserAgentString(model.userAgent, model.isKey) + font.pixelSize: Theme.fontSizeExtraSmall + elide: Text.ElideRight + color: Theme.secondaryColor + } + } + } + + menu: Component { + ContextMenu { + MenuItem { + //% "Edit" + text: qsTrId("sailfish_browser-me-user_agent_override_edit") + onClicked: { + userAgentModel.currentHost = model.host + pageStack.animatorPush("SiteUserAgentPage.qml", + { + userAgentModel: userAgentModel + }) + } + } + MenuItem { + //% "Delete" + text: qsTrId("sailfish_browser-me-user_agent_override_delete") + onClicked: listItem.remove(host) + } + } + } + } + + ViewPlaceholder { + //% "Your saved user agent overrides show up here" + text: qsTrId("sailfish_browser-la-user_agents_none") + enabled: userAgentModel.count === 0 + } + + VerticalScrollDecorator { + parent: view + flickable: view + } + } +}