From 5909af9878d67f2900c92e8d1dd3eec7a53a840a Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 11 Nov 2022 14:10:45 -0700
Subject: drag&drop + add folder to watch
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 8 ++++++--
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 6 +++++-
2 files changed, 11 insertions(+), 3 deletions(-)
(limited to 'launcher/modplatform')
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index f0fbdc96..eff729eb 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -393,8 +393,12 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
qWarning() << "Blocked mods found, displaying mod list";
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"),
- tr("The following mods were blocked on third party launchers.
"
- "You will need to manually download them and add them to the modpack"),
+ tr("The following files are not available for download in third party launchers.
"
+ "You will need to manually download them and add them to the instance.
"
+ "Your configured global mods folder and default downloads folder
"
+ "are automatically checked for the downloaded mods.
"
+ "Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
+ "if you did not download the mods to a default location."),
blocked_mods);
message_dialog->setModal(true);
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 40aee82b..d74faf08 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -212,7 +212,11 @@ void PackInstallTask::onResolveModsSucceeded()
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked files found"),
tr("The following files are not available for download in third party launchers.
"
- "You will need to manually download them and add them to the instance."),
+ "You will need to manually download them and add them to the instance.
"
+ "Your configured global mods folder and default downloads folder
"
+ "are automatically checked for the downloaded mods.
"
+ "Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
+ "if you did not download the mods to a default location."),
m_blocked_mods);
if (message_dialog->exec() == QDialog::Accepted) {
--
cgit
From 3f6cc178188a28e551755219bfa0a441ad8cfdcf Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 11 Nov 2022 15:45:40 -0700
Subject: properly handle a currently running hashing task
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 2 +-
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'launcher/modplatform')
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index eff729eb..4b9e7b86 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -396,7 +396,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
tr("The following files are not available for download in third party launchers.
"
"You will need to manually download them and add them to the instance.
"
"Your configured global mods folder and default downloads folder
"
- "are automatically checked for the downloaded mods.
"
+ "are automatically checked for the downloaded mods and they will be copied to the instance if found.
"
"Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
"if you did not download the mods to a default location."),
blocked_mods);
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index d74faf08..26d0c5a1 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -214,7 +214,7 @@ void PackInstallTask::onResolveModsSucceeded()
tr("The following files are not available for download in third party launchers.
"
"You will need to manually download them and add them to the instance.
"
"Your configured global mods folder and default downloads folder
"
- "are automatically checked for the downloaded mods.
"
+ "are automatically checked for the downloaded mods and they will be copied to the instance if found.
"
"Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
"if you did not download the mods to a default location."),
m_blocked_mods);
--
cgit
From 9af1b00df52d974a53925345efcd5c047b7d041c Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 11 Nov 2022 18:05:19 -0700
Subject: feat: add list of watched folders move explanation text into dialog
class and it's own label
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
launcher/modplatform/flame/FlameInstanceCreationTask.cpp | 11 ++++-------
launcher/modplatform/modpacksch/FTBPackInstallTask.cpp | 15 +++++----------
2 files changed, 9 insertions(+), 17 deletions(-)
(limited to 'launcher/modplatform')
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index 4b9e7b86..91554b58 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -393,13 +393,10 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
qWarning() << "Blocked mods found, displaying mod list";
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked mods found"),
- tr("The following files are not available for download in third party launchers.
"
- "You will need to manually download them and add them to the instance.
"
- "Your configured global mods folder and default downloads folder
"
- "are automatically checked for the downloaded mods and they will be copied to the instance if found.
"
- "Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
- "if you did not download the mods to a default location."),
- blocked_mods);
+ tr("The following files are not available for download in third party launchers.
"
+ "You will need to manually download them and add them to the instance."),
+ blocked_mods);
+
message_dialog->setModal(true);
if (message_dialog->exec()) {
diff --git a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
index 26d0c5a1..4c7b7a4f 100644
--- a/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
+++ b/launcher/modplatform/modpacksch/FTBPackInstallTask.cpp
@@ -211,22 +211,17 @@ void PackInstallTask::onResolveModsSucceeded()
qDebug() << "Blocked files found, displaying file list";
auto message_dialog = new BlockedModsDialog(m_parent, tr("Blocked files found"),
- tr("The following files are not available for download in third party launchers.
"
- "You will need to manually download them and add them to the instance.
"
- "Your configured global mods folder and default downloads folder
"
- "are automatically checked for the downloaded mods and they will be copied to the instance if found.
"
- "Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch
"
- "if you did not download the mods to a default location."),
- m_blocked_mods);
+ tr("The following files are not available for download in third party launchers.
"
+ "You will need to manually download them and add them to the instance."),
+ m_blocked_mods);
if (message_dialog->exec() == QDialog::Accepted) {
qDebug() << "Post dialog blocked mods list: " << m_blocked_mods;
createInstance();
- }
- else {
+ } else {
abort();
}
-
+
} else {
createInstance();
}
--
cgit