diff --git a/launcher/ui/dialogs/MSALoginDialog.cpp b/launcher/ui/dialogs/MSALoginDialog.cpp index 5f311e625..9c93df264 100644 --- a/launcher/ui/dialogs/MSALoginDialog.cpp +++ b/launcher/ui/dialogs/MSALoginDialog.cpp @@ -126,14 +126,7 @@ void MSALoginDialog::authorizeWithBrowserWithExtra(QString url, QString code, in const auto linkString = QString("%2").arg(url, url); ui->code->setText(code); ui->codeInfo->setText(tr("
Enter this code into %1 and choose your account.
").arg(linkString)); - - const auto isDefaultUrl = url == "https://www.microsoft.com/link"; - - ui->qr->setVisible(isDefaultUrl); - if (isDefaultUrl && !code.isEmpty()) { - url += QString("?otc=%1").arg(code); - } - DesktopServices::openUrl(url); + ui->qr->setVisible(url == "https://www.microsoft.com/link"); } void MSALoginDialog::onTaskStatus(QString status) diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index 3c77cb97a..d2350fb70 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -132,10 +132,10 @@ void AccountListPage::on_actionAddMicrosoft_triggered() { QMessageBox box(this); box.setWindowTitle(tr("Add account")); - box.setText(tr("How do you want to login?")); + box.setText(tr("Where would you like to login?")); box.setIcon(QMessageBox::Question); - auto deviceCode = box.addButton(tr("Remote"), QMessageBox::ButtonRole::YesRole); - auto authCode = box.addButton(tr("Recommended"), QMessageBox::ButtonRole::NoRole); + auto authCode = box.addButton(tr("On this device"), QMessageBox::ButtonRole::NoRole); + auto deviceCode = box.addButton(tr("On another device"), QMessageBox::ButtonRole::YesRole); auto cancel = box.addButton(tr("Cancel"), QMessageBox::ButtonRole::RejectRole); box.setDefaultButton(authCode); box.exec();