Skip to content

feat(UI): Account wizard redesign #10030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rello wants to merge 19 commits into
base: master
Choose a base branch
from
Open

feat(UI): Account wizard redesign #10030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
11e5f95
feature: New Account wizard with QML implementation
Rello May 12, 2026
d0f1da3
fix: Build failed due to unnecessary arguments in an initializer.
i2h3 May 12, 2026
336c1dd
feature: New Account wizard with QML implementation
Rello May 12, 2026
94035e6
Merge remote-tracking branch 'origin/feature/AccountWizard' into feat…
Rello May 12, 2026
c955edc
fix: layout
Rello May 14, 2026
e7c0dc9
fix: font sizes and input fields
Rello May 14, 2026
6739256
Merge branch 'master' into feature/AccountWizard
Rello May 14, 2026
4b9351f
fix: language strings and labels
Rello May 14, 2026
cb72c61
fix: testing error
Rello May 14, 2026
e3e44e2
fix: testing error
Rello May 14, 2026
d769908
fix: button layouts
Rello May 14, 2026
d2902c7
fix: icon and padding
Rello May 15, 2026
108d2d3
fix: proxy dialog and button colors
Rello May 15, 2026
51c95e8
fix: UI polishing
Rello May 15, 2026
083c0a0
fix: account wizard polishing
Rello May 16, 2026
301b422
fix: add missing features to QML wizard
Rello May 18, 2026
958ca91
Merge branch 'master' into feature/AccountWizard
Rello May 27, 2026
9e63799
fix: UI clean-ups in account wizard
Rello May 27, 2026
9995d5f
Merge remote-tracking branch 'origin/feature/AccountWizard' into feat…
Rello May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,16 @@
<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/ProxySettingsDialog.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>
Expand Down
32 changes: 32 additions & 0 deletions shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,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;
Expand Down Expand Up @@ -800,9 +804,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;
Expand Down Expand Up @@ -845,9 +853,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;
Expand Down Expand Up @@ -906,9 +918,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;
Expand Down Expand Up @@ -1121,9 +1137,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;
Expand Down Expand Up @@ -1175,9 +1195,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;
Expand Down Expand Up @@ -1220,9 +1244,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;
Expand Down Expand Up @@ -1273,9 +1301,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;
Expand Down
2 changes: 2 additions & 0 deletions src/gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/gui/owncloudgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -148,6 +149,7 @@ ownCloudGui::ownCloudGui(Application *parent)
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");
Expand Down
87 changes: 86 additions & 1 deletion src/gui/owncloudsetupwizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Check failure on line 7 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:7:10 [clang-diagnostic-error] 

'accessmanager.h' file not found
#include "account.h"
#include "accountmanager.h"
#include "clientproxy.h"
Expand All @@ -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"
Expand All @@ -36,6 +38,11 @@
#include <QMessageBox>
#include <QDesktopServices>
#include <QApplication>
#include <QQmlApplicationEngine>
#include <QQmlComponent>
#include <QQmlContext>
#include <QQuickWindow>
#include <QVariant>

using namespace Qt::StringLiterals;

Expand Down Expand Up @@ -63,6 +70,9 @@

OwncloudSetupWizard::~OwncloudSetupWizard()
{
if (_qmlWizardWindow) {
_qmlWizardWindow->deleteLater();
}
_ocWizard->deleteLater();
}

Expand All @@ -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();
}

Expand All @@ -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;
}
Expand Down Expand Up @@ -148,6 +173,66 @@
_ocWizard->raise();
}

bool OwncloudSetupWizard::startQmlWizard()

Check warning on line 176 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:176:27 [modernize-use-trailing-return-type] 

use a trailing return type for this function
{
auto *engine = Systray::instance()->trayEngine();

Check warning on line 178 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:178:11 [cppcoreguidelines-init-variables] 

variable 'engine' is not initialized
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"));

Check warning on line 185 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:185:19 [cppcoreguidelines-init-variables] 

variable 'component' is not initialized
QVariantMap initialProperties;

Check warning on line 186 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:186:17 [cppcoreguidelines-init-variables] 

variable 'initialProperties' is not initialized
initialProperties.insert(QStringLiteral("controller"), QVariant::fromValue<QObject *>(_qmlController));
auto *createdObject = component.createWithInitialProperties(initialProperties);

Check warning on line 188 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:188:11 [cppcoreguidelines-init-variables] 

variable 'createdObject' is not initialized

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);

Check warning on line 210 in src/gui/owncloudsetupwizard.cpp

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.cpp:210:14 [cppcoreguidelines-init-variables] 

variable 'ownCloudWizardDone' is not initialized
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;
Comment on lines +230 to +233
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Start the enforced URL login automatically

For single forced override URLs, ConfigFile::overrideServerUrl() still sets startLoginFlowAutomatically(), but the QML path now only shows the window and returns. The legacy OwncloudSetupPage::initializePage() immediately called validation for that scenario, so custom-link/branded launches that are supposed to open the browser login without user input now stop on a read-only server page until the user clicks Log in.

Useful? React with 👍 / 👎.

}

// 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)
{
Expand All @@ -155,7 +240,7 @@
account->setUrl(serverURL);

account->setProxyType(proxySettings._proxyType);
switch (proxySettings._proxyType)

Check failure on line 243 in src/gui/owncloudsetupwizard.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a "default" case to this switch statement. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ4m_SUej4RHA-zkWkLG&open=AZ4m_SUej4RHA-zkWkLG&pullRequest=10030
{
case QNetworkProxy::HttpCachingProxy:
case QNetworkProxy::FtpCachingProxy:
Expand All @@ -166,7 +251,7 @@
account->networkAccessManager()->setProxy({QNetworkProxy::NoProxy});
break;
case QNetworkProxy::Socks5Proxy:
case QNetworkProxy::HttpProxy:

Check warning on line 254 in src/gui/owncloudsetupwizard.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Reduce this switch case number of lines from 8 to at most 5, for example by extracting code into methods. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ4m_SUej4RHA-zkWkLF&open=AZ4m_SUej4RHA-zkWkLF&pullRequest=10030
account->setProxyHostName(proxySettings._host);
account->setProxyPort(proxySettings._port);
account->setProxyNeedsAuth(proxySettings._needsAuth == WizardProxySettingsDialog::ProxyAuthentication::AuthenticationRequired);
Expand Down Expand Up @@ -406,7 +491,7 @@
job->setFollowRedirects(false);
job->setProperties(QList<QByteArray>() << "getlastmodified");
connect(job, &PropfindJob::result, _ocWizard, &OwncloudWizard::successfulStep);
connect(job, &PropfindJob::finishedWithError, this, [this] (QNetworkReply *reply) -> void {

Check warning on line 494 in src/gui/owncloudsetupwizard.cpp

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unmodified variable "reply" of type "class QNetworkReply *" should be const-qualified. 


See more on https://sonarcloud.io/project/issues?id=nextcloud_desktop&issues=AZ4m_SUej4RHA-zkWkLI&open=AZ4m_SUej4RHA-zkWkLI&pullRequest=10030
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
Expand Down
6 changes: 6 additions & 0 deletions src/gui/owncloudsetupwizard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef OWNCLOUDSETUPWIZARD_H
#define OWNCLOUDSETUPWIZARD_H

#include <QObject>

Check failure on line 10 in src/gui/owncloudsetupwizard.h

View workflow job for this annotation

GitHub Actions / build

src/gui/owncloudsetupwizard.h:10:10 [clang-diagnostic-error] 

'QObject' file not found
#include <QWidget>
#include <QProcess>
#include <QNetworkReply>
Expand All @@ -19,12 +19,15 @@

#include "wizard/wizardproxysettingsdialog.h"

class QQuickWindow;

namespace OCC {

class AccountState;
class TermsOfServiceChecker;

class OwncloudWizard;
class AccountWizardController;

/**
* @brief The OwncloudSetupWizard class
Expand Down Expand Up @@ -67,6 +70,7 @@
explicit OwncloudSetupWizard(QObject *parent = nullptr);
~OwncloudSetupWizard() override;
void startWizard();
bool startQmlWizard();
void testOwnCloudConnect();
void createRemoteFolder();
void finalizeSetup(bool);
Expand All @@ -75,6 +79,8 @@
bool checkDowngradeAdvised(QNetworkReply *reply);

OwncloudWizard *_ocWizard = nullptr;
AccountWizardController *_qmlController = nullptr;
QPointer<QQuickWindow> _qmlWizardWindow;
QString _initLocalFolder;
QString _remoteFolder;
};
Expand Down
Loading
Loading