Improve wizard ui

NEXTCLOUD.cmake

@@ -34,7 +34,8 @@ option( WITH_PROVIDERS "Build with providers list" ON )
 
 
 ## Theming options
-set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "#0082c9" CACHE STRING "Hex color of the wizard header background")
+set(NEXTCLOUD_BACKGROUND_COLOR "#0082c9" CACHE STRING "Default Nextcloud background color")
+set( APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR ${NEXTCLOUD_BACKGROUND_COLOR} CACHE STRING "Hex color of the wizard header background")
 set( APPLICATION_WIZARD_HEADER_TITLE_COLOR "#ffffff" CACHE STRING "Hex color of the text in the wizard header")
 option( APPLICATION_WIZARD_USE_CUSTOM_LOGO "Use the logo from ':/client/theme/colored/wizard_logo.(png|svg)' else the default application icon is used" ON )
 

config.h.in

@@ -25,6 +25,7 @@
 #cmakedefine APPLICATION_SERVER_URL_ENFORCE "@APPLICATION_SERVER_URL_ENFORCE@"
 #cmakedefine LINUX_APPLICATION_ID "@LINUX_APPLICATION_ID@"
 #cmakedefine APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR "@APPLICATION_WIZARD_HEADER_BACKGROUND_COLOR@"
+#cmakedefine NEXTCLOUD_BACKGROUND_COLOR "@NEXTCLOUD_BACKGROUND_COLOR@"
 #cmakedefine APPLICATION_WIZARD_HEADER_TITLE_COLOR "@APPLICATION_WIZARD_HEADER_TITLE_COLOR@"
 #cmakedefine APPLICATION_WIZARD_USE_CUSTOM_LOGO "@APPLICATION_WIZARD_USE_CUSTOM_LOGO@"
 #cmakedefine APPLICATION_VIRTUALFILE_SUFFIX "@APPLICATION_VIRTUALFILE_SUFFIX@"

src/gui/CMakeLists.txt

@@ -51,6 +51,7 @@ set(client_UI_SRCS
     wizard/owncloudsetupnocredspage.ui
     wizard/owncloudwizardresultpage.ui
     wizard/webview.ui
+    wizard/welcomepage.ui
 )
 
 set(client_SRCS
@@ -134,6 +135,8 @@ set(client_SRCS
     wizard/webviewpage.cpp
     wizard/webview.cpp
     wizard/slideshow.cpp
+    wizard/welcomepage.cpp
+    wizard/linklabel.cpp
 )
 
 IF(BUILD_UPDATER)

src/gui/owncloudsetupwizard.cpp

@@ -131,7 +131,12 @@ void OwncloudSetupWizard::startWizard()
 
     _ocWizard->setRemoteFolder(_remoteFolder);
 
-    _ocWizard->setStartId(WizardCommon::Page_ServerSetup);
+#ifdef WITH_PROVIDERS
+    const auto startPage = WizardCommon::Page_Welcome;
+#else // WITH_PROVIDERS
+    const auto startPage = WizardCommon::Page_ServerSetup;
+#endif // WITH_PROVIDERS
+    _ocWizard->setStartId(startPage);
 
     _ocWizard->restart();
 

src/gui/wizard/linklabel.cpp

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 by Felix Weilbach <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#include "linklabel.h"
+#include "guiutility.h"
+
+namespace OCC {
+
+LinkLabel::LinkLabel(QWidget *parent) : QLabel(parent)
+{
+
+}
+
+void LinkLabel::setUrl(const QUrl &url)
+{
+    this->url = url;
+}
+
+void LinkLabel::enterEvent(QEvent * /*event*/)
+{
+    setFontUnderline(true);
+    setCursor(Qt::PointingHandCursor);
+}
+
+void LinkLabel::leaveEvent(QEvent * /*event*/)
+{
+    setFontUnderline(false);
+    setCursor(Qt::ArrowCursor);
+}
+
+void LinkLabel::mouseReleaseEvent(QMouseEvent * /*event*/)
+{
+    if (url.isValid()) {
+        Utility::openBrowser(url);
+    }
+
+    emit clicked();
+}
+
+void LinkLabel::setFontUnderline(bool value)
+{
+    auto labelFont = font();
+    labelFont.setUnderline(value);
+    setFont(labelFont);
+}
+
+}

src/gui/wizard/linklabel.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 by Felix Weilbach <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ */
+
+#pragma once
+
+#include <QLabel>
+#include <QUrl>
+
+namespace OCC {
+
+class LinkLabel : public QLabel
+{
+    Q_OBJECT
+public:
+    explicit LinkLabel(QWidget *parent = nullptr);
+
+    void setUrl(const QUrl &url);
+
+signals:
+    void clicked();
+
+protected:
+    void enterEvent(QEvent *event) override;
+
+    void leaveEvent(QEvent *event) override;
+
+    void mouseReleaseEvent(QMouseEvent *event) override;
+
+private:
+    void setFontUnderline(bool value);
+
+    QUrl url;
+};
+
+}

src/gui/wizard/owncloudwizard.cpp

@@ -20,6 +20,7 @@
 #include "owncloudgui.h"
 
 #include "wizard/owncloudwizard.h"
+#include "wizard/welcomepage.h"
 #include "wizard/owncloudsetuppage.h"
 #include "wizard/owncloudhttpcredspage.h"
 #include "wizard/owncloudoauthcredspage.h"
@@ -46,6 +47,9 @@ Q_LOGGING_CATEGORY(lcWizard, "nextcloud.gui.wizard", QtInfoMsg)
 OwncloudWizard::OwncloudWizard(QWidget *parent)
     : QWizard(parent)
     , _account(nullptr)
+#ifdef WITH_PROVIDERS
+    , _welcomePage(new WelcomePage(this))
+#endif // WITH_PROVIDERS
     , _setupPage(new OwncloudSetupPage(this))
     , _httpCredsPage(new OwncloudHttpCredsPage(this))
     , _browserCredsPage(new OwncloudOAuthCredsPage)
@@ -57,6 +61,9 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
     setObjectName("owncloudWizard");
 
     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+#ifdef WITH_PROVIDERS
+    setPage(WizardCommon::Page_Welcome, _welcomePage);
+#endif // WITH_PROVIDERS
     setPage(WizardCommon::Page_ServerSetup, _setupPage);
     setPage(WizardCommon::Page_HttpCreds, _httpCredsPage);
     setPage(WizardCommon::Page_OAuthCreds, _browserCredsPage);
@@ -94,6 +101,12 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
     setSubTitleFormat(Qt::RichText);
     setButtonText(QWizard::CustomButton1, tr("Skip folders configuration"));
 
+    // Change the next buttons size policy since we hide it on the
+    // welcome page but want it to fill it's space that we don't get
+    // flickering when the page changes
+    auto nextButtonSizePolicy = button(QWizard::NextButton)->sizePolicy();
+    nextButtonSizePolicy.setRetainSizeWhenHidden(true);
+    button(QWizard::NextButton)->setSizePolicy(nextButtonSizePolicy);
 
     // Connect styleChanged events to our widgets, so they can adapt (Dark-/Light-Mode switching)
     connect(this, &OwncloudWizard::styleChanged, _setupPage, &OwncloudSetupPage::slotStyleChanged);
@@ -220,6 +233,29 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
 {
     qCDebug(lcWizard) << "Current Wizard page changed to " << id;
 
+    const auto setNextButtonAsDefault = [this]() {
+        auto nextButton = qobject_cast<QPushButton *>(button(QWizard::NextButton));
+        if (nextButton) {
+            nextButton->setDefault(true);
+            nextButton->setFocus();
+        }
+    };
+
+    if (id == WizardCommon::Page_Welcome) {
+        // Set next button to just hidden so it retains it's layout
+        button(QWizard::NextButton)->setHidden(true);
+        // Need to set it from here, otherwise it has no effect
+        _welcomePage->setLoginButtonDefault();
+    } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) {
+        setButtonLayout({ QWizard::Stretch, QWizard::BackButton });
+    } else if (id == WizardCommon::Page_AdvancedSetup) {
+        setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton });
+        setNextButtonAsDefault();
+    } else {
+        setButtonLayout({ QWizard::Stretch, QWizard::BackButton, QWizard::NextButton });
+        setNextButtonAsDefault();
+    }
+
     if (id == WizardCommon::Page_ServerSetup) {
         emit clearPendingRequests();
     }
@@ -232,7 +268,6 @@ void OwncloudWizard::slotCurrentPageChanged(int id)
         done(Accepted);
     }
 
-    setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
     if (id == WizardCommon::Page_AdvancedSetup && (_credentialsPage == _browserCredsPage || _credentialsPage == _flow2CredsPage)) {
         // For OAuth, disable the back button in the Page_AdvancedSetup because we don't want
         // to re-open the browser.

src/gui/wizard/owncloudwizard.h

@@ -29,6 +29,7 @@ namespace OCC {
 
 Q_DECLARE_LOGGING_CATEGORY(lcWizard)
 
+class WelcomePage;
 class OwncloudSetupPage;
 class OwncloudHttpCredsPage;
 class OwncloudOAuthCredsPage;
@@ -115,6 +116,7 @@ public slots:
     void customizeStyle();
 
     AccountPtr _account;
+    WelcomePage *_welcomePage;
     OwncloudSetupPage *_setupPage;
     OwncloudHttpCredsPage *_httpCredsPage;
     OwncloudOAuthCredsPage *_browserCredsPage;

src/gui/wizard/owncloudwizardcommon.cpp

@@ -16,6 +16,10 @@
 #include <QLabel>
 #include <QPixmap>
 #include <QVariant>
+#include <QRadioButton>
+#include <QAbstractButton>
+#include <QCheckBox>
+#include <QSpinBox>
 
 #include "wizard/owncloudwizardcommon.h"
 #include "theme.h"
@@ -68,6 +72,15 @@ namespace WizardCommon {
         errorLabel->setVisible(false);
     }
 
+    void customizeHintLabel(QLabel *label)
+    {
+        auto palette = label->palette();
+        QColor textColor = palette.color(QPalette::Text);
+        textColor.setAlpha(128);
+        palette.setColor(QPalette::Text, textColor);
+        label->setPalette(palette);
+    }
+
 } // ns WizardCommon
 
 } // namespace OCC

src/gui/wizard/owncloudwizardcommon.h

@@ -18,6 +18,10 @@
 
 class QVariant;
 class QLabel;
+class QRadioButton;
+class QSpinBox;
+class QCheckBox;
+class QAbstractButton;
 
 namespace OCC {
 
@@ -27,13 +31,15 @@ namespace WizardCommon {
     QString titleTemplate();
     QString subTitleTemplate();
     void initErrorLabel(QLabel *errorLabel);
+    void customizeHintLabel(QLabel *label);
 
     enum SyncMode {
         SelectiveMode,
         BoxMode
     };
 
     enum Pages {
+        Page_Welcome,
         Page_ServerSetup,
         Page_HttpCreds,
         Page_ShibbolethCreds,