From eb00344923bd9ee198e7a265ecf8cfd915246f67 Mon Sep 17 00:00:00 2001
From: Fadi SHEHADEH <fadi.shehadeh@savoirfairelinux.com>
Date: Wed, 30 Nov 2022 15:50:21 -0500
Subject: [PATCH] swarm creation: fix wrapping and string for info
- changed label to Text for wrap
- changed adding 8 to 7 people
Change-Id: Ia7983615e324dff6820e79a56eb561621106276f
---
src/app/constant/JamiStrings.qml | 2 +-
src/app/mainview/components/SidePanel.qml | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index 8af80d5cc..39091b93b 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -787,7 +787,7 @@ Item {
property string none: qsTr("None")
// NewSwarmPage
- property string youCanAdd8: qsTr("You can add 8 people in the swarm")
+ property string youCanAdd7: qsTr("You can add 7 people in the swarm")
property string youCanAddMore: qsTr("You can add %1 more people in the swarm")
property string createTheSwarm: qsTr("Create the swarm")
property string goToConversation: qsTr("Go to conversation")
diff --git a/src/app/mainview/components/SidePanel.qml b/src/app/mainview/components/SidePanel.qml
index 2740157c4..67a0bf983 100644
--- a/src/app/mainview/components/SidePanel.qml
+++ b/src/app/mainview/components/SidePanel.qml
@@ -345,16 +345,20 @@ Rectangle {
spacing: 4
- Label {
+ Text {
font.bold: true
font.pointSize: JamiTheme.contactEventPointSize
Layout.margins: 16
Layout.maximumHeight: 24
+ Layout.alignment: Qt.AlignTop
+ Layout.fillWidth: true
+
+ wrapMode: Text.Wrap
text: {
if (highlightedMembers.length === 0)
- return JamiStrings.youCanAdd8
+ return JamiStrings.youCanAdd7
return JamiStrings.youCanAddMore.arg(7 - Math.min(highlightedMembers.length, 7))
}
color: JamiTheme.textColor
--
GitLab