[stable-34.0] [master] 2003-Main_Settings_Dialog

src/gui/CMakeLists.txt

@@ -33,6 +33,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
     advancedsettings.ui
     accountsettings.ui
@@ -248,6 +251,10 @@ set(client_SRCS
     integration/fileactionsmodel.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,49 @@
+/*
+ * 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)
+{
+    fixAccountButton();
+}
+
+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 NMCSettingsDialog::fixAccountButton() const
+{
+    auto *toolbar = getToolBar();
+    if (!toolbar) {
+        return;
+    }
+
+    const auto actions = toolbar->actions();
+    if (actions.isEmpty()) {
+        return;
+    }
+}
+
+} // namespace OCC

src/gui/nmcgui/nmcsettingsdialog.h

@@ -0,0 +1,65 @@
+/*
+ * 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
+
+private:
+    /**
+     * @brief Fixes the appearance of the account button
+     */
+    void fixAccountButton() const;
+};
+
+} // namespace OCC
+#endif // MIRALL_SETTINGSDIALOGMAGENTA_H

src/gui/owncloudgui.cpp

@@ -22,6 +22,7 @@
 #include "owncloudsetupwizard.h"
 #include "progressdispatcher.h"
 #include "settingsdialog.h"
+#include "nmcgui/nmcsettingsdialog.h"
 #include "theme.h"
 #include "wheelhandler.h"
 #include "syncconflictsmodel.h"
@@ -650,7 +651,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

@@ -105,14 +105,14 @@ class CurrentPageSizeStackedWidget : public QStackedWidget
 
 constexpr auto TOOLBAR_CSS = QLatin1String(
     "QToolBar { background: transparent; margin: 0; padding: 0; border: none; spacing: 0; } "
-    "QToolBar QToolButton { background: transparent; border: none; margin: 0; padding: 8px 12px; font-size: 14px; border-radius: 8px; } "
+    "QToolBar QToolButton { background: transparent; border: none; margin: 0 0 8px; padding: 8px 12px; font-size: 14px; border-radius: 8px; } "
     "QToolBar QToolBarExtension { padding: 0; } "
     "QToolBar QToolButton:checked { background: palette(highlight); color: palette(highlighted-text); }"
 );
 
 const float buttonSizeRatio = 1.618f; // golden ratio
-constexpr auto settingsDialogDefaultWidth = 950;
-constexpr auto settingsDialogDefaultHeight = 500;
+constexpr auto settingsDialogDefaultWidth = 1024;
+constexpr auto settingsDialogDefaultHeight = 640;
 const auto settingsNavigationIconTextSpacing = QLatin1String("  ");
 
 /** display name with two lines that is displayed in the settings
@@ -133,7 +133,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);
 }
 }
 
@@ -344,7 +344,7 @@ void SettingsDialog::accountAdded(AccountState *s)
     if (_firstNonAccountAction) {
         _toolBar->insertAction(_firstNonAccountAction, accountAction);
     } else {
-        _toolBar->addAction(accountAction);
+        _toolBar->insertAction(_toolBar->actions().at(0), accountAction);
     }
     auto accountSettings = new AccountSettings(s, this);
     QString objectName = QLatin1String("accountSettings_");
@@ -412,6 +412,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)));
         }
     }
@@ -644,7 +645,7 @@ void SettingsDialog::setupUi()
     setLayout(mainLayout);
 
     _toolBar = new QToolBar;
-    _toolBar->setIconSize(QSize(32, 32));
+    _toolBar->setIconSize(QSize(24, 24));
     _toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     _toolBar->setOrientation(Qt::Vertical);
     _toolBar->setMovable(false);

src/gui/settingsdialog.h

@@ -43,13 +43,18 @@ class SettingsDialog : public QDialog
 
     QWidget* currentPage();
 
+    QToolBar *getToolBar() const
+    {
+        return _toolBar;
+    }
+
 public slots:
     void showFirstPage();
     void showAccount(OCC::AccountState *account);
     void setInitialAccount(OCC::AccountState *account);
     void showIssuesList(OCC::AccountState *account);
     void slotSwitchPage(QAction *action);
-    void slotAccountAvatarChanged();
+    virtual void slotAccountAvatarChanged();
     void slotAccountDisplayNameChanged();
 
 signals:
@@ -67,12 +72,13 @@ private slots:
     void accountAdded(OCC::AccountState *);
     void accountRemoved(OCC::AccountState *);
 
-private:
+protected:
     void customizeStyle();
     void requestStyleUpdate();
     void updateAccountAvatar(const Account *account);
     void addSettingsPage(const QString &iconPath, const QString &title, QWidget *settingsPage, bool updateChannelAware = false);
 
+private:
     QAction *createColorAwareAction(const QString &iconName, const QString &fileName);
     QAction *createActionWithIcon(const QIcon &icon, const QString &text, const QString &iconPath = QString());