Merge pull request #2725 from nextcloud/default-mono-icons

Make monochrome icons the default on Linux and Mac OS.
This commit is contained in:
Kevin Ottens 2020-12-16 19:03:56 +01:00 committed by GitHub
commit 0d084ee343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -896,10 +896,10 @@ void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles)
bool ConfigFile::monoIcons() const
{
QSettings settings(configFile(), QSettings::IniFormat);
bool monoDefault = false; // On Mac we want bw by default
#ifdef Q_OS_MAC
// OEM themes are not obliged to ship mono icons
monoDefault = (0 == (strcmp("ownCloud", APPLICATION_NAME)));
// On Mac and Linux we want bw by default
bool monoDefault = QByteArrayLiteral("Nextcloud") == QByteArrayLiteral(APPLICATION_NAME);
#ifdef Q_OS_WIN
monoDefault = false;
#endif
return settings.value(QLatin1String(monoIconsC), monoDefault).toBool();
}