lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

RTL: AboutPopUp fix

Browse source 
Fixed the alignment problem with RTL languages on the About Jami PopUp.

GitLab: #1952
Change-Id: I8262cb658ac3099a113e04574df3e93bd7993f0b
This commit is contained in:
Fadi Shehadeh 2025-03-14 16:09:43 -04:00 • committed by François-Simon Fauteux-Chapleau
parent 81112ff1f8
commit 7f0a94dd48
1 changed files with 179 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/app/mainview/components/AboutPopUp.qml
View file

@ -32,8 +32,12 @@ BaseModalDialog {
button1.text: JamiStrings.contribute
button2.text: JamiStrings.feedback
button1.onClicked: { Qt.openUrlExternally("https://jami.net/contribute/")}
button2.onClicked: { Qt.openUrlExternally("mailto:jami@gnu.org")}
button1.onClicked: {
Qt.openUrlExternally("https://jami.net/contribute/");
}
button2.onClicked: {
Qt.openUrlExternally("mailto:jami@gnu.org");
}
popupContent: JamiFlickable {
id: aboutPopUpScrollView
@ -47,7 +51,7 @@ BaseModalDialog {
id: aboutPopUpContentRectColumnLayout
anchors.centerIn: parent
RowLayout{
RowLayout {
Layout.fillWidth: true
Layout.alignment: Qt.AlignCenter
spacing: 10
@ -111,11 +115,11 @@ BaseModalDialog {
// generated, so we prevent a "." from being displayed if the version
// string is not available.
var contentStr = JamiStrings.buildID + ": " + UtilsAdapter.getBuildIDStr();
const versionStr = UtilsAdapter.getVersionStr()
const versionStr = UtilsAdapter.getVersionStr();
if (versionStr.length > 1) {
contentStr += "\n" + JamiStrings.version + ": " + (isBeta ? "(Beta) " : "") + versionStr
contentStr += "\n" + JamiStrings.version + ": " + (isBeta ? "(Beta) " : "") + versionStr;
}
return contentStr
return contentStr;
}
selectByMouse: true
@ -134,7 +138,7 @@ BaseModalDialog {
Layout.fillWidth: true
// Strangely, hoveredLink works badly when width grows too large
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2 * JamiTheme.preferredMarginSize
Layout.topMargin: 15
color: JamiTheme.textColor
@ -168,7 +172,7 @@ BaseModalDialog {
id: jamiNoneWarrantyHyperText
Layout.alignment: Qt.AlignLeft
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2 * JamiTheme.preferredMarginSize
Layout.topMargin: 15
wrapMode: Text.WordWrap
font.pixelSize: JamiTheme.menuFontSize
@ -199,7 +203,7 @@ BaseModalDialog {
id: jamiYears
Layout.alignment: Qt.AlignLeft
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
Layout.maximumWidth: JamiTheme.preferredDialogWidth - 2 * JamiTheme.preferredMarginSize
Layout.topMargin: 15
wrapMode: Text.WordWrap
@ -229,8 +233,9 @@ BaseModalDialog {
}
Rectangle {
width: projectCreditsScrollView.width + 20
height: projectCreditsScrollView.height + 20
width: JamiTheme.preferredDialogWidth - 2 * JamiTheme.preferredMarginSize
height: 160
color: JamiTheme.backgroundRectangleColor
radius: 5
@ -238,13 +243,12 @@ BaseModalDialog {
ProjectCreditsScrollView {
id: projectCreditsScrollView
anchors.centerIn: parent
width: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize
height: 140
anchors.margins: 10
anchors.fill: parent
anchors.topMargin: JamiTheme.preferredMarginSize
anchors.bottomMargin: JamiTheme.preferredMarginSize
anchors.leftMargin: JamiTheme.preferredMarginSize / 2
}
}
}
}
}