Skip to content
Snippets Groups Projects
Commit 7f0a94dd authored by Fadi Shehadeh's avatar Fadi Shehadeh Committed by François-Simon Fauteux-Chapleau
Browse files

RTL: AboutPopUp fix

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

GitLab: #1952
Change-Id: I8262cb658ac3099a113e04574df3e93bd7993f0b
parent 81112ff1
No related branches found
No related tags found
No related merge requests found
...@@ -32,8 +32,12 @@ BaseModalDialog { ...@@ -32,8 +32,12 @@ BaseModalDialog {
button1.text: JamiStrings.contribute button1.text: JamiStrings.contribute
button2.text: JamiStrings.feedback button2.text: JamiStrings.feedback
button1.onClicked: { Qt.openUrlExternally("https://jami.net/contribute/")} button1.onClicked: {
button2.onClicked: { Qt.openUrlExternally("mailto:jami@gnu.org")} Qt.openUrlExternally("https://jami.net/contribute/");
}
button2.onClicked: {
Qt.openUrlExternally("mailto:jami@gnu.org");
}
popupContent: JamiFlickable { popupContent: JamiFlickable {
id: aboutPopUpScrollView id: aboutPopUpScrollView
...@@ -111,11 +115,11 @@ BaseModalDialog { ...@@ -111,11 +115,11 @@ BaseModalDialog {
// generated, so we prevent a "." from being displayed if the version // generated, so we prevent a "." from being displayed if the version
// string is not available. // string is not available.
var contentStr = JamiStrings.buildID + ": " + UtilsAdapter.getBuildIDStr(); var contentStr = JamiStrings.buildID + ": " + UtilsAdapter.getBuildIDStr();
const versionStr = UtilsAdapter.getVersionStr() const versionStr = UtilsAdapter.getVersionStr();
if (versionStr.length > 1) { if (versionStr.length > 1) {
contentStr += "\n" + JamiStrings.version + ": " + (isBeta ? "(Beta) " : "") + versionStr contentStr += "\n" + JamiStrings.version + ": " + (isBeta ? "(Beta) " : "") + versionStr;
} }
return contentStr return contentStr;
} }
selectByMouse: true selectByMouse: true
...@@ -229,8 +233,9 @@ BaseModalDialog { ...@@ -229,8 +233,9 @@ BaseModalDialog {
} }
Rectangle { Rectangle {
width: projectCreditsScrollView.width + 20
height: projectCreditsScrollView.height + 20 width: JamiTheme.preferredDialogWidth - 2 * JamiTheme.preferredMarginSize
height: 160
color: JamiTheme.backgroundRectangleColor color: JamiTheme.backgroundRectangleColor
radius: 5 radius: 5
...@@ -238,13 +243,12 @@ BaseModalDialog { ...@@ -238,13 +243,12 @@ BaseModalDialog {
ProjectCreditsScrollView { ProjectCreditsScrollView {
id: projectCreditsScrollView id: projectCreditsScrollView
anchors.centerIn: parent anchors.fill: parent
width: JamiTheme.preferredDialogWidth - 2*JamiTheme.preferredMarginSize anchors.topMargin: JamiTheme.preferredMarginSize
height: 140 anchors.bottomMargin: JamiTheme.preferredMarginSize
anchors.margins: 10 anchors.leftMargin: JamiTheme.preferredMarginSize / 2
} }
} }
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment