feat(UI): Updated settings dialog UI

src/gui/CMakeLists.txt

@@ -24,6 +24,7 @@ configure_file(${CMAKE_SOURCE_DIR}/theme.qrc.in ${CMAKE_SOURCE_DIR}/theme.qrc)
 set(theme_dir ${CMAKE_SOURCE_DIR}/theme)
 
 set(client_UI_SRCS
+    advancedsettings.ui
     accountsettings.ui
     conflictdialog.ui
     invalidfilenamedialog.ui
@@ -32,6 +33,7 @@ set(client_UI_SRCS
     folderwizardsourcepage.ui
     folderwizardtargetpage.ui
     generalsettings.ui
+    infosettings.ui
     legalnotice.ui
     ignorelisteditor.ui
     ignorelisttablewidget.ui
@@ -58,6 +60,8 @@ qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qr
 set(client_SRCS
     accountmanager.h
     accountmanager.cpp
+    advancedsettings.h
+    advancedsettings.cpp
     accountsettings.h
     accountsettings.cpp
     accountsetupfromcommandlinejob.h
@@ -104,6 +108,8 @@ set(client_SRCS
     folderwizard.cpp
     generalsettings.h
     generalsettings.cpp
+    infosettings.h
+    infosettings.cpp
     legalnotice.h
     legalnotice.cpp
     ignorelisteditor.h
@@ -136,6 +142,10 @@ set(client_SRCS
     selectivesyncdialog.cpp
     settingsdialog.h
     settingsdialog.cpp
+    settingspanelstyle.h
+    settingspanelstyle.cpp
+    settingsswitch.h
+    settingsswitch.cpp
     sharemanager.h
     sharemanager.cpp
     profilepagewidget.h

src/gui/accountsettings.cpp

@@ -40,6 +40,7 @@
 #include <cmath>
 
 #include <QDesktopServices>
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QDir>
 #include <QListWidgetItem>
@@ -57,6 +58,7 @@
 #include <QPushButton>
 #include <QStyle>
 #include <QFileDialog>
+#include <QFrame>
 
 using namespace Qt::StringLiterals;
 
@@ -65,7 +67,7 @@
     #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
@@ -78,7 +80,7 @@
 #include "common/macsandboxpersistentaccess.h"
 #endif
 
 #include "account.h"
 
 namespace {
 constexpr auto propertyFolder = "folder";
@@ -87,7 +89,7 @@
 constexpr auto e2EeUiActionSetupEncryptionId = "setup_encryption";
 constexpr auto e2EeUiActionForgetEncryptionId = "forget_encryption";
 constexpr auto e2EeUiActionDisplayMnemonicId = "display_mnemonic";
 constexpr auto e2EeUiActionMigrateCertificateId = "migrate_certificate";
 }
 
 namespace OCC {
@@ -179,28 +181,49 @@
 AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
     : QWidget(parent)
     , _ui(new Ui::AccountSettings)
     , _model(new FolderStatusModel)
     , _accountState(accountState)
     , _userInfo(accountState, false, true)
 {
     _ui->setupUi(this);
 
+    _encryptionPanel = new QFrame(this);
+    _encryptionPanel->setObjectName(QLatin1String("encryptionPanel"));
+    _encryptionPanel->setFrameShape(QFrame::NoFrame);
+    _encryptionPanel->setAttribute(Qt::WA_StyledBackground, true);
+    auto *encryptionPanelLayout = new QVBoxLayout(_encryptionPanel);
+    encryptionPanelLayout->setContentsMargins(0, 0, 0, 0);
+    encryptionPanelLayout->setSpacing(0);
+    _ui->accountStatusLayout->removeWidget(_ui->encryptionMessage);
+    encryptionPanelLayout->addWidget(_ui->encryptionMessage);
+
+    auto *connectionSettingsButton = new QPushButton(tr("Connection settings"), _ui->accountStatus);
+    connectionSettingsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+    _ui->gridLayout_2->addWidget(connectionSettingsButton, 0, 2, Qt::AlignRight | Qt::AlignVCenter);
+    connect(connectionSettingsButton, &QPushButton::clicked, this, &AccountSettings::showConnectionSettingsDialog);
+
+    _ui->verticalLayout_2->removeWidget(_ui->accountStatusPanel);
+    _ui->verticalLayout_2->removeWidget(_ui->fileProviderPanel);
+    _ui->verticalLayout_2->removeWidget(_ui->syncFoldersPanel);
+    _ui->verticalLayout_2->removeWidget(_ui->connectionSettingsPanel);
+    _ui->connectionSettingsPanel->hide();
+    _ui->verticalLayout_2->insertWidget(0, _ui->fileProviderPanel);
+    _ui->verticalLayout_2->insertWidget(1, _ui->syncFoldersPanel);
+    _ui->verticalLayout_2->insertWidget(2, _encryptionPanel);
+    _ui->verticalLayout_2->insertWidget(3, _ui->accountStatusPanel);
+
     _model->setAccountState(_accountState);
     _model->setParent(this);
     const auto delegate = new FolderStatusDelegate;
     delegate->setParent(this);
 
-    setStyleSheet("QWidget#syncFoldersPanelContents, QWidget#connectionSettingsPanelContents, QWidget#fileProviderPanelContents { background: palette(" BACKGROUND_PALETTE "); }"_L1);
+    setStyleSheet("QWidget#syncFoldersPanelContents, 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);
     _ui->fileProviderPanelContents->setAutoFillBackground(true);
     _ui->fileProviderPanelContents->setAttribute(Qt::WA_StyledBackground, true);
     _ui->fileProviderPanelContents->setContentsMargins(0, 0, 0, 0);
-    _ui->connectionSettingsPanelContents->setAutoFillBackground(true);
-    _ui->connectionSettingsPanelContents->setAttribute(Qt::WA_StyledBackground, true);
-    _ui->connectionSettingsPanelContents->setContentsMargins(0, 0, 0, 0);
-
     // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
     connect(this, &AccountSettings::styleChanged, delegate, &FolderStatusDelegate::slotStyleChanged);
 
@@ -241,17 +264,6 @@
     _ui->fileProviderPanel->setVisible(false);
 #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);
-    }
-    connectionSettingsLayout->setContentsMargins(0, 0, 0, 0);
-    connectionSettingsLayout->setSpacing(0);
-    connectionSettingsLayout->addWidget(networkSettings, 1);
-    connectionSettingsPanelContents->setLayout(connectionSettingsLayout);
-
     const auto mouseCursorChanger = new MouseCursorChanger(this);
     mouseCursorChanger->folderList = _ui->_folderList;
     mouseCursorChanger->model = _model;
@@ -318,6 +330,7 @@
     _ui->encryptionMessageLabel->setOpenExternalLinks(true);
     _ui->encryptionMessageButtonsLayout->addStretch();
     setEncryptionMessageIcon({});
+    setEncryptionPanelVisible(_ui->encryptionMessage->isVisible());
 
     _ui->connectLabel->setText(tr("No account configured."));
 
@@ -355,7 +368,7 @@
 
     _ui->encryptionMessageLabel->setText(tr("Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it."));
     setEncryptionMessageIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/lock.svg")));
-    _ui->encryptionMessage->show();
+    setEncryptionPanelVisible(true);
 }
 
 void AccountSettings::slotE2eEncryptionGenerateKeys()
@@ -489,7 +502,7 @@
     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);
@@ -503,7 +516,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));
@@ -1286,6 +1299,30 @@
     _ui->accountStatus->setVisible(!message.isEmpty());
 }
 
+void AccountSettings::showConnectionSettingsDialog()
+{
+    auto *dialog = new QDialog(this);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    dialog->setWindowTitle(tr("Connection settings"));
+
+    auto *layout = new QVBoxLayout(dialog);
+    layout->setContentsMargins(12, 12, 12, 12);
+    layout->setSpacing(12);
+
+    auto *networkSettings = new NetworkSettings(_accountState->account(), dialog);
+    if (auto *networkSettingsLayout = networkSettings->layout()) {
+        networkSettingsLayout->setContentsMargins(0, 0, 0, 0);
+    }
+    layout->addWidget(networkSettings);
+
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Close, dialog);
+    connect(buttonBox, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
+    layout->addWidget(buttonBox);
+
+    dialog->resize(networkSettings->sizeHint());
+    dialog->open();
+}
+
 void AccountSettings::slotEnableCurrentFolder(bool terminate)
 {
     const auto alias = selectedFolderAlias();
@@ -1504,7 +1541,7 @@
         << "Client Side Encryption" << accountsState()->account()->capabilities().clientSideEncryptionAvailable();
 
     if (_accountState->account()->capabilities().clientSideEncryptionAvailable()) {
-        _ui->encryptionMessage->show();
+        setEncryptionPanelVisible(true);
     }
 }
 
@@ -1867,12 +1904,20 @@
 #endif
     _ui->encryptionMessageLabel->setText(encryptionMessage);
     setEncryptionMessageIcon(Theme::createColorAwareIcon(QStringLiteral(":/client/theme/info.svg")));
-    _ui->encryptionMessage->hide();
+    setEncryptionPanelVisible(false);
 
     auto *const actionSetupE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionSetupEncryptionId);
     connect(actionSetupE2e, &QAction::triggered, this, &AccountSettings::slotE2eEncryptionGenerateKeys);
 }
 
+void AccountSettings::setEncryptionPanelVisible(bool visible)
+{
+    _ui->encryptionMessage->setVisible(visible);
+    if (_encryptionPanel) {
+        _encryptionPanel->setVisible(visible);
+    }
+}
+
 void AccountSettings::setEncryptionMessageIcon(const QIcon &icon)
 {
     if (icon.isNull()) {

src/gui/accountsettings.h

@@ -7,7 +7,7 @@
 #ifndef ACCOUNTSETTINGS_H
 #define ACCOUNTSETTINGS_H
 
 #include <QWidget>
 #include <QUrl>
 #include <QPointer>
 #include <QHash>
@@ -29,6 +29,7 @@
 class QLabel;
 class QPushButton;
 class QIcon;
+class QFrame;
 
 namespace OCC {
 
@@ -119,7 +120,7 @@
                                   const QVector<int> &roles);
     void slotPossiblyUnblacklistE2EeFoldersAndRestartSync();
 
     void slotE2eEncryptionCertificateNeedMigration();
 
 private slots:
     void updateBlackListAndScheduleFolderSync(const QStringList &blackList, OCC::Folder *folder, const QStringList &foldersToRemoveFromBlacklist) const;
@@ -127,16 +128,18 @@
 
 private slots:
     void displayMnemonic(const QString &mnemonic);
     void forgetEncryptionOnDeviceForAccount(const OCC::AccountPtr &account) const;
     void migrateCertificateForAccount(const OCC::AccountPtr &account);
     void showConnectionLabel(const QString &message, QStringList errors = QStringList());
+    void showConnectionSettingsDialog();
     void openIgnoredFilesDialog(const QString & absFolderPath);
     void customizeStyle();
 
     void setupE2eEncryption();
     void forgetE2eEncryption();
     void checkClientSideEncryptionState();
     void removeActionFromEncryptionMessage(const QString &actionId);
+    void setEncryptionPanelVisible(bool visible);
 
 private:
     bool event(QEvent *) override;
@@ -160,6 +163,7 @@
     QAction *_addAccountAction = nullptr;
 
     bool _menuShown = false;
+    QFrame *_encryptionPanel = nullptr;
 
     QHash<QString, QMetaObject::Connection> _folderConnections;
     QHash<QAction *, QPushButton *> _encryptionMessageButtons;