From 80ea67f7cf3fa8d74e595546e4c0828868d3b18a Mon Sep 17 00:00:00 2001 From: Trial97 Date: Thu, 13 Jun 2024 00:00:08 +0300 Subject: [PATCH] finish login dialog Signed-off-by: Trial97 --- launcher/ui/dialogs/MSALoginDialog.cpp | 11 ----------- launcher/ui/dialogs/MSALoginDialog.ui | 17 ++--------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp index 0a3bca86b..aebd04f08 100644 --- a/launcher/ui/dialogs/MSALoginDialog.cpp +++ b/launcher/ui/dialogs/MSALoginDialog.cpp @@ -60,8 +60,6 @@ MSALoginDialog::MSALoginDialog(QWidget* parent) : QDialog(parent), ui(new Ui::MS font.setFixedPitch(true); ui->code->setFont(font); - // ui->buttonBox->button(QDialogButtonBox::Help)->setDefault(false); - connect(ui->copyCode, &QPushButton::clicked, this, [this] { QApplication::clipboard()->setText(ui->code->text()); }); ui->qr->setPixmap(QIcon((":/documents/login-qr.svg")).pixmap(QSize(75, 75))); ui->title->setText(tr("Login to %1").arg(BuildConfig.LAUNCHER_DISPLAYNAME)); @@ -129,16 +127,7 @@ void MSALoginDialog::onTaskFailed(QString reason) void MSALoginDialog::authorizeWithBrowser(const QUrl& url) { ui->stackedWidget->setCurrentIndex(1); - // DesktopServices::openUrl(url); - const auto uri = url.toString(); - const auto linkString = QString("%2").arg(uri, uri); m_url = url; - ui->link->setText(linkString); - // ui->urlInfo->setText( - // tr("Browser opened to complete the login process." - // "

" - // "If your browser hasn't opened, please manually open the following link and choose your account:

")); - // ui->url->setText(linkString); } void MSALoginDialog::authorizeWithBrowserWithExtra(QString url, QString code, int expiresIn) diff --git a/launcher/ui/dialogs/MSALoginDialog.ui b/launcher/ui/dialogs/MSALoginDialog.ui index b2ad80270..cac91512e 100644 --- a/launcher/ui/dialogs/MSALoginDialog.ui +++ b/launcher/ui/dialogs/MSALoginDialog.ui @@ -6,8 +6,8 @@ 0 0 - 772 - 326 + 770 + 256 @@ -121,19 +121,6 @@ - - - - TextLabel - - - Qt::AlignCenter - - - true - - -