From: Camila Date: Tue, 15 Dec 2020 20:07:51 +0000 (+0100) Subject: Make monochrome icons the default on Linux and Mac OS. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~466^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=016410dbaad9cfa85209d6424dc2df9362a80a17;p=nextcloud-desktop.git Make monochrome icons the default on Linux and Mac OS. Unless it is branded with other icons. Signed-off-by: Camila --- diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index bc4ab69b4..be877e712 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -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(); }