refactor: [DC-310] final cleanup after main window reorg

src/gui/CMakeLists.txt

@@ -3,25 +3,17 @@ include(ECMAddAppIcon)
 find_package(KDSingleApplication-qt6 1.0.0 REQUIRED)
 
 set(client_UI_SRCS
-    aboutdialog.ui
-    generalsettings.ui
     ignorelisteditor.ui
     networksettings.ui
     localactivitywidget.ui
     syncerrorwidget.ui
-    settingsdialog.ui
     tlserrordialog.ui
     logbrowser.ui
-    accountsgui/accountview.ui
 )
 
 set(client_SRCS
-    aboutdialog.cpp
     accountmanager.cpp
 
-    accountmodalwidget.cpp
-    accountmodalwidget.ui
-
     application.cpp
     fetchserversettings.cpp
     clientproxy.cpp
@@ -30,20 +22,18 @@ set(client_SRCS
     folder.cpp
     folderman.cpp
     folderwatcher.cpp
-    generalsettings.cpp
     ignorelisteditor.cpp
     lockwatcher.cpp
     logbrowser.cpp
     networkinformation.cpp
     networksettings.cpp
     openfilemanager.cpp
-    owncloudgui.cpp
+    traymenucontroller.cpp
     localactivitywidget.cpp
     protocolitem.cpp
     syncerrorwidget.cpp
     activitysettings.cpp
     selectivesyncwidget.cpp
-    settingsdialog.cpp
     tlserrordialog.cpp
     syncrunfilelog.cpp
     accountstate.cpp

src/gui/FoldersGui/accountfolderscontroller.cpp

@@ -20,9 +20,7 @@
 #include "commonstrings.h"
 #include "configfile.h"
 #include "foldermodelcontroller.h"
-#include "folderwizard.h"
 #include "selectivesyncwidget.h"
-#include "settingsdialog.h"
 
 #include "guiutility.h"
 #include "networkjobs.h"
@@ -85,27 +83,7 @@ void AccountFoldersController::onFolderChanged(OCC::Folder *folder)
 
 void AccountFoldersController::onAddFolder()
 {
-    if (!_accountState || !_accountState->account()) {
-        return;
-    }
-
-    emit requestAddFolder();
-}
-
-void AccountFoldersController::onFolderWizardAccepted(OCC::FolderMan::SyncConnectionDescription result)
-{
-    if (!_accountState) {
-        return;
-    }
-
-    // The gui should not allow users to selectively choose any sync lists if vfs is enabled, but this kind of check was
-    // originally in play here so...keep it just in case.
-    if (result.useVirtualFiles && !result.selectiveSyncBlackList.empty()) {
-        result.selectiveSyncBlackList.clear();
-    }
-
-    // Refactoring todo: turn this into a signal
-    FolderMan::instance()->addFolderFromGui(_accountState, result);
+    emit requestAddFolder(_accountId);
 }
 
 void AccountFoldersController::buildMenuActions()
@@ -196,7 +174,7 @@ void AccountFoldersController::onEnableVfs()
                "will become available again."
                "\n\n"
                "This action will abort any currently running synchronization."),
-            QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+            QMessageBox::Yes | QMessageBox::No, ocApp()->mainWindow());
         msgBox.setObjectName("confirmDisableVfsDialog");
         msgBox.button(QMessageBox::Yes)->setText(tr("Disable support"));
         msgBox.button(QMessageBox::Yes)->setObjectName("disableVfsButton");
@@ -278,7 +256,7 @@ void AccountFoldersController::onForceSync()
         QMessageBox messageBox(QMessageBox::Question, tr("Internet connection is metered"),
             tr("Synchronization is paused because the Internet connection is a metered connection"
                "<p>Do you really want to force a Synchronization now?"),
-            QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+            QMessageBox::Yes | QMessageBox::No, ocApp()->mainWindow());
         messageBox.setObjectName("confirmForceSyncWhenMeteredDialog");
         messageBox.button(QMessageBox::No)->setObjectName("cancelForceSyncWhenMeteredButton");
         messageBox.button(QMessageBox::Yes)->setObjectName("forceSyncWhenMeteredButton");
@@ -300,7 +278,7 @@ void AccountFoldersController::onTogglePauseSync()
     if (!currentlyPaused) {
         if (_currentFolder->isSyncRunning()) {
             QMessageBox msgbox(QMessageBox::Question, tr("Sync Running"), tr("The sync operation is running.<br/>Do you want to stop it?"),
-                QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+                QMessageBox::Yes | QMessageBox::No, ocApp()->mainWindow());
             msgbox.setDefaultButton(QMessageBox::No);
             msgbox.setObjectName("confirmPauseRunningSyncDialog");
             msgbox.button(QMessageBox::Yes)->setObjectName("pauseRunningSyncButton");
@@ -330,7 +308,7 @@ void AccountFoldersController::onRemoveSync()
         tr("<p>Do you really want to stop syncing the folder <i>%1</i>?</p>"
            "<p><b>Note:</b> This will <b>not</b> delete any files.</p>")
             .arg(shortGuiLocalPath),
-        QMessageBox::Yes | QMessageBox::No, ocApp()->gui()->settingsDialog());
+        QMessageBox::Yes | QMessageBox::No, ocApp()->mainWindow());
     msgBox.button(QMessageBox::Yes)->setText(tr("Remove Folder Sync Connection"));
     msgBox.button(QMessageBox::No)->setText(tr("Cancel"));
     msgBox.setObjectName("confirmRemoveFolderSyncDialog");

src/gui/FoldersGui/accountfolderscontroller.h

@@ -38,17 +38,16 @@ class AccountFoldersController : public QObject
 
 signals:
     void removeFolderFromGui(OCC::Folder *f);
-    void requestAddFolder();
+    void requestAddFolder(QUuid accountId);
 
     void requestAccountModalWidget(OCC::AccountModalWidget *widget);
 
 protected:
     void onUnsyncedSpaceCountChanged(const QUuid &accountId, int unsyncedSpaceCount, int totalSpaceCount);
     void onAddFolder();
-    void onFolderWizardAccepted(OCC::FolderMan::SyncConnectionDescription result);
 
 private:
-    AccountState *_accountState = nullptr;
+    QPointer<AccountState> _accountState;
     QUuid _accountId;
     QPointer<Folder> _currentFolder = nullptr;
     AccountFoldersView *_view = nullptr;