diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 7654ff29d..6d6e2ae7f 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -1073,8 +1073,6 @@ SET(LAUNCHER_SOURCES ui/dialogs/ResourceDownloadDialog.h ui/dialogs/ScrollMessageBox.cpp ui/dialogs/ScrollMessageBox.h - ui/dialogs/UpdateCheckFailedDialog.cpp - ui/dialogs/UpdateCheckFailedDialog.h ui/dialogs/BlockedModsDialog.cpp ui/dialogs/BlockedModsDialog.h ui/dialogs/ChooseProviderDialog.h diff --git a/launcher/ui/dialogs/ResourceUpdateDialog.cpp b/launcher/ui/dialogs/ResourceUpdateDialog.cpp index 39fedc5d7..715a1a3fa 100644 --- a/launcher/ui/dialogs/ResourceUpdateDialog.cpp +++ b/launcher/ui/dialogs/ResourceUpdateDialog.cpp @@ -5,7 +5,6 @@ #include "ProgressDialog.h" #include "ScrollMessageBox.h" #include "StringUtils.h" -#include "UpdateCheckFailedDialog.h" #include "minecraft/mod/tasks/GetModDependenciesTask.h" #include "modplatform/ModIndex.h" #include "modplatform/flame/FlameAPI.h" @@ -176,7 +175,10 @@ void ResourceUpdateDialog::checkCandidates() text += "
"; } - UpdateCheckFailedDialog message_dialog(m_parent, text); + ScrollMessageBox message_dialog(m_parent, tr("Failed to check for updates"), + tr("Could not check or get the following resources for updates:
" + "Do you wish to proceed without those resources?"), + text, "Disable unavailable mods"); message_dialog.setModal(true); if (message_dialog.exec() == QDialog::Rejected) { m_aborted = true; @@ -184,7 +186,7 @@ void ResourceUpdateDialog::checkCandidates() return; } - // Disable incompatible mods + // Disable unavailable mods if (message_dialog.isOptionChecked()) { for (const auto& failed : m_failedCheckUpdate) { const auto& mod = std::get<0>(failed); diff --git a/launcher/ui/dialogs/ScrollMessageBox.cpp b/launcher/ui/dialogs/ScrollMessageBox.cpp index d2652b0c9..361b610be 100644 --- a/launcher/ui/dialogs/ScrollMessageBox.cpp +++ b/launcher/ui/dialogs/ScrollMessageBox.cpp @@ -2,7 +2,7 @@ #include #include "ui_ScrollMessageBox.h" -ScrollMessageBox::ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body) +ScrollMessageBox::ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body, const QString& option) : QDialog(parent), ui(new Ui::ScrollMessageBox) { ui->setupUi(this); @@ -10,6 +10,11 @@ ScrollMessageBox::ScrollMessageBox(QWidget* parent, const QString& title, const ui->label->setText(text); ui->textBrowser->setText(body); + if (!option.isEmpty()) { + ui->optionCheckBox->setVisible(true); + ui->optionCheckBox->setText(option); + } + ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK")); } diff --git a/launcher/ui/dialogs/ScrollMessageBox.h b/launcher/ui/dialogs/ScrollMessageBox.h index 774dd2cbc..0dfadff33 100644 --- a/launcher/ui/dialogs/ScrollMessageBox.h +++ b/launcher/ui/dialogs/ScrollMessageBox.h @@ -12,7 +12,7 @@ class ScrollMessageBox : public QDialog { Q_OBJECT public: - ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body); + ScrollMessageBox(QWidget* parent, const QString& title, const QString& text, const QString& body, const QString& option = QString()); ~ScrollMessageBox() override; diff --git a/launcher/ui/dialogs/UpdateCheckFailedDialog.cpp b/launcher/ui/dialogs/UpdateCheckFailedDialog.cpp deleted file mode 100644 index 7b97fad21..000000000 --- a/launcher/ui/dialogs/UpdateCheckFailedDialog.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "UpdateCheckFailedDialog.h" -#include "ui_ScrollMessageBox.h" - -UpdateCheckFailedDialog::UpdateCheckFailedDialog(QWidget* parent, const QString& body) - : ScrollMessageBox(parent, - tr("Failed to check for updates"), - tr("Could not check or get the following resources for updates:
" - "Do you wish to proceed without those resources?"), - body) -{ - ui->optionCheckBox->setVisible(true); - ui->optionCheckBox->setText(tr("Disable unavailable mods")); -} \ No newline at end of file diff --git a/launcher/ui/dialogs/UpdateCheckFailedDialog.h b/launcher/ui/dialogs/UpdateCheckFailedDialog.h deleted file mode 100644 index 570821c5b..000000000 --- a/launcher/ui/dialogs/UpdateCheckFailedDialog.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "ScrollMessageBox.h" - -class UpdateCheckFailedDialog final : public ScrollMessageBox { - Q_OBJECT - - public: - explicit UpdateCheckFailedDialog(QWidget* parent, const QString& body); -}; \ No newline at end of file