From 71e0aa75721888404702b106eb71f43194cd2693 Mon Sep 17 00:00:00 2001 From: alex-z Date: Fri, 20 Oct 2023 19:11:31 +0200 Subject: [PATCH] Fix review comments, Signed-off-by: alex-z --- src/gui/generalsettings.cpp | 7 +++++-- src/libsync/theme.cpp | 12 ++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 4e5d55dd40ae1..114aab7cd9dd8 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -519,8 +519,11 @@ void GeneralSettings::slotStyleChanged() void GeneralSettings::customizeStyle() { // setup about section - auto aboutText = Theme::instance()->about(); - Theme::replaceLinkColorStringBackgroundAware(aboutText); + const auto aboutText = []() { + auto aboutText = Theme::instance()->about(); + Theme::replaceLinkColorStringBackgroundAware(aboutText); + return aboutText; + }(); _ui->infoAndUpdatesLabel->setText(aboutText); #if defined(BUILD_UPDATER) diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index c7c3322c36354..46060c5b7f81b 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -549,13 +549,10 @@ QString Theme::aboutInfo() const QStringList osStringList = Utility::platformName().split(QLatin1Char(' ')); QString osName = osStringList.at(0); - QString devString; //: Example text: "

Nextcloud Desktop Client

" (%1 is the application name) - devString = tr("

%1 Desktop Client

").arg(APPLICATION_NAME); - - devString += tr("

Version %1. For more information please click here.

") - .arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)) + QString(" (%1)").arg(osName)) - .arg(helpUrl()); + auto devString = QString(tr("

%1 Desktop Client

Version %1. For more information please click here.

") + QStringLiteral(" (%3)")) + .arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)), helpUrl(), osName); + devString += tr("

Using virtual files plugin: %1

").arg(Vfs::modeToString(bestAvailableVfsMode())); devString += QStringLiteral("
%1").arg(QSysInfo::productType() % QLatin1Char('-') % QSysInfo::kernelVersion()); @@ -569,9 +566,8 @@ QString Theme::about() const QStringList osStringList = Utility::platformName().split(QLatin1Char(' ')); QString osName = osStringList.at(0); - QString devString; //: Example text: "

Nextcloud Desktop Client

" (%1 is the application name) - devString = tr("

%1 desktop client %2

").arg(APPLICATION_NAME).arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION))); + const auto devString = tr("

%1 desktop client %2

").arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION))); return devString; }