feat(UI): Account wizard redesign

resources.qrc

@@ -59,6 +59,15 @@
         <file>src/gui/ResolveConflictsDialog.qml</file>
         <file>src/gui/ConflictDelegate.qml</file>
         <file>src/gui/ConflictItemFileInfo.qml</file>
+        <file>src/gui/wizard/qml/AccountWizardWindow.qml</file>
+        <file>src/gui/wizard/qml/AdvancedOptionsDialog.qml</file>
+        <file>src/gui/wizard/qml/BrowserAuthPage.qml</file>
+        <file>src/gui/wizard/qml/OptionRow.qml</file>
+        <file>src/gui/wizard/qml/ServerPage.qml</file>
+        <file>src/gui/wizard/qml/SyncOptionsPage.qml</file>
+        <file>src/gui/wizard/qml/WizardButton.qml</file>
+        <file>src/gui/wizard/qml/WizardDialogFrame.qml</file>
+        <file>src/gui/wizard/qml/WizardTextField.qml</file>
         <file>src/gui/macOS/ui/FileProviderSettings.qml</file>
         <file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
         <file>src/gui/integration/FileActionsWindow.qml</file>

shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj

@@ -746,9 +746,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -795,9 +799,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -839,9 +847,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -900,9 +912,13 @@
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1115,9 +1131,13 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1169,9 +1189,13 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1214,9 +1238,13 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1267,9 +1295,13 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
+				DEVELOPMENT_TEAM = 649J6ZGB3X;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

src/gui/CMakeLists.txt

@@ -227,6 +227,8 @@ set(client_SRCS
     creds/webflowcredentialsdialog.cpp
     wizard/abstractcredswizardpage.h
     wizard/abstractcredswizardpage.cpp
+    wizard/accountwizardcontroller.h
+    wizard/accountwizardcontroller.cpp
     wizard/owncloudadvancedsetuppage.h
     wizard/owncloudadvancedsetuppage.cpp
     wizard/owncloudconnectionmethoddialog.h

src/gui/owncloudgui.cpp

@@ -25,6 +25,7 @@
 #include "wheelhandler.h"
 #include "syncconflictsmodel.h"
 #include "syncengine.h"
+#include "wizard/accountwizardcontroller.h"
 #include "filedetails/datefieldbackend.h"
 #include "filedetails/filedetails.h"
 #include "filedetails/shareemodel.h"
@@ -143,6 +144,7 @@
     qmlRegisterType<SortedShareModel>("com.nextcloud.desktopclient", 1, 0, "SortedShareModel");
     qmlRegisterType<SyncConflictsModel>("com.nextcloud.desktopclient", 1, 0, "SyncConflictsModel");
     qmlRegisterType<FileActionsModel>("com.nextcloud.desktopclient", 1, 0, "FileActionsModel");
+    qmlRegisterType<AccountWizardController>("com.nextcloud.desktopclient", 1, 0, "AccountWizardController");
 
     qmlRegisterUncreatableType<QAbstractItemModel>("com.nextcloud.desktopclient", 1, 0, "QAbstractItemModel", "QAbstractItemModel");
     qmlRegisterUncreatableType<Activity>("com.nextcloud.desktopclient", 1, 0, "activity", "Activity");
@@ -242,7 +244,7 @@
     // or SSL error dialog also comes to front.
 }
 
 void ownCloudGui::slotSyncStateChange(Folder *folder)
 {
     if (!folder) {
         return; // Valid, just a general GUI redraw was needed.
@@ -388,7 +390,7 @@
         QStringList messages;
         messages.append(tr("Disconnected from accounts:"));
         for (const auto &accountState : std::as_const(problemAccounts)) {
             QString message = tr("Account %1: %2").arg(accountState->account()->displayName(), accountState->stateString(accountState->state()));
             if (!accountState->connectionErrors().empty()) {
                 message += QLatin1String("\n");
                 message += accountState->connectionErrors().join(QLatin1String("\n"));

src/gui/owncloudsetupwizard.cpp

@@ -1,10 +1,10 @@
 /*
  * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
  * SPDX-FileCopyrightText: 2012 ownCloud GmbH
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "accessmanager.h"
 #include "account.h"
 #include "accountmanager.h"
 #include "clientproxy.h"
@@ -17,6 +17,8 @@
 #include "owncloudsetupwizard.h"
 #include "owncloudpropagator_p.h"
 #include "sslerrordialog.h"
+#include "systray.h"
+#include "wizard/accountwizardcontroller.h"
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
 #include "account.h"
@@ -36,6 +38,11 @@
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QApplication>
+#include <QQmlApplicationEngine>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include <QQuickWindow>
+#include <QVariant>
 
 using namespace Qt::StringLiterals;
 
@@ -63,6 +70,9 @@
 
 OwncloudSetupWizard::~OwncloudSetupWizard()
 {
+    if (_qmlWizardWindow) {
+        _qmlWizardWindow->deleteLater();
+    }
     _ocWizard->deleteLater();
 }
 
@@ -85,9 +95,17 @@
 
     owncloudSetupWizard = new OwncloudSetupWizard(parent);
     connect(owncloudSetupWizard, SIGNAL(ownCloudWizardDone(int)), obj, amember);
-    connect(owncloudSetupWizard->_ocWizard, &OwncloudWizard::wizardClosed, obj, [] { owncloudSetupWizard.clear(); });
 
     FolderMan::instance()->setSyncEnabled(false);
+    // The widget wizard stays as a fallback until the QML flow owns every setup branch.
+    if (owncloudSetupWizard->startQmlWizard()) {
+        connect(owncloudSetupWizard->_qmlController, &AccountWizardController::finished, obj, [] {
+            owncloudSetupWizard.clear();
+        });
+        return;
+    }
+
+    connect(owncloudSetupWizard->_ocWizard, &OwncloudWizard::wizardClosed, obj, [] { owncloudSetupWizard.clear(); });
     owncloudSetupWizard->startWizard();
 }
 
@@ -97,6 +115,13 @@
         return false;
     }
 
+    if (owncloudSetupWizard->_qmlWizardWindow) {
+        owncloudSetupWizard->_qmlWizardWindow->show();
+        owncloudSetupWizard->_qmlWizardWindow->raise();
+        owncloudSetupWizard->_qmlWizardWindow->requestActivate();
+        return true;
+    }
+
     ownCloudGui::raiseDialog(owncloudSetupWizard->_ocWizard);
     return true;
 }
@@ -148,6 +173,66 @@
     _ocWizard->raise();
 }
 
+bool OwncloudSetupWizard::startQmlWizard()
+{
+    auto *engine = Systray::instance()->trayEngine();
+    if (!engine) {
+        qCWarning(lcWizard) << "Cannot start QML account wizard without a QML engine.";
+        return false;
+    }
+
+    _qmlController = new AccountWizardController(this);
+    QQmlComponent component(engine, QStringLiteral("qrc:/qml/src/gui/wizard/qml/AccountWizardWindow.qml"));
+    QVariantMap initialProperties;
+    initialProperties.insert(QStringLiteral("controller"), QVariant::fromValue<QObject *>(_qmlController));
+    auto *createdObject = component.createWithInitialProperties(initialProperties);
+
+    if (component.isError()) {
+        qCWarning(lcWizard) << "Failed to load QML account wizard:" << component.errors();
+    }
+
+    _qmlWizardWindow = qobject_cast<QQuickWindow *>(createdObject);
+    if (!_qmlWizardWindow) {
+        if (createdObject) {
+            createdObject->deleteLater();
+        }
+        _qmlController->deleteLater();
+        _qmlController = nullptr;
+        return false;
+    }
+
+#if defined(Q_OS_MACOS) && QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+    _qmlWizardWindow->setFlag(Qt::ExpandedClientAreaHint, true);
+    _qmlWizardWindow->setFlag(Qt::NoTitleBarBackgroundHint, true);
+#endif
+
+    connect(_qmlController, &AccountWizardController::finished, this, [this](int result) {
+        emit ownCloudWizardDone(result);
+        if (_qmlWizardWindow) {
+            _qmlWizardWindow->deleteLater();
+            _qmlWizardWindow.clear();
+        }
+        deleteLater();
+    });
+
+    connect(_qmlController, &AccountWizardController::legacyWizardRequested, this, [this] {
+        if (_qmlWizardWindow) {
+            _qmlWizardWindow->deleteLater();
+            _qmlWizardWindow.clear();
+        }
+        _qmlController->deleteLater();
+        _qmlController = nullptr;
+
+        connect(_ocWizard, &OwncloudWizard::wizardClosed, this, [] { owncloudSetupWizard.clear(); });
+        startWizard();
+    });
+
+    _qmlWizardWindow->show();
+    _qmlWizardWindow->raise();
+    _qmlWizardWindow->requestActivate();
+    return true;
+}
+
 // also checks if an installation is valid and determines auth type in a second step
 void OwncloudSetupWizard::slotCheckServer(const QUrl &serverURL, const OCC::WizardProxySettingsDialog::WizardProxySettings &proxySettings)
 {
@@ -155,7 +240,7 @@
     account->setUrl(serverURL);
 
     account->setProxyType(proxySettings._proxyType);
     switch (proxySettings._proxyType)
     {
     case QNetworkProxy::HttpCachingProxy:
     case QNetworkProxy::FtpCachingProxy:
@@ -406,11 +491,11 @@
     job->setFollowRedirects(false);
     job->setProperties(QList<QByteArray>() << "getlastmodified");
     connect(job, &PropfindJob::result, _ocWizard, &OwncloudWizard::successfulStep);
     connect(job, &PropfindJob::finishedWithError, this, [this] (QNetworkReply *reply) -> void {
         if (reply && reply->error() == QNetworkReply::ContentAccessDenied) {
             // A 403 might indicate that the terms of service need to be signed.
             // catch this special case here, fall back to the standard error handler if it's not TOS-related
             auto davException = OCC::getExceptionFromReply(reply);
             if (!davException.first.isEmpty() && davException.first == QStringLiteral(R"(OCA\TermsOfService\TermsNotSignedException)")) {
                 // authentication was successful, but the user hasn't signed the terms of service yet.  Prompt for that in the next step
                 qCInfo(lcWizard) << "Terms of service not accepted yet!  Will prompt the user in the next step";

src/gui/owncloudsetupwizard.h

@@ -7,7 +7,7 @@
 #ifndef OWNCLOUDSETUPWIZARD_H
 #define OWNCLOUDSETUPWIZARD_H
 
 #include <QObject>
 #include <QWidget>
 #include <QProcess>
 #include <QNetworkReply>
@@ -19,12 +19,15 @@
 
 #include "wizard/wizardproxysettingsdialog.h"
 
+class QQuickWindow;
+
 namespace OCC {
 
 class AccountState;
 class TermsOfServiceChecker;
 
 class OwncloudWizard;
+class AccountWizardController;
 
 /**
  * @brief The OwncloudSetupWizard class
@@ -67,6 +70,7 @@
     explicit OwncloudSetupWizard(QObject *parent = nullptr);
     ~OwncloudSetupWizard() override;
     void startWizard();
+    bool startQmlWizard();
     void testOwnCloudConnect();
     void createRemoteFolder();
     void finalizeSetup(bool);
@@ -75,6 +79,8 @@
     bool checkDowngradeAdvised(QNetworkReply *reply);
 
     OwncloudWizard *_ocWizard = nullptr;
+    AccountWizardController *_qmlController = nullptr;
+    QPointer<QQuickWindow> _qmlWizardWindow;
     QString _initLocalFolder;
     QString _remoteFolder;
 };