feature: new settings UI

src/3rdparty/kmessagewidget/kmessagewidget.cpp

@@ -496,4 +496,3 @@ void KMessageWidget::setIcon(const QIcon &icon)
 }
 
 #include "moc_kmessagewidget.cpp"
-

src/3rdparty/kmessagewidget/kmessagewidget.h

@@ -8,7 +8,7 @@
 #ifndef KMESSAGEWIDGET_H
 #define KMESSAGEWIDGET_H
 
 #include <QFrame>
 
 class KMessageWidgetPrivate;
 
@@ -153,6 +153,7 @@
      */
     [[nodiscard]] MessageType messageType() const;
 
+
     /**
      * Add @p action to the message widget.
      * For each action a button is added to the message widget in the
@@ -171,6 +172,7 @@
      */
     void removeAction(QAction *action);
 
+
     /**
      * Returns the preferred size of the message widget.
      */

src/gui/accountsettings.h

@@ -1,3 +1,3 @@
 /*
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2014 ownCloud GmbH
@@ -7,7 +7,7 @@
 #ifndef ACCOUNTSETTINGS_H
 #define ACCOUNTSETTINGS_H
 
 #include <QWidget>
 #include <QUrl>
 #include <QPointer>
 #include <QHash>
@@ -27,6 +27,8 @@
 class QNetworkReply;
 class QListWidgetItem;
 class QLabel;
+class QPushButton;
+class QIcon;
 
 namespace OCC {
 
@@ -52,7 +54,13 @@
 public:
     explicit AccountSettings(AccountState *accountState, QWidget *parent = nullptr);
     ~AccountSettings() override;
-    [[nodiscard]] QSize sizeHint() const override { return ownCloudGui::settingsDialogSize(); }
+    [[nodiscard]] QSize sizeHint() const override
+    {
+        return {
+            ownCloudGui::settingsDialogSize().width(),
+            QWidget::sizeHint().height()
+        };
+    }
     bool canEncryptOrDecrypt(const FolderStatusModel::SubFolderInfo* folderInfo);
     [[nodiscard]] OCC::AccountState *accountsState() const { return _accountState; }
 
@@ -132,6 +140,8 @@
     QAction *addActionToEncryptionMessage(const QString &actionTitle, const QString &actionId);
 
     void setupE2eEncryptionMessage();
+    void setEncryptionMessageIcon(const QIcon &icon);
+    void updateEncryptionMessageActions();
 
     /// Returns the alias of the selected folder, empty string if none
     [[nodiscard]] QString selectedFolderAlias() const;
@@ -149,6 +159,9 @@
     bool _menuShown = false;
 
     QHash<QString, QMetaObject::Connection> _folderConnections;
+    QHash<QAction *, QPushButton *> _encryptionMessageButtons;
+
+    QString _spaceUsageText;
 };
 
 } // namespace OCC