From dfffe91a8fc31da40def0f169ab263c31877caf9 Mon Sep 17 00:00:00 2001
From: Trevor Tabah <trevor.tabah@savoirfairelinux.com>
Date: Wed, 23 Jun 2021 12:53:04 -0400
Subject: [PATCH] display links toggle: correct text and variable names
Change-Id: I4e4f1837f2f8ba53b776c4401067f8d7feaa2f76
---
src/appsettingsmanager.h | 2 +-
src/constant/JamiStrings.qml | 2 +-
src/messagesadapter.cpp | 2 +-
src/settingsview/components/ChatviewSettings.qml | 8 ++++----
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/appsettingsmanager.h b/src/appsettingsmanager.h
index 7d7764b12..d3b081110 100644
--- a/src/appsettingsmanager.h
+++ b/src/appsettingsmanager.h
@@ -36,7 +36,7 @@ const QString defaultDownloadPath = QStandardPaths::writableLocation(
X(DownloadPath, defaultDownloadPath) \
X(EnableNotifications, true) \
X(EnableTypingIndicator, true) \
- X(DisplayImagesChatview, true) \
+ X(DisplayHyperlinkPreviews, true) \
X(EnableDarkTheme, false) \
X(AutoUpdate, true) \
X(NeverShowMeAgain, false)
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 1629fdb01..21bf7865c 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -317,7 +317,7 @@ Item {
// ChatviewSettings
property string chatview: qsTr("Chatview")
property string enableTypingIndicator: qsTr("Enable typing indicators")
- property string displayImages: qsTr("Display images and videos in the chatview")
+ property string displayHyperlinkPreviews: qsTr("Display hyperlink previews in the chatview")
// Updates
property string betaInstall: qsTr("Install beta version")
diff --git a/src/messagesadapter.cpp b/src/messagesadapter.cpp
index 0a80cc02d..c33d7288f 100644
--- a/src/messagesadapter.cpp
+++ b/src/messagesadapter.cpp
@@ -596,7 +596,7 @@ void
MessagesAdapter::setDisplayLinks()
{
QString s = QString::fromLatin1("setDisplayLinks(%1);")
- .arg(settingsManager_->getValue(Settings::Key::DisplayImagesChatview).toBool());
+ .arg(settingsManager_->getValue(Settings::Key::DisplayHyperlinkPreviews).toBool());
QMetaObject::invokeMethod(qmlObj_, "webViewRunJavaScript", Q_ARG(QVariant, s));
}
diff --git a/src/settingsview/components/ChatviewSettings.qml b/src/settingsview/components/ChatviewSettings.qml
index 9796e150d..263f7fbce 100644
--- a/src/settingsview/components/ChatviewSettings.qml
+++ b/src/settingsview/components/ChatviewSettings.qml
@@ -67,15 +67,15 @@ ColumnLayout {
Layout.fillWidth: true
Layout.leftMargin: JamiTheme.preferredMarginSize
- checked: SettingsAdapter.getAppValue(Settings.DisplayImagesChatview)
+ checked: SettingsAdapter.getAppValue(Settings.DisplayHyperlinkPreviews)
- labelText: JamiStrings.displayImages
+ labelText: JamiStrings.displayHyperlinkPreviews
fontPointSize: JamiTheme.settingsFontSize
- tooltipText: JamiStrings.displayImages
+ tooltipText: JamiStrings.displayHyperlinkPreviews
onSwitchToggled: {
- SettingsAdapter.setAppValue(Settings.Key.DisplayImagesChatview, checked)
+ SettingsAdapter.setAppValue(Settings.Key.DisplayHyperlinkPreviews, checked)
MessagesAdapter.setDisplayLinks()
}
}
--
GitLab