Merge pull request #897 from jamierocks/atl-updating-initial

4 files changed, 158 insertions, 58 deletions

diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
index 8de5211c..7901b90b 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.cpp
@@ -37,13 +37,12 @@
 #include "AtlPage.h"
 #include "ui_AtlPage.h"
 
-#include "modplatform/atlauncher/ATLPackInstallTask.h"
+#include "BuildConfig.h"
 
 #include "AtlOptionalModDialog.h"
+#include "AtlUserInteractionSupportImpl.h"
+#include "modplatform/atlauncher/ATLPackInstallTask.h"
 #include "ui/dialogs/NewInstanceDialog.h"
-#include "ui/dialogs/VersionSelectDialog.h"
-
-#include <BuildConfig.h>
 
 #include <QMessageBox>
 
@@ -117,7 +116,9 @@ void AtlPage::suggestCurrent()
         return;
     }
 
-    dialog->setSuggestedPack(selected.name + " " + selectedVersion, new ATLauncher::PackInstallTask(this, selected.name, selectedVersion));
+    auto uiSupport = new AtlUserInteractionSupportImpl(this);
+    dialog->setSuggestedPack(selected.name + " " + selectedVersion, new ATLauncher::PackInstallTask(uiSupport, selected.name, selectedVersion));
+
     auto editedLogoName = selected.safeName;
     auto url = QString(BuildConfig.ATL_DOWNLOAD_SERVER_URL + "launcher/images/%1.png").arg(selected.safeName.toLower());
     listModel->getLogo(selected.safeName, url, [this, editedLogoName](QString logo)
@@ -172,51 +173,3 @@ void AtlPage::onVersionSelectionChanged(QString data)
     selectedVersion = data;
     suggestCurrent();
 }
-
-QVector<QString> AtlPage::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
-{
-    AtlOptionalModDialog optionalModDialog(this, version, mods);
-    optionalModDialog.exec();
-    return optionalModDialog.getResult();
-}
-
-QString AtlPage::chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) {
-    VersionSelectDialog vselect(vlist.get(), "Choose Version", APPLICATION->activeWindow(), false);
-    if (minecraftVersion != Q_NULLPTR) {
-        vselect.setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
-        vselect.setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
-    }
-    else {
-        vselect.setEmptyString(tr("No versions are currently available"));
-    }
-    vselect.setEmptyErrorString(tr("Couldn't load or download the version lists!"));
-
-    // select recommended build
-    for (int i = 0; i < vlist->versions().size(); i++) {
-        auto version = vlist->versions().at(i);
-        auto reqs = version->requires();
-
-        // filter by minecraft version, if the loader depends on a certain version.
-        if (minecraftVersion != Q_NULLPTR) {
-            auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require &req) {
-                return req.uid == "net.minecraft";
-            });
-            if (iter == reqs.end()) continue;
-            if (iter->equalsVersion != minecraftVersion) continue;
-        }
-
-        // first recommended build we find, we use.
-        if (version->isRecommended()) {
-            vselect.setCurrentVersion(version->descriptor());
-            break;
-        }
-    }
-
-    vselect.exec();
-    return vselect.selectedVersion()->descriptor();
-}
-
-void AtlPage::displayMessage(QString message)
-{
-    QMessageBox::information(this, tr("Installing"), message);
-}
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
index aa6d5da1..1b3b15c1 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlPage.h
@@ -52,7 +52,7 @@ namespace Ui
 
 class NewInstanceDialog;
 
-class AtlPage : public QWidget, public BasePage, public ATLauncher::UserInteractionSupport
+class AtlPage : public QWidget, public BasePage
 {
 Q_OBJECT
 
@@ -83,10 +83,6 @@ public:
 private:
     void suggestCurrent();
 
-    QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) override;
-    QVector<QString> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override;
-    void displayMessage(QString message) override;
-
 private slots:
     void triggerSearch();
 
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
new file mode 100644
index 00000000..03196685
--- /dev/null
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *  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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include <QMessageBox>
+#include "AtlUserInteractionSupportImpl.h"
+
+#include "AtlOptionalModDialog.h"
+#include "ui/dialogs/VersionSelectDialog.h"
+
+AtlUserInteractionSupportImpl::AtlUserInteractionSupportImpl(QWidget *parent) : m_parent(parent)
+{
+}
+
+QVector<QString> AtlUserInteractionSupportImpl::chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods)
+{
+    AtlOptionalModDialog optionalModDialog(m_parent, version, mods);
+    optionalModDialog.exec();
+    return optionalModDialog.getResult();
+}
+
+QString AtlUserInteractionSupportImpl::chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion)
+{
+    VersionSelectDialog vselect(vlist.get(), "Choose Version", m_parent, false);
+    if (minecraftVersion != nullptr) {
+        vselect.setExactFilter(BaseVersionList::ParentVersionRole, minecraftVersion);
+        vselect.setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
+    }
+    else {
+        vselect.setEmptyString(tr("No versions are currently available"));
+    }
+    vselect.setEmptyErrorString(tr("Couldn't load or download the version lists!"));
+
+    // select recommended build
+    for (int i = 0; i < vlist->versions().size(); i++) {
+        auto version = vlist->versions().at(i);
+        auto reqs = version->requires();
+
+        // filter by minecraft version, if the loader depends on a certain version.
+        if (minecraftVersion != nullptr) {
+            auto iter = std::find_if(reqs.begin(), reqs.end(), [](const Meta::Require& req) {
+                return req.uid == "net.minecraft";
+            });
+            if (iter == reqs.end())
+                continue;
+            if (iter->equalsVersion != minecraftVersion)
+                continue;
+        }
+
+        // first recommended build we find, we use.
+        if (version->isRecommended()) {
+            vselect.setCurrentVersion(version->descriptor());
+            break;
+        }
+    }
+
+    vselect.exec();
+    return vselect.selectedVersion()->descriptor();
+}
+
+void AtlUserInteractionSupportImpl::displayMessage(QString message)
+{
+    QMessageBox::information(m_parent, tr("Installing"), message);
+}
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
new file mode 100644
index 00000000..aa22fc73
--- /dev/null
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.h
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *  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/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2020-2021 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#pragma once
+
+#include <QObject>
+
+#include "modplatform/atlauncher/ATLPackInstallTask.h"
+
+class AtlUserInteractionSupportImpl : public QObject, public ATLauncher::UserInteractionSupport {
+    Q_OBJECT
+
+public:
+    AtlUserInteractionSupportImpl(QWidget* parent);
+
+private:
+    QString chooseVersion(Meta::VersionListPtr vlist, QString minecraftVersion) override;
+    QVector<QString> chooseOptionalMods(ATLauncher::PackVersion version, QVector<ATLauncher::VersionMod> mods) override;
+    void displayMessage(QString message) override;
+
+private:
+    QWidget* m_parent;
+
+};