fix(gui/settings): use different palette colour for backgrounds

src/gui/accountsettings.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -60,6 +60,14 @@
 
 using namespace Qt::StringLiterals;
 
+#ifdef Q_OS_WIN
+    // "light" looks too bright on dark mode on Windows only
+    #define BACKGROUND_PALETTE "alternate-base"
+#else
+    // ...and "alternate-base" looks too bright on macOS only.  On Linux/Plasma either one looked fine ...
+    #define BACKGROUND_PALETTE "light"
+#endif
+
 #ifdef BUILD_FILE_PROVIDER_MODULE
 #include "macOS/fileprovider.h"
 #endif
@@ -79,7 +87,7 @@
 constexpr auto e2EeUiActionSetupEncryptionId = "setup_encryption";
 constexpr auto e2EeUiActionForgetEncryptionId = "forget_encryption";
 constexpr auto e2EeUiActionDisplayMnemonicId = "display_mnemonic";
 constexpr auto e2EeUiActionMigrateCertificateId = "migrate_certificate";
 }
 
 namespace OCC {
@@ -171,7 +179,7 @@
 AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
     : QWidget(parent)
     , _ui(new Ui::AccountSettings)
     , _model(new FolderStatusModel)
     , _accountState(accountState)
     , _userInfo(accountState, false, true)
 {
@@ -182,7 +190,7 @@
     const auto delegate = new FolderStatusDelegate;
     delegate->setParent(this);
 
-    setStyleSheet("QWidget#syncFoldersPanelContents, QWidget#connectionSettingsPanelContents, QWidget#fileProviderPanelContents { background: palette(alternate-base); }"_L1);
+    setStyleSheet("QWidget#syncFoldersPanelContents, QWidget#connectionSettingsPanelContents, QWidget#fileProviderPanelContents { background: palette(" BACKGROUND_PALETTE "); }"_L1);
     _ui->syncFoldersPanelContents->setAutoFillBackground(true);
     _ui->syncFoldersPanelContents->setAttribute(Qt::WA_StyledBackground, true);
     _ui->syncFoldersPanelContents->setContentsMargins(0, 0, 0, 0);
@@ -199,7 +207,7 @@
     _ui->_folderList->header()->hide();
     _ui->_folderList->setAutoFillBackground(true);
     _ui->_folderList->setAttribute(Qt::WA_StyledBackground, true);
-    _ui->_folderList->setStyleSheet(QStringLiteral("QTreeView { background: palette(alternate-base); }"));
+    _ui->_folderList->setStyleSheet(QStringLiteral("QTreeView { background: palette(" BACKGROUND_PALETTE "); }"));
     _ui->_folderList->setItemDelegate(delegate);
     _ui->_folderList->setModel(_model);
     _ui->_folderList->setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
@@ -228,8 +236,8 @@
 #endif
 
     const auto connectionSettingsPanelContents = _ui->connectionSettingsPanelContents;
     const auto connectionSettingsLayout = new QVBoxLayout(connectionSettingsPanelContents);
     const auto networkSettings = new NetworkSettings(_accountState->account(), connectionSettingsPanelContents);
     if (const auto networkSettingsLayout = networkSettings->layout()) {
         networkSettingsLayout->setContentsMargins(0, 0, 0, 0);
     }
@@ -475,8 +483,8 @@
     Q_ASSERT(folder);
 
     const auto folderAlias = folder->alias();
     const auto path = folderInfo->_path;
     const auto fileId = folderInfo->_fileId;
     const auto encryptFolder = [this, fileId, path, folderAlias] {
         const auto folder = FolderMan::instance()->folder(folderAlias);
         if (!folder) {
@@ -489,7 +497,7 @@
         Q_ASSERT(!path.startsWith('/') && path.endsWith('/'));
         // But EncryptFolderJob expects directory path Foo/Bar convention
         const auto choppedPath = path.chopped(1);
         auto job = new OCC::EncryptFolderJob(accountsState()->account(), folder->journalDb(), choppedPath, choppedPath, folder->remotePath(), fileId);
         job->setParent(this);
         job->setProperty(propertyFolder, QVariant::fromValue(folder));
         job->setProperty(propertyPath, QVariant::fromValue(path));
@@ -746,7 +754,7 @@
     if (const auto mode = bestAvailableVfsMode();
         !Theme::instance()->disableVirtualFilesSyncFolder() &&
         Theme::instance()->showVirtualFilesOption() && !folder->virtualFilesEnabled() && Vfs::checkAvailability(folder->path(), mode)) {
         if (mode == Vfs::WindowsCfApi || ConfigFile().showExperimentalOptions()) {
             ac = menu->addAction(tr("Enable virtual file support %1 …").arg(mode == Vfs::WindowsCfApi ? QString() : tr("(experimental)")));
             // TODO: remove when UX decision is made
             ac->setEnabled(!Utility::isPathWindowsDrivePartitionRoot(folder->path()));
@@ -1212,7 +1220,7 @@
     widget.exec();
 }
 
 void AccountSettings::forgetEncryptionOnDeviceForAccount(const AccountPtr &account) const
 {
     QMessageBox dialog;
     dialog.setWindowTitle(tr("Forget the end-to-end encryption on this device"));
@@ -1378,7 +1386,7 @@
     slotAccountStateChanged();
 }
 
 void AccountSettings::slotAccountStateChanged()
 {
     const auto state = _accountState ? _accountState->state() : AccountState::Disconnected;
     if (state != AccountState::Disconnected) {
@@ -1629,7 +1637,7 @@
     }
 }
 
 void AccountSettings::slotE2eEncryptionCertificateNeedMigration()
 {
     const auto actionMigrateCertificate = addActionToEncryptionMessage(tr("Migrate certificate to a new one"), e2EeUiActionMigrateCertificateId);
     connect(actionMigrateCertificate, &QAction::triggered, this, [this] {
@@ -1816,9 +1824,9 @@
 
 void AccountSettings::removeActionFromEncryptionMessage(const QString &actionId)
 {
     const auto foundEnableEncryptionActionIt = std::find_if(std::cbegin(_ui->encryptionMessage->actions()), std::cend(_ui->encryptionMessage->actions()), [&actionId](const QAction *action) {
         return action->property(e2eUiActionIdKey).toString() == actionId;
     });
     if (foundEnableEncryptionActionIt != std::cend(_ui->encryptionMessage->actions())) {
         _ui->encryptionMessage->removeAction(*foundEnableEncryptionActionIt);
         (*foundEnableEncryptionActionIt)->deleteLater();
@@ -1855,7 +1863,7 @@
     setEncryptionMessageIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/info.svg")));
     _ui->encryptionMessage->hide();
 
     auto *const actionSetupE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionSetupEncryptionId);
     connect(actionSetupE2e, &QAction::triggered, this, &AccountSettings::slotE2eEncryptionGenerateKeys);
 }
 
@@ -1881,7 +1889,7 @@
     _encryptionMessageButtons.clear();
 
     const auto actions = _ui->encryptionMessage->actions();
     auto *layout = _ui->encryptionMessageButtonsLayout;
     int stretchIndex = -1;
     for (int i = 0; i < layout->count(); ++i) {
         if (layout->itemAt(i)->spacerItem()) {
@@ -1894,8 +1902,8 @@
         stretchIndex = layout->count() - 1;
     }
 
     for (QAction *action : actions) {
         auto *button = new QPushButton(_ui->encryptionMessage);
         button->setText(action->text());
         button->setIcon(action->icon());
         button->setEnabled(action->isEnabled());

src/gui/macOS/ui/FileProviderSettings.qml

@@ -23,7 +23,7 @@ Page {
     title: qsTr("Virtual files settings")
 
     background: Rectangle {
-        color: palette.alternateBase
+        color: palette.light
         border.width: root.showBorder ? Style.normalBorderWidth : 0
         border.color: palette.mid
     }

src/gui/networksettings.cpp

@@ -21,6 +21,15 @@
 #include <QPalette>
 #include <type_traits>
 
+constexpr auto BACKGROUND_ROLE =
+#ifdef Q_OS_WIN
+    // "light" looks too bright on dark mode on Windows only
+    QPalette::AlternateBase;
+#else
+    // ...and "alternate-base" looks too bright on macOS only.  On Linux/Plasma either one looked fine ...
+    QPalette::Light;
+#endif
+
 namespace OCC {
 
 NetworkSettings::NetworkSettings(const AccountPtr &account, QWidget *parent)
@@ -30,19 +39,19 @@
 {
     _ui->setupUi(this);
     setAutoFillBackground(true);
-    setBackgroundRole(QPalette::AlternateBase);
+    setBackgroundRole(BACKGROUND_ROLE);
     _ui->proxyGroupBox->setAutoFillBackground(true);
-    _ui->proxyGroupBox->setBackgroundRole(QPalette::AlternateBase);
+    _ui->proxyGroupBox->setBackgroundRole(BACKGROUND_ROLE);
     _ui->downloadBox->setAutoFillBackground(true);
-    _ui->downloadBox->setBackgroundRole(QPalette::AlternateBase);
+    _ui->downloadBox->setBackgroundRole(BACKGROUND_ROLE);
     _ui->uploadBox->setAutoFillBackground(true);
-    _ui->uploadBox->setBackgroundRole(QPalette::AlternateBase);
+    _ui->uploadBox->setBackgroundRole(BACKGROUND_ROLE);
 
     _ui->manualSettings->setVisible(_ui->manualProxyRadioButton->isChecked());
 
     _ui->proxyGroupBox->setVisible(!Theme::instance()->doNotUseProxy());
 
     if (!Theme::instance()->doNotUseProxy()) {
         _ui->hostLineEdit->setPlaceholderText(tr("Hostname of proxy server"));
         _ui->userLineEdit->setPlaceholderText(tr("Username for proxy server"));
         _ui->passwordLineEdit->setPlaceholderText(tr("Password for proxy server"));
@@ -195,7 +204,7 @@
     if (_account) { // We must be setting up network proxy for a specific account
         _account->setProxySettings(proxyType, host, port, needsAuth, user, password);
         const auto accountState = AccountManager::instance()->accountFromUserId(_account->userIdAtHostWithPort());
         if (accountState) {
             accountState->freshConnectionAttempt();
         }
         AccountManager::instance()->saveAccount(_account);

src/gui/settingsdialog.cpp

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2013 ownCloud GmbH
@@ -42,6 +42,14 @@
 
 using namespace Qt::StringLiterals;
 
+#ifdef Q_OS_WIN
+    // "light" looks too bright on dark mode on Windows only
+    #define BACKGROUND_PALETTE "alternate-base"
+#else
+    // ...and "alternate-base" looks too bright on macOS only.  On Linux/Plasma either one looked fine ...
+    #define BACKGROUND_PALETTE "light"
+#endif
+
 namespace {
 class CurrentPageSizeStackedWidget : public QStackedWidget
 {
@@ -50,7 +58,7 @@
 
     [[nodiscard]] QSize sizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->sizeHint();
         }
         return QStackedWidget::sizeHint();
@@ -58,7 +66,7 @@
 
     [[nodiscard]] QSize minimumSizeHint() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->minimumSizeHint();
         }
         return QStackedWidget::minimumSizeHint();
@@ -66,15 +74,15 @@
 
     [[nodiscard]] bool hasHeightForWidth() const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->hasHeightForWidth();
         }
         return QStackedWidget::hasHeightForWidth();
     }
 
     [[nodiscard]] int heightForWidth(int width) const override
     {
         if (const auto *widget = currentWidget()) {
             return widget->hasHeightForWidth() ? widget->heightForWidth(width) : widget->sizeHint().height();
         }
         return QStackedWidget::heightForWidth(width);
@@ -89,7 +97,7 @@
     "QToolBar QToolButton:checked { background: palette(highlight); color: palette(highlighted-text); }"
 );
 
 const float buttonSizeRatio = 1.618f; // golden ratio
 
 
 /** display name with two lines that is displayed in the settings
@@ -123,10 +131,10 @@
     using QWidget::QWidget;
 
 protected:
     void mousePressEvent(QMouseEvent *event) override
     {
         if (event->button() == Qt::LeftButton) {
             if (const auto *window = this->window(); window && window->windowHandle()) {
                 window->windowHandle()->startSystemMove();
                 event->accept();
                 return;
@@ -174,7 +182,7 @@
     QAction *generalAction = createColorAwareAction(QLatin1String(":/client/theme/settings.svg"), tr("General"));
     _actionGroup->addAction(generalAction);
     _toolBar->addAction(generalAction);
     auto *accountSpacer = new QWidget(this);
     accountSpacer->setFixedHeight(16);
     _toolBar->addWidget(accountSpacer);
     _toolBar->addSeparator();
@@ -219,7 +227,7 @@
     cfg.restoreGeometry(this);
 }
 
 SettingsDialog::~SettingsDialog()
 {
 }
 
@@ -229,7 +237,7 @@
 }
 
 // close event is not being called here
 void SettingsDialog::resizeEvent(QResizeEvent *event)
 {
     QDialog::resizeEvent(event);
 
@@ -281,7 +289,7 @@
 {
     _stack->setCurrentWidget(_actionGroupWidgets.value(action));
     _stack->updateGeometry();
     if (auto *contentContainer = _stack->parentWidget()) {
         contentContainer->updateGeometry();
     }
 }
@@ -350,14 +358,14 @@
 
 void SettingsDialog::slotAccountAvatarChanged()
 {
     auto *account = dynamic_cast<Account *>(sender());
     if (!account) {
         return;
     }
     updateAccountAvatar(account);
 }
 
 void SettingsDialog::updateAccountAvatar(const Account *account)
 {
     if (!account || !_actionForAccount.contains(account)) {
         return;
@@ -427,22 +435,22 @@
         return;
     }
 
     const QScopedValueRollback<bool> updatingStyle(_updatingStyle, true);
     _toolBar->setStyleSheet(TOOLBAR_CSS);
 
     setStyleSheet(QStringLiteral(
         "#Settings { background: palette(window); border-radius: 0; }"
 
         /* Navigation */
-        "#settings_navigation, #settings_navigation_scroll { background: palette(alternate-base); border-radius: 12px; padding: 4px; }"
+        "#settings_navigation, #settings_navigation_scroll { background: palette(" BACKGROUND_PALETTE "); border-radius: 12px; padding: 4px; }"
 
         /* Content area */
         "#settings_content, #settings_content_scroll { background: palette(window); border-radius: 12px; }"
 
         /* Panels */
         "#generalGroupBox, #advancedGroupBox, #aboutAndUpdatesGroupBox,"
         "#accountStatusPanel, #connectionSettingsPanel, #fileProviderPanel, #syncFoldersPanel {"
-        " background: palette(alternate-base);"
+        " background: palette(" BACKGROUND_PALETTE ");"
         " border-radius: 10px;"
         " margin: 0px;"
         " padding: 6px;"
@@ -515,7 +523,7 @@
     setWindowTitle(tr("Settings"));
     setGeometry(0, 0, 950, 500);
 
     auto *mainLayout = new QHBoxLayout(this);
     mainLayout->setContentsMargins(12, 12, 12, 12);
     mainLayout->setSpacing(12);
     setLayout(mainLayout);
@@ -528,17 +536,17 @@
     _toolBar->setMinimumWidth(220);
     _toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
 
     auto *navigationContainer = new QWidget(this);
     navigationContainer->setObjectName("settings_navigation"_L1);
     navigationContainer->setAttribute(Qt::WA_StyledBackground);
 
     auto *navigationLayout = new QVBoxLayout(navigationContainer);
     navigationLayout->setContentsMargins(0, 0, 0, 0);
     navigationLayout->setSpacing(0);
     navigationLayout->addWidget(_toolBar);
     navigationLayout->addStretch(1);
 
     auto *navigationScroll = new QScrollArea(this);
     navigationScroll->setObjectName("settings_navigation_scroll"_L1);
     navigationScroll->setWidgetResizable(true);
     navigationScroll->setAlignment(Qt::AlignTop | Qt::AlignLeft);
@@ -548,10 +556,10 @@
     navigationScroll->viewport()->setAutoFillBackground(false);
     navigationScroll->setWidget(navigationContainer);
 
     _stack = new CurrentPageSizeStackedWidget(this);
     _stack->setObjectName(u"settings_content"_s);
 
     auto *contentScroll = new QScrollArea(this);
     contentScroll->setObjectName("settings_content_scroll"_L1);
     contentScroll->setWidgetResizable(true);
     contentScroll->setAlignment(Qt::AlignTop | Qt::AlignLeft);