From a3173b53717fcea686f267f4eb8fd9788e6677db Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 7 Apr 2023 16:54:25 -0700
Subject: fix: ensure Application accepts URLs and local files form cmd args
 refactor: Move curseforge:// url scheme detection to Import Page feat: pass
 along extra CF pack info so pack metadata is established.

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/Application.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.h b/launcher/Application.h
index ced0af17..83bfa9ef 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -211,6 +211,8 @@ public:
 
     int suitableMaxMem();
 
+    void addImportUrl(QString const& url);
+
 signals:
     void updateAllowedChanged(bool status);
     void globalSettingsAboutToOpen();
@@ -314,7 +316,7 @@ public:
     QString m_serverToJoin;
     QString m_profileToUse;
     bool m_liveCheck = false;
-    QList<QUrl> m_zipsToImport;
+    QList<QUrl> m_urlsToImport;
     QString m_instanceIdToShowWindowOf;
     std::unique_ptr<QFile> logFile;
 };
-- 
cgit 


From b1ffc8ddab7d9aff10b6195a75e6e58c43b233ca Mon Sep 17 00:00:00 2001
From: Rachel Powers <508861+Ryex@users.noreply.github.com>
Date: Fri, 12 May 2023 16:37:45 -0700
Subject: refactor: normalize url fn & cleanup

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
---
 launcher/Application.cpp                     | 45 +++++++++----------------
 launcher/Application.h                       |  2 +-
 launcher/InstanceImportTask.cpp              |  2 +-
 launcher/ui/pages/modplatform/ImportPage.cpp | 50 +++++++++++-----------------
 4 files changed, 36 insertions(+), 63 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 5effc01b..edaccadf 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -235,12 +235,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
     m_instanceIdToShowWindowOf = parser.value("show");
 
     for (auto url : parser.values("import")){
-        addImportUrl(url);
+        m_urlsToImport.append(normalizeImportUrl(url));
     }
 
     // treat unspecified positional arguments as import urls
     for (auto url : parser.positionalArguments()) {
-        addImportUrl(url);
+        m_urlsToImport.append(normalizeImportUrl(url));
     }
 
     // error if --launch is missing with --server or --profile
@@ -345,12 +345,11 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
                 activate.command = "activate";
                 m_peerInstance->sendMessage(activate.serialize(), timeout);
 
-                if(!m_urlsToImport.isEmpty())
-                {
+                if (!m_urlsToImport.isEmpty()) {
                     for (auto url : m_urlsToImport) {
                         ApplicationMessage import;
                         import.command = "import";
-                        import.args.insert("path", url.toString());
+                        import.args.insert("url", url.toString());
                         m_peerInstance->sendMessage(import.serialize(), timeout);
                     }
                 }
@@ -1071,27 +1070,16 @@ void Application::messageReceived(const QByteArray& message)
 
     auto & command = received.command;
 
-    if(command == "activate")
-    {
+    if (command == "activate") {
         showMainWindow();
-    }
-    else if(command == "import")
-    {
-        QString path = received.args["path"];
-        if(path.isEmpty())
-        {
+    } else if (command == "import") {
+        QString url = received.args["url"];
+        if (url.isEmpty()) {
             qWarning() << "Received" << command << "message without a zip path/URL.";
             return;
         }
-        auto local_file = QFileInfo(path);
-        if (local_file.exists()) {
-            m_mainWindow->processURLs({ QUrl::fromLocalFile(local_file.absoluteFilePath()) });        
-        } else {
-            m_mainWindow->processURLs({ QUrl::fromUserInput(path) });
-        }
-    }
-    else if(command == "launch")
-    {
+        m_mainWindow->processURLs({ normalizeImportUrl(url) });
+    } else if (command == "launch") {
         QString id = received.args["id"];
         QString server = received.args["server"];
         QString profile = received.args["profile"];
@@ -1131,9 +1119,7 @@ void Application::messageReceived(const QByteArray& message)
             serverObject,
             accountObject
         );
-    }
-    else
-    {
+    } else {
         qWarning() << "Received invalid message" << message;
     }
 }
@@ -1741,13 +1727,12 @@ void Application::triggerUpdateCheck()
     }
 }
 
-void Application::addImportUrl(QString const& url)
+QUrl Application::normalizeImportUrl(QString const& url)
 {
     auto local_file = QFileInfo(url);
-    if (local_file.exists()){
-        m_urlsToImport.append(QUrl::fromLocalFile(local_file.absoluteFilePath()));
+    if (local_file.exists()) {
+        return QUrl::fromLocalFile(local_file.absoluteFilePath());
     } else {
-        m_urlsToImport.append(QUrl::fromUserInput(url));
+        return QUrl::fromUserInput(url);
     }
 }
-
diff --git a/launcher/Application.h b/launcher/Application.h
index 83bfa9ef..97d33830 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -211,7 +211,7 @@ public:
 
     int suitableMaxMem();
 
-    void addImportUrl(QString const& url);
+    QUrl normalizeImportUrl(QString const& url);
 
 signals:
     void updateAllowedChanged(bool status);
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index 41b7898c..badcf0a2 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -90,7 +90,7 @@ void InstanceImportTask::executeTask()
         setStatus(tr("Downloading modpack:\n%1").arg(m_sourceUrl.toString()));
         m_downloadRequired = true;
 
-            downloadFromUrl();
+        downloadFromUrl();
     }
 }
 
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index 78b7d1d5..315f6555 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -102,16 +102,13 @@ void ImportPage::openedImpl()
 
 void ImportPage::updateState()
 {
-    if(!isOpened)
-    {
+    if (!isOpened) {
         return;
     }
-    if(ui->modpackEdit->hasAcceptableInput())
-    {
+    if (ui->modpackEdit->hasAcceptableInput()) {
         QString input = ui->modpackEdit->text();
         auto url = QUrl::fromUserInput(input);
-        if(url.isLocalFile())
-        {
+        if (url.isLocalFile()) {
             // FIXME: actually do some validation of what's inside here... this is fake AF
             QFileInfo fi(input);
 
@@ -120,15 +117,12 @@ void ImportPage::updateState()
             // mrpack is a modrinth pack
             bool isMRPack = fi.suffix() == "mrpack";
 
-            if(fi.exists() && (isZip || isMRPack))
-            {
+            if (fi.exists() && (isZip || isMRPack)) {
                 QFileInfo fi(url.fileName());
-                dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url,this));
+                dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this));
                 dialog->setSuggestedIcon("default");
             }
-        }
-        else if (url.scheme() == "curseforge")
-        {
+        } else if (url.scheme() == "curseforge") {
             // need to find the download link for the modpack
             // format of url curseforge://install?addonId=IDHERE&fileId=IDHERE
             QUrlQuery query(url);
@@ -139,12 +133,9 @@ void ImportPage::updateState()
             req->addNetAction(
                 Net::Download::makeByteArray(QUrl(QString("https://api.curseforge.com/v1/mods/%1/files/%2").arg(addonId, fileId)), array));
 
-            connect(req.get(), &NetJob::finished, [array] {
-                delete array;
-            });
-            connect(req.get(), &NetJob::failed, this, [this](QString reason){
-                CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
-            });
+            connect(req.get(), &NetJob::finished, [array] { delete array; });
+            connect(req.get(), &NetJob::failed, this,
+                    [this](QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });
             connect(req.get(), &NetJob::succeeded, this, [this, array, addonId, fileId] {
                 qDebug() << "Returned CFURL Json:\n" << array->toStdString().c_str();
                 auto doc = Json::requireDocument(*array);
@@ -156,12 +147,15 @@ void ImportPage::updateState()
                     auto dl_url = QUrl(
                         Json::ensureString(Json::ensureObject(Json::ensureObject(doc.object()), "data"), "downloadUrl", "", "downloadUrl"));
                     if (!dl_url.isValid()) {
-                        CustomMessageBox::selectable(this, tr("Error"), tr("The modpack is blocked ! Please download it manually"), QMessageBox::Critical)->show();
+                        CustomMessageBox::selectable(this, tr("Error"), tr("The modpack is blocked ! Please download it manually"),
+                                                     QMessageBox::Critical)
+                            ->show();
                         return;
                     }
 
                     QFileInfo dl_file(dl_url.fileName());
-                    QString pack_name = Json::ensureString(Json::ensureObject(Json::ensureObject(doc.object()), "data"), "displayName", dl_file.completeBaseName(), "displayName");
+                    QString pack_name = Json::ensureString(Json::ensureObject(Json::ensureObject(doc.object()), "data"), "displayName",
+                                                           dl_file.completeBaseName(), "displayName");
 
                     QMap<QString, QString> extra_info;
                     extra_info.insert("pack_id", addonId);
@@ -169,7 +163,7 @@ void ImportPage::updateState()
 
                     dialog->setSuggestedPack(pack_name, new InstanceImportTask(dl_url, this, std::move(extra_info)));
                     dialog->setSuggestedIcon("default");
-                    
+
                 } else {
                     CustomMessageBox::selectable(this, tr("Error"), tr("This url isn't a valid modpack !"), QMessageBox::Critical)->show();
                 }
@@ -178,24 +172,18 @@ void ImportPage::updateState()
             dlUrlDialod.setSkipButton(true, tr("Abort"));
             dlUrlDialod.execWithTask(req.get());
             return;
-        }
-        else
-        {
-            
-
-            if(input.endsWith("?client=y")) {
+        } else {
+            if (input.endsWith("?client=y")) {
                 input.chop(9);
                 input.append("/file");
                 url = QUrl::fromUserInput(input);
             }
             // hook, line and sinker.
             QFileInfo fi(url.fileName());
-            dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url,this));
+            dialog->setSuggestedPack(fi.completeBaseName(), new InstanceImportTask(url, this));
             dialog->setSuggestedIcon("default");
         }
-    }
-    else
-    {
+    } else {
         dialog->setSuggestedPack();
     }
 }
-- 
cgit 


From 22327bbe71b271a126521db737101ae07ba26f8d Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 6 Jul 2023 18:04:44 +0100
Subject: Combine launch buttons in Instance window, persist profiler

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp                   |  21 +++--
 launcher/Application.h                     |  13 ++--
 launcher/BaseInstance.cpp                  |   5 +-
 launcher/BaseInstance.h                    |  14 +++-
 launcher/LaunchController.cpp              |  10 +--
 launcher/NullInstance.h                    |   6 +-
 launcher/minecraft/MinecraftInstance.cpp   |  50 +++++++++++-
 launcher/minecraft/MinecraftInstance.h     |   4 +-
 launcher/ui/InstanceWindow.cpp             | 115 ++++++++--------------------
 launcher/ui/InstanceWindow.h               |  16 ++--
 launcher/ui/MainWindow.cpp                 | 119 ++---------------------------
 launcher/ui/MainWindow.h                   |   8 +-
 launcher/ui/MainWindow.ui                  |  22 +-----
 launcher/ui/pages/instance/ServersPage.cpp |   4 +-
 14 files changed, 143 insertions(+), 264 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 1d97a5f2..625cebd3 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1005,7 +1005,7 @@ void Application::performMainStartupAction()
                 qDebug() << "   Launching with account" << m_profileToUse;
             }
 
-            launch(inst, true, false, nullptr, serverToJoin, accountToUse);
+            launch(inst, true, false, serverToJoin, accountToUse);
             return;
         }
     }
@@ -1120,7 +1120,6 @@ void Application::messageReceived(const QByteArray& message)
             instance,
             true,
             false,
-            nullptr,
             serverObject,
             accountObject
         );
@@ -1187,14 +1186,12 @@ bool Application::openJsonEditor(const QString &filename)
     }
 }
 
-bool Application::launch(
-        InstancePtr instance,
-        bool online,
-        bool demo,
-        BaseProfilerFactory *profiler,
-        MinecraftServerTargetPtr serverToJoin,
-        MinecraftAccountPtr accountToUse
-) {
+bool Application::launch(InstancePtr instance,
+                         bool online,
+                         bool demo,
+                         MinecraftServerTargetPtr serverToJoin,
+                         MinecraftAccountPtr accountToUse)
+{
     if(m_updateRunning)
     {
         qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed.";
@@ -1202,7 +1199,7 @@ bool Application::launch(
     else if(instance->canLaunch())
     {
         auto & extras = m_instanceExtras[instance->id()];
-        auto & window = extras.window;
+        auto window = extras.window;
         if(window)
         {
             if(!window->saveAll())
@@ -1215,7 +1212,7 @@ bool Application::launch(
         controller->setInstance(instance);
         controller->setOnline(online);
         controller->setDemo(demo);
-        controller->setProfiler(profiler);
+        controller->setProfiler(profilers().value(instance->settings()->get("Profiler").toString(), nullptr).get());
         controller->setServerToJoin(serverToJoin);
         controller->setAccountToUse(accountToUse);
         if(window)
diff --git a/launcher/Application.h b/launcher/Application.h
index ced0af17..b911edc1 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -222,14 +222,11 @@ signals:
 #endif
 
 public slots:
-    bool launch(
-        InstancePtr instance,
-        bool online = true,
-        bool demo = false,
-        BaseProfilerFactory *profiler = nullptr,
-        MinecraftServerTargetPtr serverToJoin = nullptr,
-        MinecraftAccountPtr accountToUse = nullptr
-    );
+    bool launch(InstancePtr instance,
+                bool online = true,
+                bool demo = false,
+                MinecraftServerTargetPtr serverToJoin = nullptr,
+                MinecraftAccountPtr accountToUse = nullptr);
     bool kill(InstancePtr instance);
     void closeCurrentWindow();
 
diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp
index a8fce879..28b4cb5c 100644
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -101,6 +102,8 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
     m_settings->registerSetting("ManagedPackName", "");
     m_settings->registerSetting("ManagedPackVersionID", "");
     m_settings->registerSetting("ManagedPackVersionName", "");
+
+    m_settings->registerSetting("Profiler", "");
 }
 
 QString BaseInstance::getPreLaunchCommand()
diff --git a/launcher/BaseInstance.h b/launcher/BaseInstance.h
index 83a8064f..7da4e20b 100644
--- a/launcher/BaseInstance.h
+++ b/launcher/BaseInstance.h
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -37,11 +38,12 @@
 #pragma once
 #include <cassert>
 
-#include <QObject>
-#include "QObjectPtr.h"
 #include <QDateTime>
-#include <QSet>
+#include <QMenu>
+#include <QObject>
 #include <QProcess>
+#include <QSet>
+#include "QObjectPtr.h"
 
 #include "settings/SettingsObject.h"
 
@@ -270,6 +272,8 @@ public:
     virtual bool canEdit() const = 0;
     virtual bool canExport() const = 0;
 
+    virtual void populateLaunchMenu(QMenu* menu) = 0;
+
     bool reloadSettings();
 
     /**
@@ -306,6 +310,8 @@ signals:
 
     void runningStatusChanged(bool running);
 
+    void profilerChanged();
+
     void statusChanged(Status from, Status to);
 
 protected slots:
diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp
index 070ee283..5a79b253 100644
--- a/launcher/LaunchController.cpp
+++ b/launcher/LaunchController.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -406,22 +407,21 @@ void LaunchController::readyForLaunch()
     if (!m_profiler->check(&error))
     {
         m_launcher->abort();
-        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Couldn't start profiler: %1").arg(error));
         emitFailed("Profiler startup failed!");
+        QMessageBox::critical(m_parentWidget, tr("Error!"), tr("Profiler check for %1 failed: %2").arg(m_profiler->name(), error));
         return;
     }
     BaseProfiler *profilerInstance = m_profiler->createProfiler(m_launcher->instance(), this);
 
     connect(profilerInstance, &BaseProfiler::readyToLaunch, [this](const QString & message)
     {
-        QMessageBox msg;
+        QMessageBox msg(m_parentWidget);
         msg.setText(tr("The game launch is delayed until you press the "
                         "button. This is the right time to setup the profiler, as the "
                         "profiler server is running now.\n\n%1").arg(message));
         msg.setWindowTitle(tr("Waiting."));
         msg.setIcon(QMessageBox::Information);
-        msg.addButton(tr("Launch"), QMessageBox::AcceptRole);
-        msg.setModal(true);
+        msg.addButton(tr("&Launch"), QMessageBox::AcceptRole);
         msg.exec();
         m_launcher->proceed();
     });
diff --git a/launcher/NullInstance.h b/launcher/NullInstance.h
index 53edfa0b..b0ec89f4 100644
--- a/launcher/NullInstance.h
+++ b/launcher/NullInstance.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -110,6 +111,9 @@ public:
     {
         return false;
     }
+    void populateLaunchMenu(QMenu* menu) override
+    {
+    }
     QStringList verboseDescription(AuthSessionPtr session, MinecraftServerTargetPtr serverToJoin) override
     {
         QStringList out;
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index aab930de..d511451e 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -3,7 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
  *  Copyright (C) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -88,6 +88,8 @@
 #include "minecraft/gameoptions/GameOptions.h"
 #include "minecraft/update/FoldersTask.h"
 
+#include "tools/BaseProfiler.h"
+
 #ifdef Q_OS_LINUX
 #include "MangoHud.h"
 #endif
@@ -234,6 +236,52 @@ QSet<QString> MinecraftInstance::traits() const
     return profile->getTraits();
 }
 
+void MinecraftInstance::populateLaunchMenu(QMenu* menu)
+{
+    QAction* normalLaunch = menu->addAction(tr("&Launch"));
+    normalLaunch->setShortcut(QKeySequence::Open);
+    QAction* normalLaunchOffline = menu->addAction(tr("Launch &Offline"));
+    normalLaunchOffline->setShortcut(QKeySequence(tr("Ctrl+Shift+O")));
+    QAction* normalLaunchDemo = menu->addAction(tr("Launch &Demo"));
+    normalLaunchDemo->setShortcut(QKeySequence(tr("Ctrl+Alt+O")));
+
+    normalLaunchDemo->setEnabled(supportsDemo());
+
+    connect(normalLaunch, &QAction::triggered, [this] { APPLICATION->launch(shared_from_this()); });
+    connect(normalLaunchOffline, &QAction::triggered, [this] { APPLICATION->launch(shared_from_this(), false, false); });
+    connect(normalLaunchDemo, &QAction::triggered, [this] { APPLICATION->launch(shared_from_this(), false, true); });
+
+    QString profilersTitle = tr("Profilers");
+    menu->addSeparator()->setText(profilersTitle);
+
+    auto profilers = new QActionGroup(menu);
+    profilers->setExclusive(true);
+    connect(profilers, &QActionGroup::triggered, [this](QAction* action) {
+        settings()->set("Profiler", action->data());
+        emit profilerChanged();
+    });
+
+    QAction* noProfilerAction = menu->addAction(tr("&No Profiler"));
+    noProfilerAction->setData("");
+    noProfilerAction->setCheckable(true);
+    noProfilerAction->setChecked(true);
+    profilers->addAction(noProfilerAction);
+
+    for (auto profiler = APPLICATION->profilers().begin(); profiler != APPLICATION->profilers().end(); profiler++) {
+        QAction* profilerAction = menu->addAction(profiler.value()->name());
+        profilers->addAction(profilerAction);
+        profilerAction->setData(profiler.key());
+        profilerAction->setCheckable(true);
+        profilerAction->setChecked(settings()->get("Profiler").toString() == profiler.key());
+
+        QString error;
+        if (profiler.value()->check(&error))
+            profilerAction->setIcon(APPLICATION->getThemedIcon("status-good"));
+        else
+            profilerAction->setIcon(APPLICATION->getThemedIcon("status-bad"));
+    }
+}
+
 QString MinecraftInstance::gameRoot() const
 {
     QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 068b3008..c5ebbb7c 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -2,7 +2,7 @@
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -77,6 +77,8 @@ public:
         return true;
     }
 
+    void populateLaunchMenu(QMenu* menu) override;
+
     ////// Directories and files //////
     QString jarModsDir() const;
     QString resourcePacksDir() const;
diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index c62b370f..350b1907 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -43,8 +44,6 @@
 #include <qlayoutitem.h>
 #include <QCloseEvent>
 
-#include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ProgressDialog.h"
 #include "ui/widgets/PageContainer.h"
 
 #include "InstancePageProvider.h"
@@ -83,33 +82,36 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget *parent)
         auto btnHelp = new QPushButton();
         btnHelp->setText(tr("Help"));
         horizontalLayout->addWidget(btnHelp);
-        connect(btnHelp, SIGNAL(clicked(bool)), m_container, SLOT(help()));
+        connect(btnHelp, &QPushButton::clicked, m_container, &PageContainer::help);
 
         auto spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
         horizontalLayout->addSpacerItem(spacer);
 
-        m_killButton = new QPushButton();
-        horizontalLayout->addWidget(m_killButton);
-        connect(m_killButton, SIGNAL(clicked(bool)), SLOT(on_btnKillMinecraft_clicked()));
-
-        m_launchOfflineButton = new QPushButton();
-        horizontalLayout->addWidget(m_launchOfflineButton);
-        m_launchOfflineButton->setText(tr("Launch Offline"));
+        m_launchButton = new QToolButton(this);
+        m_launchButton->setText(tr("&Launch"));
+        m_launchButton->setToolTip(tr("Launch the instance"));
+        m_launchButton->setPopupMode(QToolButton::MenuButtonPopup);
+        m_launchButton->setMinimumWidth(80); // HACK!!
+        horizontalLayout->addWidget(m_launchButton);
+        connect(m_launchButton, &QPushButton::clicked, this, [this] { APPLICATION->launch(m_instance); });
 
-        m_launchDemoButton = new QPushButton();
-        horizontalLayout->addWidget(m_launchDemoButton);
-        m_launchDemoButton->setText(tr("Launch Demo"));
+        m_killButton = new QPushButton(this);
+        m_killButton->setText(tr("&Kill"));
+        m_killButton->setToolTip(tr("Kill the running instance"));
+        horizontalLayout->addWidget(m_killButton);
+        connect(m_killButton, &QPushButton::clicked, this, [this] { APPLICATION->kill(m_instance); });
 
-        updateLaunchButtons();
-        connect(m_launchOfflineButton, SIGNAL(clicked(bool)), SLOT(on_btnLaunchMinecraftOffline_clicked()));
-        connect(m_launchDemoButton, SIGNAL(clicked(bool)), SLOT(on_btnLaunchMinecraftDemo_clicked()));
+        updateButtons();
 
         m_closeButton = new QPushButton();
         m_closeButton->setText(tr("Close"));
         horizontalLayout->addWidget(m_closeButton);
-        connect(m_closeButton, SIGNAL(clicked(bool)), SLOT(on_closeButton_clicked()));
+        connect(m_closeButton, &QPushButton::clicked, this, &QMainWindow::close);
 
         m_container->addButtons(horizontalLayout);
+
+        connect(m_instance.get(), &BaseInstance::profilerChanged, this, &InstanceWindow::updateButtons);
+        connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceWindow::updateButtons);
     }
 
     // restore window state
@@ -150,52 +152,18 @@ void InstanceWindow::on_instanceStatusChanged(BaseInstance::Status, BaseInstance
     }
 }
 
-void InstanceWindow::updateLaunchButtons()
+void InstanceWindow::updateButtons()
 {
-    if(m_instance->isRunning())
-    {
-        m_launchOfflineButton->setEnabled(false);
-        m_launchDemoButton->setEnabled(false);
-        m_killButton->setText(tr("Kill"));
-        m_killButton->setObjectName("killButton");
-        m_killButton->setToolTip(tr("Kill the running instance"));
-    }
-    else if(!m_instance->canLaunch())
-    {
-        m_launchOfflineButton->setEnabled(false);
-        m_launchDemoButton->setEnabled(false);
-        m_killButton->setText(tr("Launch"));
-        m_killButton->setObjectName("launchButton");
-        m_killButton->setToolTip(tr("Launch the instance"));
-        m_killButton->setEnabled(false);
-    }
-    else
-    {
-        m_launchOfflineButton->setEnabled(true);
+    m_launchButton->setEnabled(m_instance->canLaunch());
+    m_killButton->setEnabled(m_instance->isRunning());
 
-        // Disable demo-mode if not available.
-        auto instance = dynamic_cast<MinecraftInstance*>(m_instance.get());
-        if (instance) {
-            m_launchDemoButton->setEnabled(instance->supportsDemo());
-        }
-
-        m_killButton->setText(tr("Launch"));
-        m_killButton->setObjectName("launchButton");
-        m_killButton->setToolTip(tr("Launch the instance"));
-    }
-    // NOTE: this is a hack to force the button to recalculate its style
-    m_killButton->setStyleSheet("/* */");
-    m_killButton->setStyleSheet(QString());
-}
-
-void InstanceWindow::on_btnLaunchMinecraftOffline_clicked()
-{
-    APPLICATION->launch(m_instance, false, false, nullptr);
-}
-
-void InstanceWindow::on_btnLaunchMinecraftDemo_clicked()
-{
-    APPLICATION->launch(m_instance, false, true, nullptr);
+    QMenu *launchMenu = m_launchButton->menu();
+    if (launchMenu)
+        launchMenu->clear();
+    else
+        launchMenu = new QMenu(this);
+    m_instance->populateLaunchMenu(launchMenu);
+    m_launchButton->setMenu(launchMenu);
 }
 
 void InstanceWindow::instanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc)
@@ -205,18 +173,13 @@ void InstanceWindow::instanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> pr
 
 void InstanceWindow::runningStateChanged(bool running)
 {
-    updateLaunchButtons();
+    updateButtons();
     m_container->refreshContainer();
     if(running) {
         selectPage("log");
     }
 }
 
-void InstanceWindow::on_closeButton_clicked()
-{
-    close();
-}
-
 void InstanceWindow::closeEvent(QCloseEvent *event)
 {
     bool proceed = true;
@@ -241,18 +204,6 @@ bool InstanceWindow::saveAll()
     return m_container->saveAll();
 }
 
-void InstanceWindow::on_btnKillMinecraft_clicked()
-{
-    if(m_instance->isRunning())
-    {
-        APPLICATION->kill(m_instance);
-    }
-    else
-    {
-        APPLICATION->launch(m_instance, true, false, nullptr);
-    }
-}
-
 QString InstanceWindow::instanceId()
 {
     return m_instance->id();
@@ -268,10 +219,6 @@ void InstanceWindow::refreshContainer()
     m_container->refreshContainer();
 }
 
-InstanceWindow::~InstanceWindow()
-{
-}
-
 bool InstanceWindow::requestClose()
 {
     if(m_container->prepareToClose())
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index 554c4c74..64d9a45e 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -37,6 +38,7 @@
 
 #include <QMainWindow>
 #include <QSystemTrayIcon>
+#include <QToolButton>
 
 #include "LaunchController.h"
 #include "launch/LaunchTask.h"
@@ -53,7 +55,7 @@ class InstanceWindow : public QMainWindow, public BasePageContainer
 
 public:
     explicit InstanceWindow(InstancePtr proc, QWidget *parent = 0);
-    virtual ~InstanceWindow();
+    virtual ~InstanceWindow() = default;
 
     bool selectPage(QString pageId) override;
     void refreshContainer() override;
@@ -71,11 +73,6 @@ signals:
 
 private
 slots:
-    void on_closeButton_clicked();
-    void on_btnKillMinecraft_clicked();
-    void on_btnLaunchMinecraftOffline_clicked();
-    void on_btnLaunchMinecraftDemo_clicked();
-
     void instanceLaunchTaskChanged(shared_qobject_ptr<LaunchTask> proc);
     void runningStateChanged(bool running);
     void on_instanceStatusChanged(BaseInstance::Status, BaseInstance::Status newStatus);
@@ -84,7 +81,7 @@ protected:
     void closeEvent(QCloseEvent *) override;
 
 private:
-    void updateLaunchButtons();
+    void updateButtons();
 
 private:
     shared_qobject_ptr<LaunchTask> m_proc;
@@ -92,7 +89,6 @@ private:
     bool m_doNotSave = false;
     PageContainer *m_container = nullptr;
     QPushButton *m_closeButton = nullptr;
+    QToolButton *m_launchButton = nullptr;
     QPushButton *m_killButton = nullptr;
-    QPushButton *m_launchOfflineButton = nullptr;
-    QPushButton *m_launchDemoButton = nullptr;
 };
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 515abf07..a2137dd3 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -572,93 +572,14 @@ void MainWindow::updateMainToolBar()
     ui->mainToolBar->setVisible(ui->menuBar->isNativeMenuBar() || !APPLICATION->settings()->get("MenuBarInsteadOfToolBar").toBool());
 }
 
-void MainWindow::updateToolsMenu()
+void MainWindow::updateLaunchButton()
 {
-    bool currentInstanceRunning = m_selectedInstance && m_selectedInstance->isRunning();
-
-    ui->actionLaunchInstance->setDisabled(!m_selectedInstance || currentInstanceRunning);
-    ui->actionLaunchInstanceOffline->setDisabled(!m_selectedInstance || currentInstanceRunning);
-    ui->actionLaunchInstanceDemo->setDisabled(!m_selectedInstance || currentInstanceRunning);
-
     QMenu *launchMenu = ui->actionLaunchInstance->menu();
     if (launchMenu)
-    {
         launchMenu->clear();
-    }
     else
-    {
         launchMenu = new QMenu(this);
-    }
-    QAction *normalLaunch = launchMenu->addAction(tr("Launch"));
-    normalLaunch->setShortcut(QKeySequence::Open);
-    QAction *normalLaunchOffline = launchMenu->addAction(tr("Launch Offline"));
-    normalLaunchOffline->setShortcut(QKeySequence(tr("Ctrl+Shift+O")));
-    QAction *normalLaunchDemo = launchMenu->addAction(tr("Launch Demo"));
-    normalLaunchDemo->setShortcut(QKeySequence(tr("Ctrl+Alt+O")));
-    if (m_selectedInstance)
-    {
-        normalLaunch->setEnabled(m_selectedInstance->canLaunch());
-        normalLaunchOffline->setEnabled(m_selectedInstance->canLaunch());
-        normalLaunchDemo->setEnabled(m_selectedInstance->canLaunch());
-
-        connect(normalLaunch, &QAction::triggered, [this]() {
-            APPLICATION->launch(m_selectedInstance, true, false);
-        });
-        connect(normalLaunchOffline, &QAction::triggered, [this]() {
-            APPLICATION->launch(m_selectedInstance, false, false);
-        });
-        connect(normalLaunchDemo, &QAction::triggered, [this]() {
-            APPLICATION->launch(m_selectedInstance, false, true);
-        });
-    }
-    else
-    {
-        normalLaunch->setDisabled(true);
-        normalLaunchOffline->setDisabled(true);
-        normalLaunchDemo->setDisabled(true);
-    }
-
-    // Disable demo-mode if not available.
-    auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
-    if (instance) {
-        normalLaunchDemo->setEnabled(instance->supportsDemo());
-    }
-
-    QString profilersTitle = tr("Profilers");
-    launchMenu->addSeparator()->setText(profilersTitle);
-    for (auto profiler : APPLICATION->profilers().values())
-    {
-        QAction *profilerAction = launchMenu->addAction(profiler->name());
-        QAction *profilerOfflineAction = launchMenu->addAction(tr("%1 Offline").arg(profiler->name()));
-        QString error;
-        if (!profiler->check(&error))
-        {
-            profilerAction->setDisabled(true);
-            profilerOfflineAction->setDisabled(true);
-            QString profilerToolTip = tr("Profiler not setup correctly. Go into settings, \"External Tools\".");
-            profilerAction->setToolTip(profilerToolTip);
-            profilerOfflineAction->setToolTip(profilerToolTip);
-        }
-        else if (m_selectedInstance)
-        {
-            profilerAction->setEnabled(m_selectedInstance->canLaunch());
-            profilerOfflineAction->setEnabled(m_selectedInstance->canLaunch());
-
-            connect(profilerAction, &QAction::triggered, [this, profiler]()
-                    {
-                        APPLICATION->launch(m_selectedInstance, true, false, profiler.get());
-                    });
-            connect(profilerOfflineAction, &QAction::triggered, [this, profiler]()
-                    {
-                        APPLICATION->launch(m_selectedInstance, false, false, profiler.get());
-                    });
-        }
-        else
-        {
-            profilerAction->setDisabled(true);
-            profilerOfflineAction->setDisabled(true);
-        }
-    }
+    m_selectedInstance->populateLaunchMenu(launchMenu);
     ui->actionLaunchInstance->setMenu(launchMenu);
 }
 
@@ -1268,7 +1189,7 @@ void MainWindow::globalSettingsClosed()
     proxymodel->invalidate();
     proxymodel->sort(0);
     updateMainToolBar();
-    updateToolsMenu();
+    updateLaunchButton();
     updateThemeMenu();
     updateStatusCenter();
     // This needs to be done to prevent UI elements disappearing in the event the config is changed
@@ -1471,22 +1392,6 @@ void MainWindow::activateInstance(InstancePtr instance)
     APPLICATION->launch(instance);
 }
 
-void MainWindow::on_actionLaunchInstanceOffline_triggered()
-{
-    if (m_selectedInstance)
-    {
-        APPLICATION->launch(m_selectedInstance, false);
-    }
-}
-
-void MainWindow::on_actionLaunchInstanceDemo_triggered()
-{
-    if (m_selectedInstance)
-    {
-        APPLICATION->launch(m_selectedInstance, false, true);
-    }
-}
-
 void MainWindow::on_actionKillInstance_triggered()
 {
     if(m_selectedInstance && m_selectedInstance->isRunning())
@@ -1633,6 +1538,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
     }
     if (m_selectedInstance) {
         disconnect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::refreshCurrentInstance);
+        disconnect(m_selectedInstance.get(), &BaseInstance::profilerChanged, this, &MainWindow::refreshCurrentInstance);
     }
     QString id = current.data(InstanceList::InstanceIDRole).toString();
     m_selectedInstance = APPLICATION->instances()->getInstanceById(id);
@@ -1641,14 +1547,6 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         ui->instanceToolBar->setEnabled(true);
         setInstanceActionsEnabled(true);
         ui->actionLaunchInstance->setEnabled(m_selectedInstance->canLaunch());
-        ui->actionLaunchInstanceOffline->setEnabled(m_selectedInstance->canLaunch());
-        ui->actionLaunchInstanceDemo->setEnabled(m_selectedInstance->canLaunch());
-
-        // Disable demo-mode if not available.
-        auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
-        if (instance) {
-             ui->actionLaunchInstanceDemo->setEnabled(instance->supportsDemo());
-        }
 
         ui->actionKillInstance->setEnabled(m_selectedInstance->isRunning());
         ui->actionExportInstance->setEnabled(m_selectedInstance->canExport());
@@ -1657,19 +1555,18 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         updateStatusCenter();
         updateInstanceToolIcon(m_selectedInstance->iconKey());
 
-        updateToolsMenu();
+        updateLaunchButton();
 
         APPLICATION->settings()->set("SelectedInstance", m_selectedInstance->id());
 
         connect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::refreshCurrentInstance);
+        connect(m_selectedInstance.get(), &BaseInstance::profilerChanged, this, &MainWindow::refreshCurrentInstance);
     }
     else
     {
         ui->instanceToolBar->setEnabled(false);
         setInstanceActionsEnabled(false);
         ui->actionLaunchInstance->setEnabled(false);
-        ui->actionLaunchInstanceOffline->setEnabled(false);
-        ui->actionLaunchInstanceDemo->setEnabled(false);
         ui->actionKillInstance->setEnabled(false);
         APPLICATION->settings()->set("SelectedInstance", QString());
         selectionBad();
@@ -1700,7 +1597,7 @@ void MainWindow::selectionBad()
     statusBar()->clearMessage();
     ui->instanceToolBar->setEnabled(false);
     setInstanceActionsEnabled(false);
-    updateToolsMenu();
+    updateLaunchButton();
     renameButton->setText(tr("Rename Instance"));
     updateInstanceToolIcon("grass");
 
@@ -1769,7 +1666,7 @@ void MainWindow::setInstanceActionsEnabled(bool enabled)
     ui->actionCreateInstanceShortcut->setEnabled(enabled);
 }
 
-void MainWindow::refreshCurrentInstance(bool running)
+void MainWindow::refreshCurrentInstance()
 {
     auto current = view->selectionModel()->currentIndex();
     instanceChanged(current, current);
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 3bb20c4a..7814e5b1 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -143,10 +143,6 @@ private slots:
 
     void on_actionLaunchInstance_triggered();
 
-    void on_actionLaunchInstanceOffline_triggered();
-
-    void on_actionLaunchInstanceDemo_triggered();
-
     void on_actionKillInstance_triggered();
 
     void on_actionDeleteInstance_triggered();
@@ -175,7 +171,7 @@ private slots:
 
     void updateMainToolBar();
 
-    void updateToolsMenu();
+    void updateLaunchButton();
 
     void updateThemeMenu();
 
@@ -210,7 +206,7 @@ private slots:
     void keyReleaseEvent(QKeyEvent *event) override;
 #endif
 
-    void refreshCurrentInstance(bool running);
+    void refreshCurrentInstance();
 
 private:
     void retranslateUi();
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index 113dfc1e..bc1edf39 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -435,22 +435,6 @@
     <string>Ctrl+D</string>
    </property>
   </action>
-  <action name="actionLaunchInstanceOffline">
-   <property name="text">
-    <string>Launch &amp;Offline</string>
-   </property>
-   <property name="toolTip">
-    <string>Launch the selected instance in offline mode.</string>
-   </property>
-  </action>
-  <action name="actionLaunchInstanceDemo">
-   <property name="text">
-    <string>Launch &amp;Demo</string>
-   </property>
-   <property name="toolTip">
-    <string>Launch the selected instance in demo mode.</string>
-   </property>
-  </action>
   <action name="actionExportInstance">
    <property name="icon">
     <iconset theme="export">
@@ -465,7 +449,8 @@
   </action>
   <action name="actionExportInstanceZip">
    <property name="icon">
-    <iconset theme="launcher"/>
+    <iconset theme="launcher">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Prism Launcher (zip)</string>
@@ -473,7 +458,8 @@
   </action>
   <action name="actionExportInstanceMrPack">
    <property name="icon">
-    <iconset theme="modrinth"/>
+    <iconset theme="modrinth">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Modrinth (mrpack)</string>
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 4b1fa08a..5e899a11 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -3,7 +3,7 @@
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  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
@@ -835,7 +835,7 @@ void ServersPage::on_actionMove_Down_triggered()
 void ServersPage::on_actionJoin_triggered()
 {
     const auto &address = m_model->at(currentServer)->m_address;
-    APPLICATION->launch(m_inst, true, false, nullptr, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
+    APPLICATION->launch(m_inst, true, false, std::make_shared<MinecraftServerTarget>(MinecraftServerTarget::parse(address)));
 }
 
 #include "ServersPage.moc"
-- 
cgit 


From 97662f5c8ecdf32403939e427c74310f9175fb9e Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Tue, 18 Jul 2023 22:50:43 +0100
Subject: Multiple icon themes!

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp                         |   5 +
 launcher/Application.h                           |   3 +
 launcher/CMakeLists.txt                          |   2 +
 launcher/resources/multimc/index.theme           |   2 +-
 launcher/resources/pe_blue/index.theme           |   2 +-
 launcher/resources/pe_colored/index.theme        |   2 +-
 launcher/resources/pe_dark/index.theme           |   2 +-
 launcher/resources/pe_light/index.theme          |   2 +-
 launcher/ui/themes/IconTheme.cpp                 |  35 +++++++
 launcher/ui/themes/IconTheme.h                   |  18 ++++
 launcher/ui/themes/ThemeManager.cpp              | 121 +++++++++++++++--------
 launcher/ui/themes/ThemeManager.h                |   8 ++
 launcher/ui/widgets/ThemeCustomizationWidget.cpp |  22 +++--
 launcher/ui/widgets/ThemeCustomizationWidget.h   |  19 +---
 14 files changed, 173 insertions(+), 70 deletions(-)
 create mode 100644 launcher/ui/themes/IconTheme.cpp
 create mode 100644 launcher/ui/themes/IconTheme.h

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index d6c135de..df8a2363 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1163,6 +1163,11 @@ QList<ITheme*> Application::getValidApplicationThemes()
     return m_themeManager->getValidApplicationThemes();
 }
 
+QList<IconTheme*> Application::getValidIconThemes()
+{
+    return m_themeManager->getValidIconThemes();
+}
+
 void Application::applyCurrentlySelectedTheme(bool initial)
 {
     m_themeManager->applyCurrentlySelectedTheme(initial);
diff --git a/launcher/Application.h b/launcher/Application.h
index 527c536b..0b953f0a 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -70,6 +70,7 @@ class TranslationsModel;
 class ITheme;
 class MCEditTool;
 class ThemeManager;
+class IconTheme;
 
 namespace Meta {
     class Index;
@@ -124,6 +125,8 @@ public:
 
     QList<ITheme*> getValidApplicationThemes();
 
+    QList<IconTheme*> getValidIconThemes();
+
     void setApplicationTheme(const QString& name);
 
     shared_qobject_ptr<ExternalUpdater> updater() {
diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 7cba97b4..89fc901b 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -759,6 +759,8 @@ SET(LAUNCHER_SOURCES
     ui/themes/ITheme.h
     ui/themes/SystemTheme.cpp
     ui/themes/SystemTheme.h
+    ui/themes/IconTheme.cpp
+    ui/themes/IconTheme.h
     ui/themes/ThemeManager.cpp
     ui/themes/ThemeManager.h
 
diff --git a/launcher/resources/multimc/index.theme b/launcher/resources/multimc/index.theme
index 070e23f1..4da8072d 100644
--- a/launcher/resources/multimc/index.theme
+++ b/launcher/resources/multimc/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=multimc
+Name=Legacy
 Comment=Default Icons
 Inherits=default
 Directories=8x8,16x16,22x22,24x24,32x32,32x32/instances,48x48,50x50/instances,64x64,128x128/instances,256x256,scalable,scalable/instances
diff --git a/launcher/resources/pe_blue/index.theme b/launcher/resources/pe_blue/index.theme
index c9e0d93a..6d842b5d 100644
--- a/launcher/resources/pe_blue/index.theme
+++ b/launcher/resources/pe_blue/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=pe_blue
+Name=Simple (Blue)
 Comment=Icons by pexner (blue)
 Inherits=multimc
 Directories=scalable
diff --git a/launcher/resources/pe_colored/index.theme b/launcher/resources/pe_colored/index.theme
index b757bbd7..bca5494f 100644
--- a/launcher/resources/pe_colored/index.theme
+++ b/launcher/resources/pe_colored/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=pe_colored
+Name=Simple (Colored)
 Comment=Icons by pexner (colored)
 Inherits=multimc
 Directories=scalable
diff --git a/launcher/resources/pe_dark/index.theme b/launcher/resources/pe_dark/index.theme
index b7d1ad01..4cfbf09c 100644
--- a/launcher/resources/pe_dark/index.theme
+++ b/launcher/resources/pe_dark/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=pe_dark
+Name=Simple (Dark)
 Comment=Icons by pexner (dark)
 Inherits=multimc
 Directories=scalable
diff --git a/launcher/resources/pe_light/index.theme b/launcher/resources/pe_light/index.theme
index c106acc8..87b76d13 100644
--- a/launcher/resources/pe_light/index.theme
+++ b/launcher/resources/pe_light/index.theme
@@ -1,5 +1,5 @@
 [Icon Theme]
-Name=pe_light
+Name=Simple (Light)
 Comment=Icons by pexner (light)
 Inherits=multimc
 Directories=scalable
diff --git a/launcher/ui/themes/IconTheme.cpp b/launcher/ui/themes/IconTheme.cpp
new file mode 100644
index 00000000..ef245505
--- /dev/null
+++ b/launcher/ui/themes/IconTheme.cpp
@@ -0,0 +1,35 @@
+#include "IconTheme.h"
+
+#include <QFile>
+#include <QSettings>
+
+IconTheme::IconTheme(const QString& id, const QString& path) : m_id(id), m_path(path) {}
+
+bool IconTheme::load()
+{
+    QString path = m_path + "/index.theme";
+
+    if (!QFile::exists(path))
+        return false;
+
+    QSettings settings(path, QSettings::IniFormat);
+    settings.beginGroup("Icon Theme");
+    m_name = settings.value("Name").toString();
+    settings.endGroup();
+    return !m_name.isNull();
+}
+
+QString IconTheme::id()
+{
+    return m_id;
+}
+
+QString IconTheme::path()
+{
+    return m_path;
+}
+
+QString IconTheme::name()
+{
+    return m_name;
+}
\ No newline at end of file
diff --git a/launcher/ui/themes/IconTheme.h b/launcher/ui/themes/IconTheme.h
new file mode 100644
index 00000000..cb05d8c7
--- /dev/null
+++ b/launcher/ui/themes/IconTheme.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <QString>
+
+class IconTheme {
+   public:
+    IconTheme(const QString& id, const QString& path);
+
+    bool load();
+    QString id();
+    QString path();
+    QString name();
+
+   private:
+    QString m_id;
+    QString m_path;
+    QString m_name;
+};
\ No newline at end of file
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index b50c6157..3453a246 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -55,50 +55,84 @@ ITheme* ThemeManager::getTheme(QString themeId)
 void ThemeManager::initializeThemes()
 {
     // Icon themes
-    {
-        // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
-        // set icon theme search path!
-        auto searchPaths = QIcon::themeSearchPaths();
-        searchPaths.append("iconthemes");
-        QIcon::setThemeSearchPaths(searchPaths);
-        themeDebugLog() << "<> Icon themes initialized.";
-    }
+    initializeIcons();
 
     // Initialize widget themes
-    {
-        themeDebugLog() << "<> Initializing Widget Themes";
-        themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
-        auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
-        themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
-        themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
-
-        // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
-        // dropdown?)
-        QString themeFolder = QDir("./themes/").absoluteFilePath("");
-        themeDebugLog() << "Theme Folder Path: " << themeFolder;
-
-        QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
-        while (directoryIterator.hasNext()) {
-            QDir dir(directoryIterator.next());
-            QFileInfo themeJson(dir.absoluteFilePath("theme.json"));
-            if (themeJson.exists()) {
-                // Load "theme.json" based themes
-                themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();
-                addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), themeJson, true));
-            } else {
-                // Load pure QSS Themes
-                QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);
-                while (stylesheetFileIterator.hasNext()) {
-                    QFile customThemeFile(stylesheetFileIterator.next());
-                    QFileInfo customThemeFileInfo(customThemeFile);
-                    themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();
-                    addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), customThemeFileInfo, false));
-                }
-            }
+    initializeWidgets();
+}
+
+void ThemeManager::initializeIcons()
+{
+    // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
+    // set icon theme search path!
+
+    QString themeFolder = "iconthemes";
+
+    auto searchPaths = QIcon::themeSearchPaths();
+    searchPaths.append(themeFolder);
+    QIcon::setThemeSearchPaths(searchPaths);
+
+    themeDebugLog() << "<> Initializing Icon Themes";
+
+    for (const QString& id : builtinIcons) {
+        IconTheme theme(id, QString(":/icons/%1").arg(id));
+        if (!theme.load()) {
+            themeWarningLog() << "Couldn't load built-in icon theme" << id;
+            continue;
         }
 
-        themeDebugLog() << "<> Widget themes initialized.";
+        m_icons.append(theme);
+        themeDebugLog() << "Loaded Built-In Icon Theme" << id;
+    }
+
+    QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (directoryIterator.hasNext()) {
+        QDir dir(directoryIterator.next());
+        IconTheme theme(dir.dirName(), dir.path());
+        if (!theme.load())
+            continue;
+
+        m_icons.append(theme);
+        themeDebugLog() << "Loaded Custom Icon Theme from" << dir.path();
+    }
+
+    themeDebugLog() << "<> Icon themes initialized.";
+}
+
+void ThemeManager::initializeWidgets()
+{
+    themeDebugLog() << "<> Initializing Widget Themes";
+    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
+    auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
+    themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
+    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
+
+    // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
+    // dropdown?)
+    QString themeFolder = QDir("./themes/").absoluteFilePath("");
+    themeDebugLog() << "Theme Folder Path: " << themeFolder;
+
+    QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    while (directoryIterator.hasNext()) {
+        QDir dir(directoryIterator.next());
+        QFileInfo themeJson(dir.absoluteFilePath("theme.json"));
+        if (themeJson.exists()) {
+            // Load "theme.json" based themes
+            themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();
+            addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), themeJson, true));
+        } else {
+            // Load pure QSS Themes
+            QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);
+            while (stylesheetFileIterator.hasNext()) {
+                QFile customThemeFile(stylesheetFileIterator.next());
+                QFileInfo customThemeFileInfo(customThemeFile);
+                themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();
+                addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), customThemeFileInfo, false));
+            }
+        }
     }
+
+    themeDebugLog() << "<> Widget themes initialized.";
 }
 
 QList<ITheme*> ThemeManager::getValidApplicationThemes()
@@ -111,6 +145,15 @@ QList<ITheme*> ThemeManager::getValidApplicationThemes()
     return ret;
 }
 
+QList<IconTheme*> ThemeManager::getValidIconThemes()
+{
+    QList<IconTheme*> ret;
+    ret.reserve(m_icons.size());
+    for (IconTheme& theme : m_icons)
+        ret.append(&theme);
+    return ret;
+}
+
 void ThemeManager::setIconTheme(const QString& name)
 {
     QIcon::setThemeName(name);
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index d2a6fb70..7509377c 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -19,6 +19,7 @@
 
 #include <QString>
 
+#include "IconTheme.h"
 #include "ui/MainWindow.h"
 #include "ui/themes/ITheme.h"
 
@@ -36,6 +37,7 @@ class ThemeManager {
     ThemeManager(MainWindow* mainWindow);
 
     QList<ITheme*> getValidApplicationThemes();
+    QList<IconTheme*> getValidIconThemes();
     void setIconTheme(const QString& name);
     void applyCurrentlySelectedTheme(bool initial = false);
     void setApplicationTheme(const QString& name, bool initial = false);
@@ -49,9 +51,15 @@ class ThemeManager {
 
    private:
     std::map<QString, std::unique_ptr<ITheme>> m_themes;
+    QList<IconTheme> m_icons;
     MainWindow* m_mainWindow;
 
     void initializeThemes();
     QString addTheme(std::unique_ptr<ITheme> theme);
     ITheme* getTheme(QString themeId);
+    void initializeIcons();
+    void initializeWidgets();
+
+    const QStringList builtinIcons{ "pe_colored", "pe_light", "pe_dark", "pe_blue",    "breeze_light", "breeze_dark",
+                                    "OSX",        "iOS",      "flat",    "flat_white", "multimc" };
 };
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 3bfcd821..455cbb7b 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -73,10 +73,9 @@ void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
 void ThemeCustomizationWidget::applyIconTheme(int index) {
     auto settings = APPLICATION->settings();
     auto originalIconTheme = settings->get("IconTheme").toString();
-    auto& newIconTheme = m_iconThemeOptions[index].first;
-    settings->set("IconTheme", newIconTheme);
-
+    auto newIconTheme = ui->iconsComboBox->currentData().toString();
     if (originalIconTheme != newIconTheme) {
+        settings->set("IconTheme", newIconTheme);
         APPLICATION->applyCurrentlySelectedTheme();
     }
 
@@ -112,12 +111,17 @@ void ThemeCustomizationWidget::loadSettings()
 {
     auto settings = APPLICATION->settings();
 
-    auto iconTheme = settings->get("IconTheme").toString();
-    for (auto& iconThemeFromList : m_iconThemeOptions) {
-        QIcon iconForComboBox = QIcon(QString(":/icons/%1/scalable/settings").arg(iconThemeFromList.first));
-        ui->iconsComboBox->addItem(iconForComboBox, iconThemeFromList.second);
-        if (iconTheme == iconThemeFromList.first) {
-            ui->iconsComboBox->setCurrentIndex(ui->iconsComboBox->count() - 1);
+    {
+        auto currentIconTheme = settings->get("IconTheme").toString();
+        auto iconThemes = APPLICATION->getValidIconThemes();
+        int idx = 0;
+        for (auto iconTheme : iconThemes) {
+            QIcon iconForComboBox = QIcon(iconTheme->path() + "/scalable/settings");
+            ui->iconsComboBox->addItem(iconForComboBox, iconTheme->name(), iconTheme->id());
+            if (currentIconTheme == iconTheme->id()) {
+                ui->iconsComboBox->setCurrentIndex(idx);
+            }
+            idx++;
         }
     }
 
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
index 6c33c3c5..976ede43 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.h
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -31,7 +31,7 @@ class ThemeCustomizationWidget : public QWidget {
 
    public:
     explicit ThemeCustomizationWidget(QWidget* parent = nullptr);
-    ~ThemeCustomizationWidget();
+    ~ThemeCustomizationWidget() override;
 
     void showFeatures(ThemeFields features);
 
@@ -53,22 +53,7 @@ class ThemeCustomizationWidget : public QWidget {
    private:
     Ui::ThemeCustomizationWidget* ui;
 
-    //TODO finish implementing
-    QList<std::pair<QString, QString>> m_iconThemeOptions{ 
-        { "pe_colored",     QObject::tr("Simple (Colored Icons)") }, 
-        { "pe_light",       QObject::tr("Simple (Light Icons)") },     
-        { "pe_dark",        QObject::tr("Simple (Dark Icons)") },
-        { "pe_blue",        QObject::tr("Simple (Blue Icons)") },    
-        { "breeze_light",   QObject::tr("Breeze Light") }, 
-        { "breeze_dark",    QObject::tr("Breeze Dark") },
-        { "OSX",            QObject::tr("OSX") },        
-        { "iOS",            QObject::tr("iOS") },          
-        { "flat",           QObject::tr("Flat") },
-        { "flat_white",     QObject::tr("Flat (White)") }, 
-        { "multimc",        QObject::tr("Legacy") },      
-        { "custom",         QObject::tr("Custom") } 
-    };
-    QList<std::pair<QString, QString>> m_catOptions{ 
+    QList<std::pair<QString, QString>> m_catOptions{
         { "kitteh",     QObject::tr("Background Cat (from MultiMC)") }, 
         { "rory",       QObject::tr("Rory ID 11 (drawn by Ashtaka)") }, 
         { "rory-flat",  QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") },
-- 
cgit 


From 842f08dcfc29d24cae13c25264e67375dd069e27 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 20 Jul 2023 11:51:44 +0100
Subject: (UX) Add open folder button next to combo boxes

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp                         | 29 +-------
 launcher/Application.h                           | 10 +--
 launcher/DesktopServices.cpp                     |  2 +-
 launcher/ui/MainWindow.cpp                       |  8 +-
 launcher/ui/themes/ThemeManager.cpp              | 44 ++++++-----
 launcher/ui/themes/ThemeManager.h                |  8 +-
 launcher/ui/widgets/ThemeCustomizationWidget.cpp | 35 +++++----
 launcher/ui/widgets/ThemeCustomizationWidget.ui  | 94 ++++++++++++++++++------
 8 files changed, 132 insertions(+), 98 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index ea706d6f..40d506e3 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -900,7 +900,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
         return;
     }
 
-    applyCurrentlySelectedTheme(true);
+    m_themeManager->applyCurrentlySelectedTheme(true);
     performMainStartupAction();
 }
 
@@ -942,7 +942,7 @@ bool Application::createSetupWizard()
         if (!validWidgets)
             settings()->set("ApplicationTheme", QString("system"));
 
-        applyCurrentlySelectedTheme(true);
+        m_themeManager->applyCurrentlySelectedTheme(true);
 
         m_setupWizard = new SetupWizard(nullptr);
         if (languageRequired)
@@ -1167,31 +1167,6 @@ std::shared_ptr<JavaInstallList> Application::javalist()
     return m_javalist;
 }
 
-QList<ITheme*> Application::getValidApplicationThemes()
-{
-    return m_themeManager->getValidApplicationThemes();
-}
-
-QList<IconTheme*> Application::getValidIconThemes()
-{
-    return m_themeManager->getValidIconThemes();
-}
-
-void Application::applyCurrentlySelectedTheme(bool initial)
-{
-    m_themeManager->applyCurrentlySelectedTheme(initial);
-}
-
-void Application::setApplicationTheme(const QString& name)
-{
-    m_themeManager->setApplicationTheme(name);
-}
-
-void Application::setIconTheme(const QString& name)
-{
-    m_themeManager->setIconTheme(name);
-}
-
 QIcon Application::getThemedIcon(const QString& name)
 {
     if(name == "logo") {
diff --git a/launcher/Application.h b/launcher/Application.h
index 0b953f0a..b8996022 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -119,15 +119,7 @@ public:
 
     QIcon getThemedIcon(const QString& name);
 
-    void setIconTheme(const QString& name);
-
-    void applyCurrentlySelectedTheme(bool initial = false);
-
-    QList<ITheme*> getValidApplicationThemes();
-
-    QList<IconTheme*> getValidIconThemes();
-
-    void setApplicationTheme(const QString& name);
+    ThemeManager* themeManager() { return m_themeManager.get(); }
 
     shared_qobject_ptr<ExternalUpdater> updater() {
         return m_updater;
diff --git a/launcher/DesktopServices.cpp b/launcher/DesktopServices.cpp
index 2984a1b4..4939161f 100644
--- a/launcher/DesktopServices.cpp
+++ b/launcher/DesktopServices.cpp
@@ -109,7 +109,7 @@ bool openDirectory(const QString &path, bool ensureExists)
     qDebug() << "Opening directory" << path;
     QDir parentPath;
     QDir dir(path);
-    if (!dir.exists())
+    if (ensureExists && !dir.exists())
     {
         parentPath.mkpath(dir.absolutePath());
     }
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 600d245d..00bb296f 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -627,7 +627,7 @@ void MainWindow::updateThemeMenu()
         themeMenu = new QMenu(this);
     }
 
-    auto themes = APPLICATION->getValidApplicationThemes();
+    auto themes = APPLICATION->themeManager()->getValidApplicationThemes();
 
     QActionGroup* themesGroup = new QActionGroup(this);
 
@@ -641,7 +641,7 @@ void MainWindow::updateThemeMenu()
         themeAction->setActionGroup(themesGroup);
 
         connect(themeAction, &QAction::triggered, [theme]() {
-            APPLICATION->setApplicationTheme(theme->id());
+            APPLICATION->themeManager()->setApplicationTheme(theme->id());
             APPLICATION->settings()->set("ApplicationTheme", theme->id());
         });
     }
@@ -1152,12 +1152,12 @@ void MainWindow::on_actionViewCentralModsFolder_triggered()
 
 void MainWindow::on_actionViewIconThemeFolder_triggered()
 {
-    DesktopServices::openDirectory("iconthemes");
+    DesktopServices::openDirectory(APPLICATION->themeManager()->getIconThemesFolder().path());
 }
 
 void MainWindow::on_actionViewWidgetThemeFolder_triggered()
 {
-    DesktopServices::openDirectory("themes");
+    DesktopServices::openDirectory(APPLICATION->themeManager()->getApplicationThemesFolder().path());
 }
 
 void MainWindow::refreshInstances()
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index a9fae589..32585618 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -73,13 +73,12 @@ void ThemeManager::initializeIcons()
     // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
     // set icon theme search path!
 
-    QDir themeFolder("iconthemes");
-    if (!themeFolder.mkpath("."))
+    if (!m_iconThemeFolder.mkpath("."))
         themeWarningLog() << "Couldn't create icon theme folder";
-    themeDebugLog() << "Icon Theme Folder Path: " << themeFolder.absolutePath();
+    themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath();
 
     auto searchPaths = QIcon::themeSearchPaths();
-    searchPaths.append(themeFolder.path());
+    searchPaths.append(m_iconThemeFolder.path());
     QIcon::setThemeSearchPaths(searchPaths);
 
     themeDebugLog() << "<> Initializing Icon Themes";
@@ -95,7 +94,7 @@ void ThemeManager::initializeIcons()
         themeDebugLog() << "Loaded Built-In Icon Theme" << id;
     }
 
-    QDirIterator directoryIterator(themeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
+    QDirIterator directoryIterator(m_iconThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
     while (directoryIterator.hasNext()) {
         QDir dir(directoryIterator.next());
         IconTheme theme(dir.dirName(), dir.path());
@@ -120,12 +119,11 @@ void ThemeManager::initializeWidgets()
     // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
     // dropdown?)
 
-    QDir themeFolder("themes");
-    if (!themeFolder.mkpath("."))
+    if (!m_applicationThemeFolder.mkpath("."))
         themeWarningLog() << "Couldn't create theme folder";
-    themeDebugLog() << "Theme Folder Path: " << themeFolder.absolutePath();
+    themeDebugLog() << "Theme Folder Path: " << m_applicationThemeFolder.absolutePath();
 
-    QDirIterator directoryIterator(themeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+    QDirIterator directoryIterator(m_applicationThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
     while (directoryIterator.hasNext()) {
         QDir dir(directoryIterator.next());
         QFileInfo themeJson(dir.absoluteFilePath("theme.json"));
@@ -148,6 +146,16 @@ void ThemeManager::initializeWidgets()
     themeDebugLog() << "<> Widget themes initialized.";
 }
 
+QList<IconTheme*> ThemeManager::getValidIconThemes()
+{
+    QList<IconTheme*> ret;
+    ret.reserve(m_icons.size());
+    for (auto&& [id, theme] : m_icons) {
+        ret.append(&theme);
+    }
+    return ret;
+}
+
 QList<ITheme*> ThemeManager::getValidApplicationThemes()
 {
     QList<ITheme*> ret;
@@ -158,14 +166,9 @@ QList<ITheme*> ThemeManager::getValidApplicationThemes()
     return ret;
 }
 
-QList<IconTheme*> ThemeManager::getValidIconThemes()
+bool ThemeManager::isValidIconTheme(const QString& id)
 {
-    QList<IconTheme*> ret;
-    ret.reserve(m_icons.size());
-    for (auto&& [id, theme] : m_icons) {
-        ret.append(&theme);
-    }
-    return ret;
+    return !id.isEmpty() && m_icons.find(id) != m_icons.end();
 }
 
 bool ThemeManager::isValidApplicationTheme(const QString& id)
@@ -173,9 +176,14 @@ bool ThemeManager::isValidApplicationTheme(const QString& id)
     return !id.isEmpty() && m_themes.find(id) != m_themes.end();
 }
 
-bool ThemeManager::isValidIconTheme(const QString& id)
+QDir ThemeManager::getIconThemesFolder()
 {
-    return !id.isEmpty() && m_icons.find(id) != m_icons.end();
+    return m_iconThemeFolder;
+}
+
+QDir ThemeManager::getApplicationThemesFolder()
+{
+    return m_applicationThemeFolder;
 }
 
 void ThemeManager::setIconTheme(const QString& name)
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index 627fdc75..5634a81a 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -37,10 +37,12 @@ class ThemeManager {
    public:
     ThemeManager();
 
-    QList<ITheme*> getValidApplicationThemes();
     QList<IconTheme*> getValidIconThemes();
-    bool isValidApplicationTheme(const QString& id);
+    QList<ITheme*> getValidApplicationThemes();
     bool isValidIconTheme(const QString& id);
+    bool isValidApplicationTheme(const QString& id);
+    QDir getIconThemesFolder();
+    QDir getApplicationThemesFolder();
     void applyCurrentlySelectedTheme(bool initial = false);
     void setIconTheme(const QString& name);
     void setApplicationTheme(const QString& name, bool initial = false);
@@ -55,6 +57,8 @@ class ThemeManager {
    private:
     std::map<QString, std::unique_ptr<ITheme>> m_themes;
     std::map<QString, IconTheme> m_icons;
+    QDir m_iconThemeFolder{ "iconthemes" };
+    QDir m_applicationThemeFolder{ "themes" };
 
     void initializeThemes();
     QString addTheme(std::unique_ptr<ITheme> theme);
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 455cbb7b..106a9ca3 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -19,17 +19,22 @@
 #include "ui_ThemeCustomizationWidget.h"
 
 #include "Application.h"
+#include "DesktopServices.h"
 #include "ui/themes/ITheme.h"
 #include "ui/themes/ThemeManager.h"
 
-ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ThemeCustomizationWidget)
+ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget* parent) : QWidget(parent), ui(new Ui::ThemeCustomizationWidget)
 {
     ui->setupUi(this);
     loadSettings();
 
     connect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);
-    connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyWidgetTheme);
+    connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ThemeCustomizationWidget::applyWidgetTheme);
     connect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyCatTheme);
+
+    connect(ui->iconsFolder, &QPushButton::clicked, this, [] { DesktopServices::openDirectory(APPLICATION->themeManager()->getIconThemesFolder().path()); });
+    connect(ui->widgetStyleFolder, &QPushButton::clicked, this, [] { DesktopServices::openDirectory(APPLICATION->themeManager()->getApplicationThemesFolder().path()); });
 }
 
 ThemeCustomizationWidget::~ThemeCustomizationWidget()
@@ -40,7 +45,7 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 /// <summary>
 /// The layout was not quite right, so currently this just disables the UI elements, which should be hidden instead
 /// TODO FIXME
-/// 
+///
 /// Original Method One:
 /// ui->iconsComboBox->setVisible(features& ThemeFields::ICONS);
 /// ui->iconsLabel->setVisible(features& ThemeFields::ICONS);
@@ -48,7 +53,7 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 /// ui->widgetThemeLabel->setVisible(features& ThemeFields::WIDGETS);
 /// ui->backgroundCatComboBox->setVisible(features& ThemeFields::CAT);
 /// ui->backgroundCatLabel->setVisible(features& ThemeFields::CAT);
-/// 
+///
 /// original Method Two:
 ///     if (!(features & ThemeFields::ICONS)) {
 ///         ui->formLayout->setRowVisible(0, false);
@@ -61,40 +66,44 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
 ///     }
 /// </summary>
 /// <param name="features"></param>
-void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
+void ThemeCustomizationWidget::showFeatures(ThemeFields features)
+{
     ui->iconsComboBox->setEnabled(features & ThemeFields::ICONS);
     ui->iconsLabel->setEnabled(features & ThemeFields::ICONS);
     ui->widgetStyleComboBox->setEnabled(features & ThemeFields::WIDGETS);
-    ui->widgetThemeLabel->setEnabled(features & ThemeFields::WIDGETS);
+    ui->widgetStyleLabel->setEnabled(features & ThemeFields::WIDGETS);
     ui->backgroundCatComboBox->setEnabled(features & ThemeFields::CAT);
     ui->backgroundCatLabel->setEnabled(features & ThemeFields::CAT);
 }
 
-void ThemeCustomizationWidget::applyIconTheme(int index) {
+void ThemeCustomizationWidget::applyIconTheme(int index)
+{
     auto settings = APPLICATION->settings();
     auto originalIconTheme = settings->get("IconTheme").toString();
     auto newIconTheme = ui->iconsComboBox->currentData().toString();
     if (originalIconTheme != newIconTheme) {
         settings->set("IconTheme", newIconTheme);
-        APPLICATION->applyCurrentlySelectedTheme();
+        APPLICATION->themeManager()->applyCurrentlySelectedTheme();
     }
 
     emit currentIconThemeChanged(index);
 }
 
-void ThemeCustomizationWidget::applyWidgetTheme(int index) {
+void ThemeCustomizationWidget::applyWidgetTheme(int index)
+{
     auto settings = APPLICATION->settings();
     auto originalAppTheme = settings->get("ApplicationTheme").toString();
     auto newAppTheme = ui->widgetStyleComboBox->currentData().toString();
     if (originalAppTheme != newAppTheme) {
         settings->set("ApplicationTheme", newAppTheme);
-        APPLICATION->applyCurrentlySelectedTheme();
+        APPLICATION->themeManager()->applyCurrentlySelectedTheme();
     }
 
     emit currentWidgetThemeChanged(index);
 }
 
-void ThemeCustomizationWidget::applyCatTheme(int index) {
+void ThemeCustomizationWidget::applyCatTheme(int index)
+{
     auto settings = APPLICATION->settings();
     settings->set("BackgroundCat", m_catOptions[index].first);
 
@@ -113,7 +122,7 @@ void ThemeCustomizationWidget::loadSettings()
 
     {
         auto currentIconTheme = settings->get("IconTheme").toString();
-        auto iconThemes = APPLICATION->getValidIconThemes();
+        auto iconThemes = APPLICATION->themeManager()->getValidIconThemes();
         int idx = 0;
         for (auto iconTheme : iconThemes) {
             QIcon iconForComboBox = QIcon(iconTheme->path() + "/scalable/settings");
@@ -127,7 +136,7 @@ void ThemeCustomizationWidget::loadSettings()
 
     {
         auto currentTheme = settings->get("ApplicationTheme").toString();
-        auto themes = APPLICATION->getValidApplicationThemes();
+        auto themes = APPLICATION->themeManager()->getValidApplicationThemes();
         int idx = 0;
         for (auto& theme : themes) {
             ui->widgetStyleComboBox->addItem(theme->name(), theme->id());
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
index 6b2c87f9..700c530c 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.ui
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -40,20 +40,40 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QComboBox" name="iconsComboBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::StrongFocus</enum>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="iconsLayout">
+     <item>
+      <widget class="QComboBox" name="iconsComboBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="iconsFolder">
+       <property name="toolTip">
+        <string>View icon themes folder.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset theme="viewfolder"/>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="1" column="0">
-    <widget class="QLabel" name="widgetThemeLabel">
+    <widget class="QLabel" name="widgetStyleLabel">
      <property name="text">
       <string>&amp;Widgets</string>
      </property>
@@ -63,17 +83,37 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QComboBox" name="widgetStyleComboBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="focusPolicy">
-      <enum>Qt::StrongFocus</enum>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="widgetStyleLayout">
+     <item>
+      <widget class="QComboBox" name="widgetStyleComboBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="widgetStyleFolder">
+       <property name="toolTip">
+        <string>View widget themes folder.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset theme="viewfolder"/>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="backgroundCatLabel">
@@ -89,7 +129,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="catLayout">
      <item>
       <widget class="QComboBox" name="backgroundCatComboBox">
        <property name="sizePolicy">
@@ -127,6 +167,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>iconsComboBox</tabstop>
+  <tabstop>widgetStyleComboBox</tabstop>
+  <tabstop>backgroundCatComboBox</tabstop>
+  <tabstop>catInfoLabel</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
-- 
cgit 


From 1a7c5693cc9d21cf974ad56e55a3ca07a22c8477 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Fri, 21 Jul 2023 13:01:01 +0100
Subject: Remove redundant methods

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp                         | 10 ----------
 launcher/Application.h                           |  4 ----
 launcher/ui/instanceview/InstanceView.cpp        |  4 ++--
 launcher/ui/setupwizard/ThemeWizardPage.cpp      |  2 +-
 launcher/ui/widgets/ThemeCustomizationWidget.cpp |  2 +-
 5 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index e6a8562c..acac2da2 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1175,16 +1175,6 @@ QIcon Application::getThemedIcon(const QString& name)
     return QIcon::fromTheme(name);
 }
 
-QList<CatPack*> Application::getValidCatPacks()
-{
-    return m_themeManager->getValidCatPacks();
-}
-
-QString Application::getCatPack(QString catName)
-{
-    return m_themeManager->getCatPack(catName);
-}
-
 bool Application::openJsonEditor(const QString& filename)
 {
     const QString file = QDir::current().absoluteFilePath(filename);
diff --git a/launcher/Application.h b/launcher/Application.h
index 203fd16e..1c221cec 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -122,10 +122,6 @@ public:
 
     ThemeManager* themeManager() { return m_themeManager.get(); }
 
-    QList<CatPack*> getValidCatPacks();
-
-    QString getCatPack(QString catName = "");
-
     shared_qobject_ptr<ExternalUpdater> updater() { return m_updater; }
 
     void triggerUpdateCheck();
diff --git a/launcher/ui/instanceview/InstanceView.cpp b/launcher/ui/instanceview/InstanceView.cpp
index 05f0004d..155550e1 100644
--- a/launcher/ui/instanceview/InstanceView.cpp
+++ b/launcher/ui/instanceview/InstanceView.cpp
@@ -52,7 +52,7 @@
 
 #include <Application.h>
 #include <InstanceList.h>
-
+#include "ui/themes/ThemeManager.h"
 
 template <typename T> bool listsIntersect(const QList<T> &l1, const QList<T> t2)
 {
@@ -503,7 +503,7 @@ void InstanceView::setPaintCat(bool visible)
 {
     m_catVisible = visible;
     if (visible)
-        m_catPixmap.load(APPLICATION->getCatPack());
+        m_catPixmap.load(APPLICATION->themeManager()->getCatPack());
     else
         m_catPixmap = QPixmap();
 }
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
index 1c336921..fe11ed9a 100644
--- a/launcher/ui/setupwizard/ThemeWizardPage.cpp
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -61,7 +61,7 @@ void ThemeWizardPage::updateIcons()
 void ThemeWizardPage::updateCat()
 {
     qDebug() << "Setting Cat";
-    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->getCatPack())));
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(%1)").arg(APPLICATION->themeManager()->getCatPack())));
 }
 
 void ThemeWizardPage::retranslate()
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 8ccb5dcc..b9294908 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -152,7 +152,7 @@ void ThemeCustomizationWidget::loadSettings()
     }
 
     auto cat = settings->get("BackgroundCat").toString();
-    for (auto& catFromList : APPLICATION->getValidCatPacks()) {
+    for (auto& catFromList : APPLICATION->themeManager()->getValidCatPacks()) {
         QIcon catIcon = QIcon(QString("%1").arg(catFromList->path()));
         ui->backgroundCatComboBox->addItem(catIcon, catFromList->name(), catFromList->id());
         if (cat == catFromList->id()) {
-- 
cgit 


From 83aa0062c7d831ca42ed4d82e5f6162ac8793be8 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 2 Aug 2023 13:45:08 +0200
Subject: feat: add custom native library path settings

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 CMakeLists.txt                                     | 12 ++++++
 buildconfig/BuildConfig.cpp.in                     |  3 ++
 buildconfig/BuildConfig.h                          |  3 ++
 launcher/Application.cpp                           | 13 +++++++
 launcher/Application.h                             |  4 ++
 launcher/minecraft/MinecraftInstance.cpp           | 20 +++++++---
 launcher/ui/pages/global/MinecraftPage.cpp         | 35 ++++++++++++++++-
 launcher/ui/pages/global/MinecraftPage.h           |  3 ++
 launcher/ui/pages/global/MinecraftPage.ui          | 40 ++++++++++++++++++--
 .../ui/pages/instance/InstanceSettingsPage.cpp     | 34 ++++++++++++++++-
 launcher/ui/pages/instance/InstanceSettingsPage.h  |  3 ++
 launcher/ui/pages/instance/InstanceSettingsPage.ui | 44 +++++++++++++++++++---
 12 files changed, 196 insertions(+), 18 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2853cb5..a8dd7a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,6 +216,18 @@ set(Launcher_SUBREDDIT_URL "https://prismlauncher.org/reddit" CACHE STRING "URL
 set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules")
 set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against")
 
+# Native libraries
+if(UNIX AND APPLE)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.dylib" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.dylib" CACHE STRING "Name of native glfw library")
+elseif(UNIX)
+    set(Launcher_GLFW_LIBRARY_NAME "libglfw.so" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "libopenal.so" CACHE STRING "Name of native glfw library")
+elseif(WIN32)
+    set(Launcher_GLFW_LIBRARY_NAME "glfw.dll" CACHE STRING "Name of native glfw library")
+    set(Launcher_OPENAL_LIBRARY_NAME "OpenAL.dll" CACHE STRING "Name of native glfw library")
+endif()
+
 # API Keys
 # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service
 # of these platforms, please change these API keys beforehand.
diff --git a/buildconfig/BuildConfig.cpp.in b/buildconfig/BuildConfig.cpp.in
index d7662a7a..1eb0022b 100644
--- a/buildconfig/BuildConfig.cpp.in
+++ b/buildconfig/BuildConfig.cpp.in
@@ -110,6 +110,9 @@ Config::Config()
     FLAME_API_KEY = "@Launcher_CURSEFORGE_API_KEY@";
     META_URL = "@Launcher_META_URL@";
 
+    GLFW_LIBRARY_NAME = "@Launcher_GLFW_LIBRARY_NAME@";
+    OPENAL_LIBRARY_NAME = "@Launcher_OPENAL_LIBRARY_NAME@";
+
     BUG_TRACKER_URL = "@Launcher_BUG_TRACKER_URL@";
     TRANSLATIONS_URL = "@Launcher_TRANSLATIONS_URL@";
     MATRIX_URL = "@Launcher_MATRIX_URL@";
diff --git a/buildconfig/BuildConfig.h b/buildconfig/BuildConfig.h
index 387f494f..a5649b98 100644
--- a/buildconfig/BuildConfig.h
+++ b/buildconfig/BuildConfig.h
@@ -134,6 +134,9 @@ class Config {
      */
     QString META_URL;
 
+    QString GLFW_LIBRARY_NAME;
+    QString OPENAL_LIBRARY_NAME;
+
     QString BUG_TRACKER_URL;
     QString TRANSLATIONS_URL;
     QString MATRIX_URL;
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index a1393510..6daa5a84 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -582,7 +582,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
         // Native library workarounds
         m_settings->registerSetting("UseNativeOpenAL", false);
+        m_settings->registerSetting("CustomOpenALPath", "");
         m_settings->registerSetting("UseNativeGLFW", false);
+        m_settings->registerSetting("CustomGLFWPath", "");
 
         // Peformance related options
         m_settings->registerSetting("EnableFeralGamemode", false);
@@ -842,6 +844,8 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
 
     updateCapabilities();
 
+    detectLibraries();
+
     if (createSetupWizard()) {
         return;
     }
@@ -1412,6 +1416,15 @@ void Application::updateCapabilities()
 #endif
 }
 
+void Application::detectLibraries()
+{
+#ifdef Q_OS_LINUX
+    m_detectedGLFWPath = MangoHud::findLibrary(BuildConfig.GLFW_LIBRARY_NAME);
+    m_detectedOpenALPath = MangoHud::findLibrary(BuildConfig.OPENAL_LIBRARY_NAME);
+    qDebug() << m_detectedGLFWPath << m_detectedOpenALPath;
+#endif
+}
+
 QString Application::getJarPath(QString jarFile)
 {
     QStringList potentialPaths = {
diff --git a/launcher/Application.h b/launcher/Application.h
index 6bc33274..5807107c 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -142,6 +142,8 @@ class Application : public QApplication {
 
     void updateCapabilities();
 
+    void detectLibraries();
+
     /*!
      * Finds and returns the full path to a jar file.
      * Returns a null-string if it could not be found.
@@ -275,6 +277,8 @@ class Application : public QApplication {
     SetupWizard* m_setupWizard = nullptr;
 
    public:
+    QString m_detectedGLFWPath;
+    QString m_detectedOpenALPath;
     QString m_instanceIdToLaunch;
     QString m_serverToJoin;
     QString m_profileToUse;
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 40fde6cb..bfc4ad98 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -166,7 +166,9 @@ void MinecraftInstance::loadSpecificSettings()
         // Native library workarounds
         auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
         m_settings->registerOverride(global_settings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(global_settings->getSetting("CustomOpenALPath"), nativeLibraryWorkaroundsOverride);
         m_settings->registerOverride(global_settings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(global_settings->getSetting("CustomGLFWPath"), nativeLibraryWorkaroundsOverride);
 
         // Peformance related options
         auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
@@ -390,22 +392,28 @@ QStringList MinecraftInstance::extraArguments()
             list.append("-Dloader.disable_beacon=true");
     }
 
-#ifdef Q_OS_LINUX
     {
         QString openALPath;
         QString glfwPath;
 
-        if (settings()->get("UseNativeOpenAL").toBool())
-            openALPath = MangoHud::findLibrary("libopenal.so");
-        if (settings()->get("UseNativeGLFW").toBool())
-            glfwPath = MangoHud::findLibrary("libglfw.so");
+        if (settings()->get("UseNativeOpenAL").toBool()) {
+            auto customPath = settings()->get("CustomOpenALPath").toString();
+            openALPath = APPLICATION->m_detectedOpenALPath;
+            if (!customPath.isEmpty())
+                openALPath = customPath;
+        }
+        if (settings()->get("UseNativeGLFW").toBool()) {
+            auto customPath = settings()->get("CustomGLFWPath").toString();
+            glfwPath = APPLICATION->m_detectedGLFWPath;
+            if (!customPath.isEmpty())
+                glfwPath = customPath;
+        }
 
         if (!openALPath.isEmpty())
             list.append("-Dorg.lwjgl.openal.libname=" + openALPath);
         if (!glfwPath.isEmpty())
             list.append("-Dorg.lwjgl.glfw.libname=" + glfwPath);
     }
-#endif
 
     return list;
 }
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index 866a4121..1c774721 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -35,6 +35,7 @@
  */
 
 #include "MinecraftPage.h"
+#include "BuildConfig.h"
 #include "ui_MinecraftPage.h"
 
 #include <QDir>
@@ -44,9 +45,15 @@
 #include "Application.h"
 #include "settings/SettingsObject.h"
 
+#ifdef Q_OS_LINUX
+#include "MangoHud.h"
+#endif
+
 MinecraftPage::MinecraftPage(QWidget* parent) : QWidget(parent), ui(new Ui::MinecraftPage)
 {
     ui->setupUi(this);
+    connect(ui->useNativeGLFWCheck, &QAbstractButton::toggled, this, &MinecraftPage::onUseNativeGLFWChanged);
+    connect(ui->useNativeOpenALCheck, &QAbstractButton::toggled, this, &MinecraftPage::onUseNativeOpenALChanged);
     loadSettings();
     updateCheckboxStuff();
 }
@@ -74,6 +81,16 @@ void MinecraftPage::on_maximizedCheckBox_clicked(bool checked)
     updateCheckboxStuff();
 }
 
+void MinecraftPage::onUseNativeGLFWChanged(bool checked)
+{
+    ui->lineEditGLFWPath->setEnabled(checked);
+}
+
+void MinecraftPage::onUseNativeOpenALChanged(bool checked)
+{
+    ui->lineEditOpenALPath->setEnabled(checked);
+}
+
 void MinecraftPage::applySettings()
 {
     auto s = APPLICATION->settings();
@@ -84,8 +101,10 @@ void MinecraftPage::applySettings()
     s->set("MinecraftWinHeight", ui->windowHeightSpinBox->value());
 
     // Native library workarounds
-    s->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
     s->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
+    s->set("CustomGLFWPath", ui->lineEditGLFWPath->text());
+    s->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
+    s->set("CustomOpenALPath", ui->lineEditOpenALPath->text());
 
     // Peformance related options
     s->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
@@ -114,8 +133,20 @@ void MinecraftPage::loadSettings()
     ui->windowWidthSpinBox->setValue(s->get("MinecraftWinWidth").toInt());
     ui->windowHeightSpinBox->setValue(s->get("MinecraftWinHeight").toInt());
 
-    ui->useNativeOpenALCheck->setChecked(s->get("UseNativeOpenAL").toBool());
     ui->useNativeGLFWCheck->setChecked(s->get("UseNativeGLFW").toBool());
+    ui->lineEditGLFWPath->setText(s->get("CustomGLFWPath").toString());
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.GLFW_LIBRARY_NAME));
+#ifdef Q_OS_LINUX
+    if (!APPLICATION->m_detectedGLFWPath.isEmpty())
+        ui->lineEditGLFWPath->setPlaceholderText(tr("Auto detected path: %1").arg(APPLICATION->m_detectedGLFWPath));
+#endif
+    ui->useNativeOpenALCheck->setChecked(s->get("UseNativeOpenAL").toBool());
+    ui->lineEditOpenALPath->setText(s->get("CustomOpenALPath").toString());
+    ui->lineEditOpenALPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
+#ifdef Q_OS_LINUX
+    if (!APPLICATION->m_detectedOpenALPath.isEmpty())
+        ui->lineEditOpenALPath->setPlaceholderText(tr("Auto detected path: %1").arg(APPLICATION->m_detectedOpenALPath));
+#endif
 
     ui->enableFeralGamemodeCheck->setChecked(s->get("EnableFeralGamemode").toBool());
     ui->enableMangoHud->setChecked(s->get("EnableMangoHud").toBool());
diff --git a/launcher/ui/pages/global/MinecraftPage.h b/launcher/ui/pages/global/MinecraftPage.h
index 28c31b5d..5facfbb3 100644
--- a/launcher/ui/pages/global/MinecraftPage.h
+++ b/launcher/ui/pages/global/MinecraftPage.h
@@ -70,6 +70,9 @@ class MinecraftPage : public QWidget, public BasePage {
    private slots:
     void on_maximizedCheckBox_clicked(bool checked);
 
+    void onUseNativeGLFWChanged(bool checked);
+    void onUseNativeOpenALChanged(bool checked);
+
    private:
     Ui::MinecraftPage* ui;
 };
diff --git a/launcher/ui/pages/global/MinecraftPage.ui b/launcher/ui/pages/global/MinecraftPage.ui
index 393b0f35..98e90e4e 100644
--- a/launcher/ui/pages/global/MinecraftPage.ui
+++ b/launcher/ui/pages/global/MinecraftPage.ui
@@ -214,21 +214,55 @@
          <property name="title">
           <string>Native library workarounds</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_11">
-          <item>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
            <widget class="QCheckBox" name="useNativeGLFWCheck">
             <property name="text">
              <string>Use system installation of &amp;GLFW</string>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelGLFWPath">
+            <property name="text">
+             <string>&amp;GLFW library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditGLFWPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
            <widget class="QCheckBox" name="useNativeOpenALCheck">
             <property name="text">
              <string>Use system installation of &amp;OpenAL</string>
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelOpenALPath">
+            <property name="text">
+             <string>&amp;OpenAL library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditOpenALPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="lineEditGLFWPath">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="lineEditOpenALPath">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index f7be9168..d603237b 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -66,6 +66,10 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent)
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
     connect(ui->instanceAccountSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &InstanceSettingsPage::changeInstanceAccount);
+
+    connect(ui->useNativeGLFWCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeGLFWChanged);
+    connect(ui->useNativeOpenALCheck, &QAbstractButton::toggled, this, &InstanceSettingsPage::onUseNativeOpenALChanged);
+
     loadSettings();
 
     updateThresholds();
@@ -198,11 +202,15 @@ void InstanceSettingsPage::applySettings()
     bool workarounds = ui->nativeWorkaroundsGroupBox->isChecked();
     m_settings->set("OverrideNativeWorkarounds", workarounds);
     if (workarounds) {
-        m_settings->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
         m_settings->set("UseNativeGLFW", ui->useNativeGLFWCheck->isChecked());
+        m_settings->set("CustomGLFWPath", ui->lineEditGLFWPath->text());
+        m_settings->set("UseNativeOpenAL", ui->useNativeOpenALCheck->isChecked());
+        m_settings->set("CustomOpenALPath", ui->lineEditOpenALPath->text());
     } else {
-        m_settings->reset("UseNativeOpenAL");
         m_settings->reset("UseNativeGLFW");
+        m_settings->reset("CustomGLFWPath");
+        m_settings->reset("UseNativeOpenAL");
+        m_settings->reset("CustomOpenALPath");
     }
 
     // Performance
@@ -312,7 +320,19 @@ void InstanceSettingsPage::loadSettings()
     // Workarounds
     ui->nativeWorkaroundsGroupBox->setChecked(m_settings->get("OverrideNativeWorkarounds").toBool());
     ui->useNativeGLFWCheck->setChecked(m_settings->get("UseNativeGLFW").toBool());
+    ui->lineEditGLFWPath->setText(m_settings->get("CustomGLFWPath").toString());
+#ifdef Q_OS_LINUX
+    ui->lineEditGLFWPath->setPlaceholderText(APPLICATION->m_detectedGLFWPath);
+#else
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.GLFW_LIBRARY_NAME));
+#endif
     ui->useNativeOpenALCheck->setChecked(m_settings->get("UseNativeOpenAL").toBool());
+    ui->lineEditOpenALPath->setText(m_settings->get("CustomOpenALPath").toString());
+#ifdef Q_OS_LINUX
+    ui->lineEditOpenALPath->setPlaceholderText(APPLICATION->m_detectedOpenALPath);
+#else
+    ui->lineEditGLFWPath->setPlaceholderText(tr("Path to %1 library file").arg(BuildConfig.OPENAL_LIBRARY_NAME));
+#endif
 
     // Performance
     ui->perfomanceGroupBox->setChecked(m_settings->get("OverridePerformance").toBool());
@@ -408,6 +428,16 @@ void InstanceSettingsPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void InstanceSettingsPage::onUseNativeGLFWChanged(bool checked)
+{
+    ui->lineEditGLFWPath->setEnabled(checked);
+}
+
+void InstanceSettingsPage::onUseNativeOpenALChanged(bool checked)
+{
+    ui->lineEditOpenALPath->setEnabled(checked);
+}
+
 void InstanceSettingsPage::updateAccountsMenu()
 {
     ui->instanceAccountSelector->clear();
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 21ecbaf8..8b78dcb7 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -71,6 +71,9 @@ class InstanceSettingsPage : public QWidget, public BasePage {
     void on_javaBrowseBtn_clicked();
     void on_maxMemSpinBox_valueChanged(int i);
 
+    void onUseNativeGLFWChanged(bool checked);
+    void onUseNativeOpenALChanged(bool checked);
+
     void applySettings();
     void loadSettings();
 
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index 380d8c88..fcc2a5d0 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -443,18 +443,52 @@
          <property name="checked">
           <bool>false</bool>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_7">
-          <item>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="useNativeOpenALCheck">
+            <property name="text">
+             <string>Use system installation of OpenAL</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelGLFWPath">
+            <property name="text">
+             <string>&amp;GLFW library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditGLFWPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
            <widget class="QCheckBox" name="useNativeGLFWCheck">
             <property name="text">
              <string>Use system installation of GLFW</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QCheckBox" name="useNativeOpenALCheck">
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="lineEditGLFWPath">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelOpenALPath">
             <property name="text">
-             <string>Use system installation of OpenAL</string>
+             <string>&amp;OpenAL library path</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineEditOpenALPath</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="lineEditOpenALPath">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
            </widget>
           </item>
-- 
cgit 


From ffd8ed550f05e1336afc6ddc424b6733256ecf02 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Thu, 17 Aug 2023 10:16:52 +0100
Subject: Reformat

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/Application.cpp     | 15 +++++----------
 launcher/Application.h       |  2 +-
 launcher/ui/InstanceWindow.h |  2 +-
 launcher/ui/MainWindow.cpp   |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'launcher/Application.h')

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index c1bf7e5e..4da7629c 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -1104,18 +1104,13 @@ bool Application::launch(InstancePtr instance,
                          MinecraftServerTargetPtr serverToJoin,
                          MinecraftAccountPtr accountToUse)
 {
-    if(m_updateRunning)
-    {
+    if (m_updateRunning) {
         qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed.";
-    }
-    else if(instance->canLaunch())
-    {
-        auto & extras = m_instanceExtras[instance->id()];
+    } else if (instance->canLaunch()) {
+        auto& extras = m_instanceExtras[instance->id()];
         auto window = extras.window;
-        if(window)
-        {
-            if(!window->saveAll())
-            {
+        if (window) {
+            if (!window->saveAll()) {
                 return false;
             }
         }
diff --git a/launcher/Application.h b/launcher/Application.h
index a09f46b5..8a85fd95 100644
--- a/launcher/Application.h
+++ b/launcher/Application.h
@@ -187,7 +187,7 @@ class Application : public QApplication {
     void clickedOnDock();
 #endif
 
-public slots:
+   public slots:
     bool launch(InstancePtr instance,
                 bool online = true,
                 bool demo = false,
diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h
index a8a7559f..e5bc24d4 100644
--- a/launcher/ui/InstanceWindow.h
+++ b/launcher/ui/InstanceWindow.h
@@ -52,7 +52,7 @@ class PageContainer;
 class InstanceWindow : public QMainWindow, public BasePageContainer {
     Q_OBJECT
 
-public:
+   public:
     explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
     virtual ~InstanceWindow() = default;
 
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 48feea09..36a6e379 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -551,7 +551,7 @@ void MainWindow::updateMainToolBar()
 
 void MainWindow::updateLaunchButton()
 {
-    QMenu *launchMenu = ui->actionLaunchInstance->menu();
+    QMenu* launchMenu = ui->actionLaunchInstance->menu();
     if (launchMenu)
         launchMenu->clear();
     else
-- 
cgit