diff options
| author | seth <getchoo@tuta.io> | 2023-07-16 17:15:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-16 17:15:55 -0400 |
| commit | 5e0df9b6965fae285d35580d19d1ab9bbc39c16a (patch) | |
| tree | 6b93c3289a9e4d80586f7e4ff3b7ca8586b52412 /launcher | |
| parent | b54d1651ab5ec822bff92c3e44bfeb0fd601ee60 (diff) | |
| parent | 40fb387185527db5eb03be34ea35f24d3e7bedcd (diff) | |
| download | PrismLauncher-5e0df9b6965fae285d35580d19d1ab9bbc39c16a.tar.gz PrismLauncher-5e0df9b6965fae285d35580d19d1ab9bbc39c16a.tar.bz2 PrismLauncher-5e0df9b6965fae285d35580d19d1ab9bbc39c16a.zip | |
Merge pull request #1276 from Scrumplex/print-build-platform
Print build platform on launch
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/Application.cpp | 1 | ||||
| -rw-r--r-- | launcher/LaunchController.cpp | 5 | ||||
| -rw-r--r-- | launcher/ui/pages/global/AccountListPage.cpp | 13 |
3 files changed, 5 insertions, 14 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index e6070006..a9bcebb1 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -475,6 +475,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) qDebug() << BuildConfig.LAUNCHER_DISPLAYNAME << ", (c) 2013-2021 " << BuildConfig.LAUNCHER_COPYRIGHT; qDebug() << "Version : " << BuildConfig.printableVersionString(); + qDebug() << "Platform : " << BuildConfig.BUILD_PLATFORM; qDebug() << "Git commit : " << BuildConfig.GIT_COMMIT; qDebug() << "Git refspec : " << BuildConfig.GIT_REFSPEC; if (adjustedBy.size()) diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp index 5d84b3bf..2b52cac0 100644 --- a/launcher/LaunchController.cpp +++ b/launcher/LaunchController.cpp @@ -390,7 +390,10 @@ void LaunchController::launchInstance() m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), "Launched instance in " + online_mode + " mode\n", MessageLevel::Launcher)); // Prepend Version - m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), BuildConfig.LAUNCHER_DISPLAYNAME + " version: " + BuildConfig.printableVersionString() + "\n\n", MessageLevel::Launcher)); + { + auto versionString = QString("%1 version: %2 (%3)").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM); + m_launcher->prependStep(makeShared<TextPrint>(m_launcher.get(), versionString + "\n\n", MessageLevel::Launcher)); + } m_launcher->start(); } diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp index 278f45c4..fced5ff4 100644 --- a/launcher/ui/pages/global/AccountListPage.cpp +++ b/launcher/ui/pages/global/AccountListPage.cpp @@ -159,19 +159,6 @@ void AccountListPage::on_actionAddMojang_triggered() void AccountListPage::on_actionAddMicrosoft_triggered() { - if(BuildConfig.BUILD_PLATFORM == "osx64") { - CustomMessageBox::selectable( - this, - tr("Microsoft Accounts not available"), - //: %1 refers to the launcher itself - tr( - "Microsoft accounts are only usable on macOS 10.13 or newer, with fully updated %1.\n\n" - "Please update both your operating system and %1." - ).arg(BuildConfig.LAUNCHER_DISPLAYNAME), - QMessageBox::Warning - )->exec(); - return; - } MinecraftAccountPtr account = MSALoginDialog::newAccount( this, tr("Please enter your Mojang account email and password to add your account.") |