[stable-4.0] [master] 2003-Main_Settings_Dialog

src/gui/CMakeLists.txt

@@ -23,6 +23,9 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
 set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
 
+#NMC customization: needed to find the ui file in a different location than the header file
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_SOURCE_DIR}/src/gui")
+
 set(client_UI_SRCS
     accountsettings.ui
     conflictdialog.ui
@@ -260,6 +263,10 @@ set(client_SRCS
     wizard/wizardproxysettingsdialog.cpp
     )
 
+file(GLOB NMC_FILES "nmcgui/*")
+set(NMC_SRCS ${NMC_FILES})
+list(APPEND client_SRCS ${NMC_SRCS})
+
 if (NOT DISABLE_ACCOUNT_MIGRATION)
     list(APPEND client_SRCS
         legacyaccountselectiondialog.h

src/gui/nmcgui/nmcsettingsdialog.cpp

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "nmcsettingsdialog.h"
+#include <QBoxLayout>
+#include <QLabel>
+#include <QToolBar>
+#include "settingsdialog.h"
+
+namespace OCC {
+
+NMCSettingsDialog::NMCSettingsDialog(ownCloudGui *gui, QWidget *parent)
+    : SettingsDialog(gui, parent)
+{
+    setLayout();
+
+    // The window has no background widget, use palette
+    // QPalette palette;
+    // palette.setColor(QPalette::Window, QColor("#F3f3f3"));
+    // setPalette(palette);
+
+    setFixedSize(760,760);
+
+    getToolBar()->setFixedHeight(92); // 76px button height + 8 + 8 margin top and bottom
+    getToolBar()->setContentsMargins(8, 0, 8, 0); // Left margin not accepted, Qt bug?
+}
+
+void NMCSettingsDialog::slotAccountAvatarChanged()
+{
+    //Intercept the base class slot, so the round avatar is not set. (dont pass to base class)
+    //Fix Account button size, for ech new created account
+    fixAccountButton();
+}
+
+void OCC::NMCSettingsDialog::setLayout() const
+{
+    //Fix network and general settings button size
+    const auto actions = getToolBar()->actions();
+    for(auto *action : actions)
+    {
+        if((action->text() == QCoreApplication::translate("OCC::SettingsDialog","General") || action->text() == QCoreApplication::tr("General")) ||
+            (action->text() == QCoreApplication::translate("OCC::SettingsDialog","Network") || action->text() == QCoreApplication::tr("Network")) ||
+            (action->text() == QCoreApplication::translate("OCC::SettingsDialog","Account") || action->text() == QCoreApplication::tr("Account")))
+        {
+            auto *widget = getToolBar()->widgetForAction(action);
+            if(widget)
+            {
+                widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+                widget->setFixedSize(76, 76);
+            }
+        }
+    }
+
+    //Fix initial account button size and stylesheet
+    fixAccountButton();
+}
+
+void NMCSettingsDialog::fixAccountButton() const
+{
+    auto toolbar = getToolBar();
+
+    // Sicher prüfen, ob ein Spacer schon existiert
+    auto *firstAction = toolbar->actions().at(0);
+    auto *firstWidget = toolbar->widgetForAction(firstAction);
+    if (!firstWidget || !firstWidget->objectName().startsWith("spacer_left")) {
+        auto *spacer = new QWidget(toolbar);
+        spacer->setFixedWidth(16);
+        spacer->setObjectName("spacer_left");
+        spacer->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+        toolbar->insertWidget(firstAction, spacer);
+    }
+
+    // Account-Button anpassen
+    if (toolbar->actions().size() > 1) {
+        auto action = toolbar->actions().at(1); // Index 1, da davor Spacer
+        auto *widget = toolbar->widgetForAction(action);
+        if(widget)
+        {
+            widget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+            widget->setFixedSize(152, 76);
+        }
+    }
+}
+
+} // namespace OCC

src/gui/nmcgui/nmcsettingsdialog.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) by Eugen Fischer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef MIRALL_SETTINGSDIALOGMAGENTA_H
+#define MIRALL_SETTINGSDIALOGMAGENTA_H
+
+#include <settingsdialog.h>
+
+namespace OCC {
+
+/**
+ * @brief The NMCSettingsDialog class
+ *
+ * This class represents the settings dialog specific to the Magenta theme.
+ * It inherits from SettingsDialog and provides additional functionalities
+ * or customizations related to the Magenta theme.
+ *
+ * @ingroup gui
+ */
+class NMCSettingsDialog : public SettingsDialog
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Constructor for NMCSettingsDialog
+     *
+     * @param gui Pointer to the ownCloudGui instance.
+     * @param parent Pointer to the parent QWidget (default is nullptr).
+     */
+    explicit NMCSettingsDialog(ownCloudGui *gui, QWidget *parent = nullptr);
+
+    /**
+     * @brief Destructor for NMCSettingsDialog
+     */
+    ~NMCSettingsDialog() = default;
+
+public slots:
+    /**
+     * @brief Slot for handling changes in the account avatar
+     */
+    void slotAccountAvatarChanged();
+
+    // NMCGuiInterface interface
+protected:
+    /**
+     * @brief Sets the layout for the NMCSettingsDialog
+     */
+    void setLayout() const;
+
+private:
+    /**
+     * @brief Fixes the appearance of the account button
+     */
+    void fixAccountButton() const;
+};
+
+} // namespace OCC
+#endif // MIRALL_SETTINGSDIALOGMAGENTA_H

src/gui/owncloudgui.cpp

@@ -21,6 +21,7 @@
 #include "owncloudsetupwizard.h"
 #include "progressdispatcher.h"
 #include "settingsdialog.h"
+#include "nmcgui/nmcsettingsdialog.h"
 #include "theme.h"
 #include "wheelhandler.h"
 #include "syncconflictsmodel.h"
@@ -611,7 +612,7 @@ void ownCloudGui::slotShowGuiMessage(const QString &title, const QString &messag
 void ownCloudGui::slotShowSettings()
 {
     if (_settingsDialog.isNull()) {
-        _settingsDialog = new SettingsDialog(this);
+        _settingsDialog = new NMCSettingsDialog(this);
         _settingsDialog->setAttribute(Qt::WA_DeleteOnClose, true);
 
 #ifdef Q_OS_MACOS

src/gui/settingsdialog.cpp

@@ -6,6 +6,7 @@
 
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
+#include "QtWidgets/qmainwindow.h"
 
 #include "folderman.h"
 #include "theme.h"
@@ -37,10 +38,13 @@
 namespace {
 const QString TOOLBAR_CSS()
 {
-    return QStringLiteral("QToolBar { background: %1; margin: 0; padding: 0; border: none; border-bottom: 1px solid %2; spacing: 0; } "
-                          "QToolBar QToolButton { background: %1; border: none; border-bottom: 1px solid %2; margin: 0; padding: 5px; } "
-                          "QToolBar QToolBarExtension { padding:0; } "
-                          "QToolBar QToolButton:checked { background: %3; color: %4; }");
+    return QStringLiteral(
+        "QToolBar { background: %1; margin: 0; padding: 0; border: none; spacing: 0; } "
+        "QToolBar QToolButton { background: %1; border: none; border-radius: 4px; margin: 0; padding: 6px; } "
+        "QToolBar QToolBarExtension { padding: 0; } "
+        "QToolBar QToolButton:hover { background: %2; } "
+        "QToolBar QToolButton:checked { background: %3; }"
+    );
 }
 
 const float buttonSizeRatio = 1.618f; // golden ratio
@@ -64,7 +68,7 @@ QString shortDisplayNameForSettings(OCC::Account *account, int width)
         host = fm.elidedText(host, Qt::ElideMiddle, width);
         user = fm.elidedText(user, Qt::ElideRight, width);
     }
-    return QStringLiteral("%1\n%2").arg(user, host);
+    return QStringLiteral("%1").arg(user);
 }
 }
 
@@ -117,6 +121,12 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
     auto *generalSettings = new GeneralSettings;
     _ui->stack->addWidget(generalSettings);
 
+    // Adds space between general and network actions
+    auto *spacer2 = new QWidget();
+    spacer2->setFixedWidth(8);
+    spacer2->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    _toolBar->addWidget(spacer2);
+
     // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
     connect(this, &SettingsDialog::styleChanged, generalSettings, &GeneralSettings::slotStyleChanged);
 
@@ -230,7 +240,7 @@ void SettingsDialog::accountAdded(AccountState *s)
     const auto accountAction = createColorAwareAction(QLatin1String(":/client/theme/account.svg"), actionText);
 
     if (!brandingSingleAccount) {
-        accountAction->setToolTip(s->account()->displayName());
+        accountAction->setToolTip(shortDisplayNameForSettings(s->account().data(), static_cast<int>(height * buttonSizeRatio)));
         accountAction->setIconText(shortDisplayNameForSettings(s->account().data(), static_cast<int>(height * buttonSizeRatio)));
     }
 
@@ -289,6 +299,7 @@ void SettingsDialog::slotAccountDisplayNameChanged()
             QString displayName = account->displayName();
             action->setText(displayName);
             auto height = _toolBar->sizeHint().height();
+            action->setToolTip(shortDisplayNameForSettings(account, static_cast<int>(height * buttonSizeRatio)));
             action->setIconText(shortDisplayNameForSettings(account, static_cast<int>(height * buttonSizeRatio)));
         }
     }
@@ -329,20 +340,11 @@ void SettingsDialog::accountRemoved(AccountState *s)
 
 void SettingsDialog::customizeStyle()
 {
-    QString highlightColor(palette().highlight().color().name());
-    QString highlightTextColor(palette().highlightedText().color().name());
-    QString dark(palette().dark().color().name());
     QString background(palette().base().color().name());
-    _toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, dark, highlightColor, highlightTextColor));
-
-    const auto &allActions = _actionGroup->actions();
-    for (const auto a : allActions) {
-        QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette());
-        a->setIcon(icon);
-        auto *btn = qobject_cast<QToolButton *>(_toolBar->widgetForAction(a));
-        if (btn)
-            btn->setIcon(icon);
-    }
+    QString highlightColor(palette().highlight().color().name());
+    QString midlightColor(palette().mid().color().name());
+
+    _toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, highlightColor, midlightColor));
 }
 
 class ToolButtonAction : public QWidgetAction

src/gui/settingsdialog.h

@@ -45,11 +45,16 @@ class SettingsDialog : public QDialog
 
     QWidget* currentPage();
 
+    QToolBar *getToolBar() const
+    {
+        return _toolBar;
+    }
+
 public slots:
     void showFirstPage();
     void showIssuesList(OCC::AccountState *account);
     void slotSwitchPage(QAction *action);
-    void slotAccountAvatarChanged();
+    virtual void slotAccountAvatarChanged();
     void slotAccountDisplayNameChanged();
 
 signals:
@@ -66,9 +71,10 @@ private slots:
     void accountAdded(OCC::AccountState *);
     void accountRemoved(OCC::AccountState *);
 
-private:
+protected:
     void customizeStyle();
 
+private:
     QAction *createColorAwareAction(const QString &iconName, const QString &fileName);
     QAction *createActionWithIcon(const QIcon &icon, const QString &text, const QString &iconPath = QString());