From b1e129b0e2d0d2782ee561e385a4ccbf83111f35 Mon Sep 17 00:00:00 2001
From: cberthet <capucine.berthet@savoirfairelinux.com>
Date: Tue, 21 Nov 2023 11:53:27 -0500
Subject: [PATCH] AboutPopup: new design
GitLab: #1417
Change-Id: Ibbdaa074ac6e6a7c778ef4710f334e23d04dd121
---
resources/misc/projectcredits.html | 4 +-
src/app/constant/JamiStrings.qml | 5 +-
src/app/mainview/components/AboutPopUp.qml | 214 +++++++++++-------
.../components/ProjectCreditsScrollView.qml | 2 +-
4 files changed, 140 insertions(+), 85 deletions(-)
diff --git a/resources/misc/projectcredits.html b/resources/misc/projectcredits.html
index 0c9a19de5..d94932fe1 100644
--- a/resources/misc/projectcredits.html
+++ b/resources/misc/projectcredits.html
@@ -1,4 +1,4 @@
-<h3 align="center"><span style="font-weight:600"> CREATED BY:</span></h3>
+<h4 align="left"><span style="font-weight:600"> Created by</span></h4>
<p>Adrien Béraud<br>
Albert BabÃ<br>
Alexandre Lision<br>
@@ -54,6 +54,6 @@ Thomas Ballasi<br>
Trevor Tabah<br>
Vsevolod Ivanov<br>
Yang Wang<br></p>
-<h3 align="center"><span style="font-weight:600"> ARTWORK BY:</span></h3>
+<h4 align="left"><span style="font-weight:600"> Artwork by</span></h4>
<p>Charlotte Hoffmann<br>
Marianne Forget<br></p>
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index c8b96422b..a40318278 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -48,7 +48,10 @@ Item {
property string version: qsTr("Version") + (AppVersionManager.isCurrentVersionBeta() ? " (Beta)" : "")
property string declarationYear: "© 2015-2023"
property string slogan: "Eleutheria"
- property string declaration: qsTr("Jami is a free universal communication software that respects the freedom and privacy of its users.")
+ property string declaration: qsTr('Jami, a GNU package, is software for universal and distributed peer-to-peer communication that respects the freedom and privacy of its users. Visit <a href="https://jami.net" style="color: ' + JamiTheme.buttonTintedBlue + '">jami.net</a>' + ' to learn more.')
+ property string noWarranty: qsTr('This program comes with absolutely no warranty. See the <a href="https://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.buttonTintedBlue + '">GNU General Public License</a>, version 3 or later for details.')
+ property string contribute: qsTr('Contribute')
+ property string feedback: qsTr('Feedback')
// AccountComboBox
property string displayQRCode: qsTr("Display QR code")
diff --git a/src/app/mainview/components/AboutPopUp.qml b/src/app/mainview/components/AboutPopUp.qml
index 54218a77f..bed8e508e 100644
--- a/src/app/mainview/components/AboutPopUp.qml
+++ b/src/app/mainview/components/AboutPopUp.qml
@@ -27,96 +27,107 @@ import "../../commoncomponents"
BaseModalDialog {
id: root
margins: JamiTheme.preferredMarginSize
+ title: JamiStrings.aboutJami
+
+ button1.text: JamiStrings.contribute
+ button2.text: JamiStrings.feedback
+
+ button1.onClicked: { Qt.openUrlExternally("https://jami.net/contribute/")}
+ button2.onClicked: { Qt.openUrlExternally("mailto:jami@gnu.org")}
popupContent: JamiFlickable {
id: aboutPopUpScrollView
+
width: aboutPopUpContentRectColumnLayout.implicitWidth
- height: JamiTheme.preferredDialogHeight
+ height: Math.min(root.implicitHeight, aboutPopUpContentRectColumnLayout.implicitHeight)
+ Component.onCompleted: print(root.height, aboutPopUpContentRectColumnLayout.implicitHeight)
contentHeight: aboutPopUpContentRectColumnLayout.implicitHeight
ColumnLayout {
id: aboutPopUpContentRectColumnLayout
anchors.centerIn: parent
- ResponsiveImage {
- id: aboutPopUPJamiLogoImage
-
- Layout.alignment: Qt.AlignCenter
- Layout.preferredWidth: JamiTheme.aboutLogoPreferredWidth
- Layout.preferredHeight: JamiTheme.aboutLogoPreferredHeight
-
- source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
- }
-
- TextEdit {
- id: jamiSlogansText
-
+ RowLayout{
+ Layout.fillWidth: true
Layout.alignment: Qt.AlignCenter
- Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
- Layout.topMargin: 26
+ spacing: 10
- wrapMode: Text.WordWrap
- font.pixelSize: JamiTheme.bigFontSize
+ ResponsiveImage {
+ id: aboutPopUPJamiLogoImage
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
-
- text: textMetricsjamiSlogansText.text
- selectByMouse: true
- readOnly: true
- color: JamiTheme.tintedBlue
+ Layout.alignment: Qt.AlignCenter
+ Layout.margins: 10
+ Layout.preferredWidth: 150
+ Layout.preferredHeight: 50
- TextMetrics {
- id: textMetricsjamiSlogansText
- font: jamiSlogansText.font
- text: JamiStrings.slogan
+ source: JamiTheme.darkTheme ? JamiResources.logo_jami_standard_coul_white_svg : JamiResources.logo_jami_standard_coul_svg
}
- }
-
- TextEdit {
- id: jamiVersionText
-
- Layout.alignment: Qt.AlignCenter
- Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
-
- font.pixelSize: JamiTheme.tinyCreditsTextSize
-
- padding: 0
-
- text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
- selectByMouse: true
- readOnly: true
- color: JamiTheme.textColor
-
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- }
-
- TextEdit {
- id: jamiDeclarationText
-
- Layout.alignment: Qt.AlignCenter
- Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
- Layout.topMargin: 15
-
- wrapMode: Text.WordWrap
- font.pixelSize: JamiTheme.creditsTextSize
- color: JamiTheme.textColor
-
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- // TextMetrics does not work for multi-line.
- text: JamiStrings.declaration
- selectByMouse: true
- readOnly: true
+ Rectangle {
+ color: JamiTheme.backgroundRectangleColor
+ Layout.fillHeight: true
+ Layout.fillWidth: true
+ radius: 5
+
+ ColumnLayout {
+ id: sloganLayout
+
+ anchors.verticalCenter: parent.verticalCenter
+
+ TextEdit {
+ id: jamiSlogansText
+
+ Layout.alignment: Qt.AlignLeft
+ Layout.margins: 10
+ Layout.bottomMargin: 0
+
+ wrapMode: Text.WordWrap
+ font.pixelSize: JamiTheme.menuFontSize
+ font.bold: true
+
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+
+ text: textMetricsjamiSlogansText.text
+ selectByMouse: true
+ readOnly: true
+ color: JamiTheme.textColor
+
+ TextMetrics {
+ id: textMetricsjamiSlogansText
+ font: jamiSlogansText.font
+ text: JamiStrings.slogan
+ }
+ }
+ TextEdit {
+ id: jamiVersionText
+
+ Layout.alignment: Qt.AlignLeft
+ Layout.margins: 10
+ Layout.topMargin: 0
+ Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+
+ font.pixelSize: JamiTheme.textFontSize
+ padding: 0
+ text: JamiStrings.version + ": " + UtilsAdapter.getVersionStr()
+
+ selectByMouse: true
+ readOnly: true
+
+ color: JamiTheme.faddedFontColor
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ }
+ }
+ }
}
TextEdit {
id: jamiDeclarationHyperText
- Layout.alignment: Qt.AlignCenter
+ Layout.alignment: Qt.AlignLeft
+ Layout.fillWidth: true
// Strangely, hoveredLink works badly when width grows too large
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
@@ -124,12 +135,12 @@ BaseModalDialog {
color: JamiTheme.textColor
- font.pixelSize: JamiTheme.creditsTextSize
- horizontalAlignment: Text.AlignHCenter
+ font.pixelSize: JamiTheme.menuFontSize
verticalAlignment: Text.AlignVCenter
text: textMetricsjamiDeclarationHyperText.text
textFormat: TextEdit.RichText
+ wrapMode: TextEdit.WordWrap
selectByMouse: true
readOnly: true
onLinkActivated: Qt.openUrlExternally(link)
@@ -137,7 +148,7 @@ BaseModalDialog {
TextMetrics {
id: textMetricsjamiDeclarationHyperText
font: jamiDeclarationHyperText.font
- text: '<a href="https://jami.net" style="color: ' + JamiTheme.blueLinkColor + '">jami.net</a>'
+ text: JamiStrings.declaration
}
MouseArea {
@@ -152,13 +163,12 @@ BaseModalDialog {
TextEdit {
id: jamiNoneWarrantyHyperText
- Layout.alignment: Qt.AlignCenter
+ Layout.alignment: Qt.AlignLeft
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
Layout.topMargin: 15
wrapMode: Text.WordWrap
- font.pixelSize: JamiTheme.tinyCreditsTextSize
+ font.pixelSize: JamiTheme.menuFontSize
- horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignTop
color: JamiTheme.textColor
@@ -171,7 +181,7 @@ BaseModalDialog {
TextMetrics {
id: textMetricsjamiNoneWarrantyHyperText
font: jamiDeclarationHyperText.font
- text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.blueLinkColor + '">Savoir-faire Linux Inc.</a><br>' + 'This program comes with absolutely no warranty. See the <a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: ' + JamiTheme.blueLinkColor + '">GNU General Public License</a>, version 3 or later for details.'
+ text: JamiStrings.noWarranty
}
MouseArea {
@@ -181,14 +191,56 @@ BaseModalDialog {
}
}
- ProjectCreditsScrollView {
- id: projectCreditsScrollView
- Layout.alignment: Qt.AlignCenter
+ TextEdit {
+ id: jamiYears
+
+ Layout.alignment: Qt.AlignLeft
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
- Layout.preferredHeight: 100
- Layout.topMargin: 25
- Layout.margins: JamiTheme.preferredMarginSize
+ Layout.topMargin: 15
+
+ wrapMode: Text.WordWrap
+ font.pixelSize: JamiTheme.menuFontSize
+ verticalAlignment: Text.AlignTop
+
+ color: JamiTheme.textColor
+
+ text: textMetricsYears.text
+ textFormat: TextEdit.RichText
+ selectByMouse: true
+ readOnly: true
+
+ onLinkActivated: Qt.openUrlExternally(link)
+
+ TextMetrics {
+ id: textMetricsYears
+ font: jamiDeclarationHyperText.font
+ text: JamiStrings.declarationYear + " " + '<a href="https://savoirfairelinux.com" style="color: ' + JamiTheme.buttonTintedBlue + '">Savoir-faire Linux</a><br>'
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ acceptedButtons: Qt.NoButton
+ cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+ }
+ }
+
+ Rectangle {
+ width: projectCreditsScrollView.width + 20
+ height: projectCreditsScrollView.height + 20
+
+ color: JamiTheme.backgroundRectangleColor
+ radius: 5
+
+ ProjectCreditsScrollView {
+ id: projectCreditsScrollView
+
+ anchors.centerIn: parent
+ width: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
+ height: 140
+ anchors.margins: 10
+ }
}
+
}
}
}
diff --git a/src/app/mainview/components/ProjectCreditsScrollView.qml b/src/app/mainview/components/ProjectCreditsScrollView.qml
index 66b7e5f55..c790fee22 100644
--- a/src/app/mainview/components/ProjectCreditsScrollView.qml
+++ b/src/app/mainview/components/ProjectCreditsScrollView.qml
@@ -36,7 +36,7 @@ Rectangle {
TextEdit {
id: projectCreditsTextArea
- horizontalAlignment: Text.AlignHCenter
+ horizontalAlignment: Text.AlignLeft
width: projectCreditsFlickable.width
color: JamiTheme.textColor
--
GitLab