Skip to content

Commit

Permalink
Fix review comments,
Browse files Browse the repository at this point in the history
Signed-off-by: alex-z <[email protected]>
  • Loading branch information
allexzander committed Oct 20, 2023
1 parent 8d7a2f8 commit 71e0aa7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
7 changes: 5 additions & 2 deletions src/gui/generalsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 4 additions & 8 deletions src/libsync/theme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,10 @@ QString Theme::aboutInfo() const
QStringList osStringList = Utility::platformName().split(QLatin1Char(' '));
QString osName = osStringList.at(0);

QString devString;
//: Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)
devString = tr("<p>%1 Desktop Client</p>").arg(APPLICATION_NAME);

devString += tr("<p>Version %1. For more information please click <a href='%2'>here</a>.</p>")
.arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)) + QString(" (%1)").arg(osName))
.arg(helpUrl());
auto devString = QString(tr("<p>%1 Desktop Client</p><p>Version %1. For more information please click <a href='%2'>here</a>.</p>") + QStringLiteral(" (%3)"))
.arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)), helpUrl(), osName);


devString += tr("<p><small>Using virtual files plugin: %1</small></p>").arg(Vfs::modeToString(bestAvailableVfsMode()));
devString += QStringLiteral("<br>%1").arg(QSysInfo::productType() % QLatin1Char('-') % QSysInfo::kernelVersion());
Expand All @@ -569,9 +566,8 @@ QString Theme::about() const
QStringList osStringList = Utility::platformName().split(QLatin1Char(' '));
QString osName = osStringList.at(0);

QString devString;
//: Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)
devString = tr("<p>%1 desktop client %2</p>").arg(APPLICATION_NAME).arg(QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)));
const auto devString = tr("<p>%1 desktop client %2</p>").arg(APPLICATION_NAME, QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION)));

return devString;
}
Expand Down

0 comments on commit 71e0aa7

Please sign in to comment.