From 72d2096ae706dea88a1d222f1beff6d653e8363f Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Tue, 8 Oct 2024 12:41:44 +0200 Subject: [PATCH] fix polish loop fix crash --- Linphone/model/tool/ToolModel.cpp | 1 + .../view/Page/Layout/Settings/CallSettingsLayout.qml | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Linphone/model/tool/ToolModel.cpp b/Linphone/model/tool/ToolModel.cpp index 08ed9b5ff..21f12236f 100644 --- a/Linphone/model/tool/ToolModel.cpp +++ b/Linphone/model/tool/ToolModel.cpp @@ -93,6 +93,7 @@ QString ToolModel::getDisplayName(QString address) { if (displayName.isEmpty()) return address; QStringList nameSplitted = displayName.split(" "); for (auto &part : nameSplitted) { + if (part.isEmpty()) continue; part[0] = part[0].toUpper(); } return nameSplitted.join(" "); diff --git a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml index 30941d8c7..1d5a1461a 100644 --- a/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/CallSettingsLayout.qml @@ -48,21 +48,24 @@ AbstractSettingsLayout { RowLayout { spacing: 47 * DefaultStyle.dp ColumnLayout { - ColumnLayout { + Item { Layout.preferredWidth: 341 * DefaultStyle.dp Text { + id: periphTitle text: qsTr("Périphériques") font: Typography.p2 wrapMode: Text.WordWrap color: DefaultStyle.main2_600 - Layout.fillWidth: true } Text { + anchors.top: periphTitle.bottom + anchors.topMargin: 3 * DefaultStyle.dp + anchors.left: parent.left + anchors.right: parent.right text: qsTr("Vous pouvez modifier les périphériques de sortie audio, le microphone et la caméra de capture.") font: Typography.p1 wrapMode: Text.WordWrap color: DefaultStyle.main2_600 - Layout.fillWidth: true } } Item {