Revert "Make monochrome icons the default on Linux and Mac OS."

This reverts commit 016410dbaa.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
This commit is contained in:
Kevin Ottens 2021-01-20 15:16:13 +01:00 committed by Kevin Ottens (Rebase PR Action)
parent fdaf04e4e5
commit 96b2b2a509

View file

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