Merge branch 'develop' into remove-updater

1 files changed, 47 insertions, 16 deletions

diff --git a/launcher/ui/dialogs/BlockedModsDialog.h b/launcher/ui/dialogs/BlockedModsDialog.h
index dac43cba..014f488a 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.h
+++ b/launcher/ui/dialogs/BlockedModsDialog.h
@@ -1,49 +1,80 @@
+// SPDX-FileCopyrightText: 2022 Sefa Eyeoglu <contact@scrumplex.net>
+// SPDX-FileCopyrightText: 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+// SPDX-FileCopyrightText: 2022 kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 Rachel Powers <508861+Ryex@users.noreply.github.com>
+ *  Copyright (C) 2022 kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <QDialog>
-#include <QString>
 #include <QList>
+#include <QString>
 
 #include <QFileSystemWatcher>
 
-#include "modplatform/helpers/HashUtils.h"
-
 #include "tasks/ConcurrentTask.h"
 
+class QPushButton;
+
 struct BlockedMod {
     QString name;
     QString websiteUrl;
     QString hash;
     bool matched;
     QString localPath;
-
+    QString targetFolder;
 };
 
 QT_BEGIN_NAMESPACE
-namespace Ui { class BlockedModsDialog; }
+namespace Ui {
+class BlockedModsDialog;
+}
 QT_END_NAMESPACE
 
 class BlockedModsDialog : public QDialog {
-Q_OBJECT
+    Q_OBJECT
 
-public:
-    BlockedModsDialog(QWidget *parent, const QString &title, const QString &text, QList<BlockedMod> &mods);
+   public:
+    BlockedModsDialog(QWidget* parent, const QString& title, const QString& text, QList<BlockedMod>& mods);
 
     ~BlockedModsDialog() override;
 
-protected:
-    void dragEnterEvent(QDragEnterEvent *event) override;
-    void dropEvent(QDropEvent *event) override;
+   protected:
+    void dragEnterEvent(QDragEnterEvent* event) override;
+    void dropEvent(QDropEvent* event) override;
+
+   protected slots:
+    void done(int r) override;
 
-private:
-    Ui::BlockedModsDialog *ui;
-    QList<BlockedMod> &m_mods;
+   private:
+    Ui::BlockedModsDialog* ui;
+    QList<BlockedMod>& m_mods;
     QFileSystemWatcher m_watcher;
     shared_qobject_ptr<ConcurrentTask> m_hashing_task;
     QSet<QString> m_pending_hash_paths;
     bool m_rehash_pending;
+    QPushButton* m_openMissingButton;
 
-    void openAll();
+    void openAll(bool missingOnly);
     void addDownloadFolder();
     void update();
     void directoryChanged(QString path);
@@ -61,4 +92,4 @@ private:
     bool allModsMatched();
 };
 
-QDebug operator<<(QDebug debug, const BlockedMod &m);
+QDebug operator<<(QDebug debug, const BlockedMod& m);