From 7cc1cddf6c82e429dccce1bcdf53cc52903ed824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Wed, 16 Feb 2022 13:27:53 -0500 Subject: [PATCH] chatviewsettings: fix layout values Horizontal view show components horizontally in a vertical layout. So, the labels were inverted Change-Id: Iaecfa923ef0a2eb1ec810ab0436dddd4f4ea73e5 GitLab: #571 --- src/constant/JamiStrings.qml | 4 ++-- src/settingsview/components/ChatviewSettings.qml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml index 0de44ff27..7abd66a04 100644 --- a/src/constant/JamiStrings.qml +++ b/src/constant/JamiStrings.qml @@ -378,8 +378,8 @@ Item { property string displayHyperlinkPreviews: qsTr("Display hyperlink previews in the chatview") property string layout: qsTr("Layout") property string language: qsTr("User interface language") - property string verticalOpt: qsTr("Vertical view") - property string horizontalOpt: qsTr("Horizontal view") + property string verticalViewOpt: qsTr("Vertical view") + property string horizontalViewOpt: qsTr("Horizontal view") // File transfer settings property string fileTransfer: qsTr("File transfer") diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml index 723778ca2..65105700b 100644 --- a/src/settingsview/components/ChatviewSettings.qml +++ b/src/settingsview/components/ChatviewSettings.qml @@ -89,8 +89,8 @@ ColumnLayout { fontPointSize: JamiTheme.settingsFontSize comboModel: ListModel { Component.onCompleted: { - append({ textDisplay: JamiStrings.verticalOpt }) - append({ textDisplay: JamiStrings.horizontalOpt }) + append({ textDisplay: JamiStrings.horizontalViewOpt }) + append({ textDisplay: JamiStrings.verticalViewOpt }) } } widthOfComboBox: itemWidth @@ -101,7 +101,7 @@ ColumnLayout { onActivated: { UtilsAdapter.setAppValue( Settings.Key.ShowChatviewHorizontally, - comboModel.get(modelIndex).textDisplay === JamiStrings.horizontalOpt + comboModel.get(modelIndex).textDisplay === JamiStrings.verticalViewOpt ) } } -- GitLab