Port LoginRequiredDialog to an AccountModalWidget

src/gui/accountmodalwidget.cpp

@@ -16,6 +16,7 @@
 #include "ui_accountmodalwidget.h"
 
 namespace OCC {
+
 AccountModalWidget::AccountModalWidget(const QString &title, QWidget *widget, QWidget *parent)
     : QWidget(parent)
     , ui(new Ui::AccountModalWidget)
@@ -24,13 +25,30 @@ AccountModalWidget::AccountModalWidget(const QString &title, QWidget *widget, QW
     ui->groupBox->setTitle(title);
     ui->groupBox->layout()->addWidget(widget);
 
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, [this] {
-        Q_EMIT accepted();
-        Q_EMIT finished();
-    });
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, [this] {
-        Q_EMIT rejected();
-        Q_EMIT finished();
-    });
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &AccountModalWidget::accept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &AccountModalWidget::reject);
+}
+
+void AccountModalWidget::setStandardButtons(QDialogButtonBox::StandardButtons buttons)
+{
+    ui->buttonBox->setStandardButtons(buttons);
+}
+
+QPushButton *AccountModalWidget::addButton(const QString &text, QDialogButtonBox::ButtonRole role)
+{
+    return ui->buttonBox->addButton(text, role);
+}
+
+void AccountModalWidget::accept()
+{
+    Q_EMIT accepted();
+    Q_EMIT finished(Result::Accepted);
 }
+
+void AccountModalWidget::reject()
+{
+    Q_EMIT rejected();
+    Q_EMIT finished(Result::Rejected);
+}
+
 } // OCC

src/gui/accountmodalwidget.h

@@ -13,7 +13,8 @@
  */
 
 #pragma once
-#include <QWidget>
+
+#include <QDialogButtonBox>
 
 namespace OCC {
 
@@ -27,10 +28,20 @@ class AccountModalWidget : public QWidget
 public:
     AccountModalWidget(const QString &title, QWidget *widget, QWidget *parent);
 
+    enum class Result { Rejected, Accepted };
+    Q_ENUM(Result)
+
+    void setStandardButtons(QDialogButtonBox::StandardButtons buttons);
+    QPushButton *addButton(const QString &text, QDialogButtonBox::ButtonRole role);
+
+public Q_SLOTS:
+    void accept();
+    void reject();
+
 Q_SIGNALS:
     void accepted();
     void rejected();
-    void finished();
+    void finished(Result result);
 
 private:
     Ui::AccountModalWidget *ui;

src/gui/accountmodalwidget.ui

@@ -37,7 +37,7 @@
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::NoButton</set>
      </property>
     </widget>
    </item>

src/gui/accountsettings.cpp

@@ -241,6 +241,7 @@ void AccountSettings::showSelectiveSyncDialog(Folder *folder)
     Q_ASSERT(ok);
 
     auto *modalWidget = new AccountModalWidget(tr("Choose what to sync"), selectiveSync, this);
+    modalWidget->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
     connect(modalWidget, &AccountModalWidget::accepted, this, [selectiveSync, folder, this] {
         folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, selectiveSync->createBlackList());
         doForceSyncCurrentFolder(folder);

src/gui/accountsettings.h

@@ -55,7 +55,7 @@ class OWNCLOUDGUI_EXPORT AccountSettings : public QWidget
 
 public:
     enum class ModalWidgetSizePolicy { Minimum = QSizePolicy::Minimum, Expanding = QSizePolicy::Expanding };
-    Q_ENUM(ModalWidgetSizePolicy);
+    Q_ENUM(ModalWidgetSizePolicy)
 
     explicit AccountSettings(const AccountStatePtr &accountState, QWidget *parent = nullptr);
     ~AccountSettings() override;

src/gui/creds/httpcredentialsgui.cpp

@@ -15,6 +15,7 @@
 
 #include "creds/httpcredentialsgui.h"
 #include "account.h"
+#include "accountmodalwidget.h"
 #include "application.h"
 #include "common/asserts.h"
 #include "gui/accountsettings.h"
@@ -23,7 +24,6 @@
 #include "gui/loginrequireddialog/oauthloginwidget.h"
 #include "networkjobs.h"
 #include "settingsdialog.h"
-#include "theme.h"
 
 #include <QClipboard>
 #include <QDesktopServices>
@@ -96,9 +96,7 @@ void HttpCredentialsGui::asyncAuthResult(OAuth::Result r, const QString &token,
         Q_EMIT oAuthErrorOccurred();
         return;
     case OAuth::LoggedIn:
-        if (_loginRequiredDialog) {
-            _loginRequiredDialog->accept();
-        }
+        Q_EMIT oAuthLoginAccepted();
         break;
     }
 
@@ -125,11 +123,12 @@ void HttpCredentialsGui::showDialog()
     auto *contentWidget = qobject_cast<BasicLoginWidget *>(dialog->contentWidget());
     contentWidget->forceUsername(user());
 
-    // in this case, we want to use the login button
-    dialog->addLogInButton();
-
-    connect(dialog, &LoginRequiredDialog::finished, ocApp()->gui()->settingsDialog(), [this, contentWidget](const int result) {
-        if (result == QDialog::Accepted) {
+    auto *modalWidget = new AccountModalWidget(tr("Login required"), dialog, ocApp()->gui()->settingsDialog());
+    modalWidget->addButton(tr("Log out"), QDialogButtonBox::RejectRole);
+    modalWidget->addButton(tr("Log in"), QDialogButtonBox::AcceptRole); // in this case, we want to use the login button
+    connect(this, &HttpCredentialsGui::oAuthLoginAccepted, modalWidget, &AccountModalWidget::accept);
+    connect(modalWidget, &AccountModalWidget::finished, ocApp()->gui()->settingsDialog(), [this, contentWidget](AccountModalWidget::Result result) {
+        if (result == AccountModalWidget::Result::Accepted) {
             _password = contentWidget->password();
             _refreshToken.clear();
             _ready = true;
@@ -140,7 +139,7 @@ void HttpCredentialsGui::showDialog()
         Q_EMIT fetched();
     });
 
-    ocApp()->gui()->settingsDialog()->accountSettings(_account)->addModalLegacyDialog(dialog, AccountSettings::ModalWidgetSizePolicy::Minimum);
+    ocApp()->gui()->settingsDialog()->accountSettings(_account)->addModalWidget(modalWidget);
     _loginRequiredDialog = dialog;
 }
 
@@ -173,7 +172,6 @@ void HttpCredentialsGui::restartOAuth()
 
         auto *contentWidget = qobject_cast<OAuthLoginWidget *>(_loginRequiredDialog->contentWidget());
         connect(contentWidget, &OAuthLoginWidget::openBrowserButtonClicked, this, &HttpCredentialsGui::openBrowser);
-        connect(_loginRequiredDialog, &LoginRequiredDialog::rejected, this, &HttpCredentials::requestLogout);
 
         connect(contentWidget, &OAuthLoginWidget::retryButtonClicked, _loginRequiredDialog, [contentWidget, this]() {
             restartOAuth();
@@ -186,8 +184,12 @@ void HttpCredentialsGui::restartOAuth()
             contentWidget->showRetryFrame();
         });
 
-        ocApp()->gui()->settingsDialog()->accountSettings(_account)->addModalLegacyDialog(
-            _loginRequiredDialog, AccountSettings::ModalWidgetSizePolicy::Minimum);
+        auto *modalWidget = new AccountModalWidget(tr("Login required"), _loginRequiredDialog, ocApp()->gui()->settingsDialog());
+        modalWidget->addButton(tr("Log out"), QDialogButtonBox::RejectRole);
+        connect(this, &HttpCredentialsGui::oAuthLoginAccepted, modalWidget, &AccountModalWidget::accept);
+        connect(modalWidget, &AccountModalWidget::rejected, this, &HttpCredentials::requestLogout);
+
+        ocApp()->gui()->settingsDialog()->accountSettings(_account)->addModalWidget(modalWidget);
     }
 
     _asyncAuth.reset(new AccountBasedOAuth(_account->sharedFromThis(), this));

src/gui/creds/httpcredentialsgui.h

@@ -20,6 +20,7 @@
 #include <QPointer>
 
 namespace OCC {
+
 class LoginRequiredDialog;
 
 /**
@@ -34,6 +35,7 @@ class HttpCredentialsGui : public HttpCredentials
         : HttpCredentials()
     {
     }
+
     HttpCredentialsGui(const QString &loginUser, const QString &password)
         : HttpCredentials(DetermineAuthTypeJob::AuthType::Basic, loginUser, password)
     {
@@ -65,6 +67,7 @@ private Q_SLOTS:
     void showDialog();
 
 Q_SIGNALS:
+    void oAuthLoginAccepted();
     void oAuthErrorOccurred();
 
 private:

src/gui/loginrequireddialog/loginrequireddialog.cpp

@@ -15,30 +15,20 @@
 #include "loginrequireddialog.h"
 #include "ui_loginrequireddialog.h"
 
-#include "gui/application.h"
-#include "gui/creds/httpcredentialsgui.h"
-#include "gui/guiutility.h"
 #include "theme.h"
 
 #include <QClipboard>
 
 namespace OCC {
 
 LoginRequiredDialog::LoginRequiredDialog(Mode mode, QWidget *parent)
-    : QDialog(parent)
+    : QWidget(parent)
     , _ui(new ::Ui::LoginRequiredDialog)
 {
     _ui->setupUi(this);
 
     _ui->iconLabel->setPixmap(Theme::instance()->applicationIcon().pixmap(128, 128));
 
-    // we want a custom text, but we make use of the button box's built-in reject role
-    _ui->rightButtonBox->addButton(tr("Log out"), QDialogButtonBox::RejectRole);
-
-    // make plain reject/accept buttons work w/o additional effort on the caller side
-    connect(_ui->rightButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-    connect(_ui->rightButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-
     // using a stacked widget appears to work better than a plain widget
     // we do this in the setup wizard as well
     _ui->contentWidget->setCurrentWidget([this, mode]() -> QWidget * {
@@ -63,11 +53,6 @@ void LoginRequiredDialog::setTopLabelText(const QString &newText)
     _ui->topLabel->setText(newText);
 }
 
-void LoginRequiredDialog::addLogInButton()
-{
-    _ui->rightButtonBox->addButton(tr("Log in"), QDialogButtonBox::AcceptRole);
-}
-
 QWidget *LoginRequiredDialog::contentWidget() const
 {
     return _ui->contentWidget->currentWidget();

src/gui/loginrequireddialog/loginrequireddialog.h

@@ -16,7 +16,8 @@
 
 #include "abstractloginwidget.h"
 #include "account.h"
-#include <QDialog>
+
+#include <QWidget>
 
 namespace Ui {
 class LoginRequiredDialog;
@@ -28,7 +29,7 @@ namespace OCC {
  * This dialog is used to ask users to re-authenticate in case an existing account's credentials no longer work or the user logged out.
  * It is one of two locations in the code where we have users log in to their accounts (the other one is the setup wizard).
  */
-class LoginRequiredDialog : public QDialog
+class LoginRequiredDialog : public QWidget
 {
     Q_OBJECT
 
@@ -47,12 +48,6 @@ class LoginRequiredDialog : public QDialog
 
     void setTopLabelText(const QString &newText);
 
-    /**
-     * Add a "log in" button to the dialog. When clicked, the dialog is accepted.
-     * For use with HTTP basic authentication.
-     */
-    void addLogInButton();
-
     /**
      * Form widget currently shown to the user.
      * @return form widget