From 14809cebfe7b1837090645d756f6d0342a8bb5a3 Mon Sep 17 00:00:00 2001 From: Pascal Precht Date: Thu, 14 Jan 2021 14:23:48 +0100 Subject: [PATCH] uiux(About): revamp about page Closes: #1625 --- .../Profile/Sections/AboutContainer.qml | 169 ++++++------------ 1 file changed, 54 insertions(+), 115 deletions(-) diff --git a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml index d25f49bd44..c07a5e026e 100644 --- a/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml +++ b/ui/app/AppLayouts/Profile/Sections/AboutContainer.qml @@ -3,135 +3,74 @@ import QtQuick.Controls 2.13 import QtQuick.Layouts 1.13 import "../../../../imports" import "../../../../shared" +import "../../../../shared/status" Item { id: aboutContainer Layout.fillHeight: true Layout.fillWidth: true - StyledText { - id: element9 - //% "About the app" - text: qsTrId("about-the-app") - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding + Column { + id: generalColumn + spacing: Style.current.bigPadding anchors.top: parent.top - anchors.topMargin: 24 - font.weight: Font.Bold - font.pixelSize: 20 - } + anchors.topMargin: 46 + anchors.left: parent.left + anchors.leftMargin: contentMargin + anchors.right: parent.right + anchors.rightMargin: contentMargin - StyledText { - id: element10 - //% "Status Desktop" - text: qsTrId("status-desktop") - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element9.top - anchors.topMargin: 58 - font.weight: Font.Bold - font.pixelSize: 14 - } - StyledText { - id: element11 - //% "Version: beta.5" - text: qsTrId("version:-beta.5") - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element10.top - anchors.topMargin: 58 - font.weight: Font.Bold - font.pixelSize: 14 - } - StyledText { - id: element12 - //% "Node Version: %1" - text: qsTrId("node-version:-%1").arg(profileModel.nodeVersion()) - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element11.top - anchors.topMargin: 58 - font.weight: Font.Bold - font.pixelSize: 14 - } - StyledText { - id: element13 - //% "This software is licensed under under the %1." - text: qsTrId("this-software-is-licensed-under-under-the--1-").arg("Mozilla Public License Version 2.0") - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element12.top - anchors.topMargin: 58 - font.pixelSize: 14 - onLinkActivated: appMain.openLink(link) - - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + StatusSectionDescItem { + name: qsTr("App version") + description: qsTr("Version: %1").arg("beta.5") } - } - StyledText { - id: element14 - //% "Source code is available on %1." - text: qsTrId("source-code-is-available-on--1-").arg("GitHub") - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element13.top - anchors.topMargin: 58 - font.pixelSize: 14 - onLinkActivated: appMain.openLink(link) - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + StatusSectionDescItem { + name: qsTr("Node version ") + description: profileModel.nodeVersion() } - } - StyledText { - id: privacyPolicyLink - //% "Privacy Policy" - text: `${qsTrId("privacy-policy")}` - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: element14.top - anchors.topMargin: 58 - onLinkActivated: appMain.openLink(link) - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor - } - } - StyledText { - id: faqLink - text: `${qsTr("Frequently asked questions")}` - anchors.left: parent.left - anchors.leftMargin: Style.current.bigPadding - anchors.top: privacyPolicyLink.top - anchors.topMargin: 58 - onLinkActivated: appMain.openLink(link) + StyledText { + text: qsTr("Check for updates") + font.pixelSize: 15 + color: Style.current.blue - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text - cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + hoverEnabled: true + onEntered: { + parent.font.underline = true + } + onExited: { + parent.font.underline = false + } + onClicked: { + appMain.openLink("https://github.com/status-im/nim-status-client/releases") + } + } + } + + StyledText { + text: qsTr("Privacy Policy") + font.pixelSize: 15 + color: Style.current.blue + + MouseArea { + anchors.fill: parent + cursorShape: Qt.PointingHandCursor + hoverEnabled: true + onEntered: { + parent.font.underline = true + } + onExited: { + parent.font.underline = false + } + onClicked: { + appMain.openLink("https://status.im/privacy-policy/") + } + } } - } - StyledText { - id: warningMessage - x: 772 - //% "Thanks for trying Status Desktop! Please note that this is an alpha release and we advise you that using this app should be done for testing purposes only and you assume the full responsibility for all risks concerning your data and funds. Status makes no claims of security or integrity of funds in these builds." - text: qsTrId("thanks-for-trying-status-desktop!-please-note-that-this-is-an-alpha-release-and-we-advise-you-that-using-this-app-should-be-done-for-testing-purposes-only-and-you-assume-the-full-responsibility-for-all-risks-concerning-your-data-and-funds.-status-makes-no-claims-of-security-or-integrity-of-funds-in-these-builds.") - font.bold: true - anchors.top: faqLink.bottom - anchors.topMargin: 30 - anchors.horizontalCenter: parent.horizontalCenter - font.pixelSize: 14 - font.letterSpacing: 0.1 - width: 700 - wrapMode: Text.Wrap } }