From 13c7efa0584caf34950a6e6efa4b8e3bee16d764 Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Tue, 25 Oct 2022 10:59:37 -0700
Subject: copy found mods to instance (FTB and Flame)
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
launcher/ui/dialogs/BlockedModsDialog.cpp | 7 ++++++
launcher/ui/dialogs/BlockedModsDialog.h | 1 +
launcher/ui/dialogs/BlockedModsDialog.ui | 37 ++++++++++++++++++++-----------
3 files changed, 32 insertions(+), 13 deletions(-)
(limited to 'launcher/ui')
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 9ba033d7..542d0681 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -31,6 +31,7 @@ BlockedModsDialog::BlockedModsDialog(QWidget *parent, const QString &title, cons
this->setWindowTitle(title);
ui->label->setText(text);
+ ui->labelModsFound->setText("Please download the missing mods.");
update();
}
@@ -60,6 +61,12 @@ void BlockedModsDialog::update() {
}
ui->textBrowser->setText(text);
+
+ if (allModsMatched()) {
+ ui->labelModsFound->setText("All mods found ✔");
+ } else {
+ ui->labelModsFound->setText("Please download the missing mods.");
+ }
}
void BlockedModsDialog::directoryChanged(QString path) {
diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index f1ea99ca..93b9f46a 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -51,3 +51,4 @@ private:
bool allModsMatched();
};
+QDebug operator<<(QDebug debug, const BlockedMod &m);
\ No newline at end of file
diff --git a/launcher/ui/dialogs/BlockedModsDialog.ui b/launcher/ui/dialogs/BlockedModsDialog.ui
index f4ae95b6..371549cf 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.ui
+++ b/launcher/ui/dialogs/BlockedModsDialog.ui
@@ -13,8 +13,8 @@
BlockedModsDialog
-
- -
+
+
-
@@ -24,17 +24,7 @@
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
- -
+
-
true
@@ -44,6 +34,27 @@
+ -
+
+
-
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
+
--
cgit