From a737d5df42ed0a7149bbced10e8fd38fc2b6fe2f Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:53:57 +0200
Subject: [PATCH 01/13] added instance shortcut feature

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/Application.cpp                  |   3 +
 launcher/FileSystem.cpp                   |   5 +
 launcher/FileSystem.h                     |   3 +
 launcher/ui/MainWindow.cpp                | 245 ++++++++++++----------
 launcher/ui/pages/global/LauncherPage.cpp |  35 ++++
 launcher/ui/pages/global/LauncherPage.ui  |  96 +++++----
 6 files changed, 238 insertions(+), 149 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index ea749ca4c..8714799ff 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -701,6 +701,9 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("InstSortMode", "Name");
         m_settings->registerSetting("SelectedInstance", QString());
 
+        // Shortcut creation
+        m_settings->registerSetting("ShortcutCreationMode", "Desktop");
+
         // Window state and geometry
         m_settings->registerSetting("MainWindowState", "");
         m_settings->registerSetting("MainWindowGeometry", "");
diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 512de28c2..8f683a9fb 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -915,6 +915,11 @@ QString getDesktopDir()
     return QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
 }
 
+QString getApplicationsDir()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
+}
+
 // Cross-platform Shortcut creation
 bool createShortcut(QString destination, QString target, QStringList args, QString name, QString icon)
 {
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index c5beef7bd..4aa5596ae 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -353,6 +353,9 @@ bool checkProblemticPathJava(QDir folder);
 // Get the Directory representing the User's Desktop
 QString getDesktopDir();
 
+// Get the Directory representing the User's Applications directory
+QString getApplicationsDir();
+
 // Overrides one folder with the contents of another, preserving items exclusive to the first folder
 // Equivalent to doing QDir::rename, but allowing for overrides
 bool overrideFolder(QString overwritten_path, QString override_path);
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 09c47b609..0961a5c4e 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1495,141 +1495,158 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
 {
     if (!m_selectedInstance)
         return;
-    auto desktopPath = FS::getDesktopDir();
-    if (desktopPath.isEmpty()) {
-        // TODO come up with an alternative solution (open "save file" dialog)
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
-        return;
+
+    std::vector<QString> paths;
+    QString mode = APPLICATION->settings()->get("ShortcutCreationMode").toString();
+    if (mode == "Applications") {
+        paths.push_back(FS::getApplicationsDir());
+    } else if (mode == "Both") {
+        paths.push_back(FS::getDesktopDir());
+        paths.push_back(FS::getApplicationsDir());
+    } else {
+        // Default to desktop
+        paths.push_back(FS::getDesktopDir());
     }
 
-    QString desktopFilePath;
-    QString appPath = QApplication::applicationFilePath();
-    QString iconPath;
-    QStringList args;
-#if defined(Q_OS_MACOS)
-    appPath = QApplication::applicationFilePath();
-    if (appPath.startsWith("/private/var/")) {
-        QMessageBox::critical(this, tr("Create instance shortcut"),
-                              tr("The launcher is in the folder it was extracted from, therefore it cannot create shortcuts."));
-        return;
-    }
-
-    auto pIcon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-    if (pIcon == nullptr) {
-        pIcon = APPLICATION->icons()->icon("grass");
-    }
-
-    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "Icon.icns");
-
-    QFile iconFile(iconPath);
-    if (!iconFile.open(QFile::WriteOnly)) {
-        QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
-        return;
-    }
-
-    QIcon icon = pIcon->icon();
-
-    bool success = icon.pixmap(1024, 1024).save(iconPath, "ICNS");
-    iconFile.close();
-
-    if (!success) {
-        iconFile.remove();
-        QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
-        return;
-    }
-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-    if (appPath.startsWith("/tmp/.mount_")) {
-        // AppImage!
-        appPath = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
-        if (appPath.isEmpty()) {
-            QMessageBox::critical(this, tr("Create instance shortcut"),
-                                  tr("Launcher is running as misconfigured AppImage? ($APPIMAGE environment variable is missing)"));
-        } else if (appPath.endsWith("/")) {
-            appPath.chop(1);
+    for (const QString& shortcutDirPath : paths) {
+        if (shortcutDirPath.isEmpty()) {
+            // TODO come up with an alternative solution (open "save file" dialog)
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
+            return;
         }
-    }
 
-    auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-    if (icon == nullptr) {
-        icon = APPLICATION->icons()->icon("grass");
-    }
+        QString shortcutFilePath;
+        QString appPath = QApplication::applicationFilePath();
+        QString iconPath;
+        QStringList args;
+#if defined(Q_OS_MACOS)
+        appPath = QApplication::applicationFilePath();
+        if (appPath.startsWith("/private/var/")) {
+            QMessageBox::critical(this, tr("Create instance shortcut"),
+                                  tr("The launcher is in the folder it was extracted from, therefore it cannot create shortcuts."));
+            return;
+        }
 
-    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.png");
+        auto pIcon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+        if (pIcon == nullptr) {
+            pIcon = APPLICATION->icons()->icon("grass");
+        }
 
-    QFile iconFile(iconPath);
-    if (!iconFile.open(QFile::WriteOnly)) {
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-        return;
-    }
-    bool success = icon->icon().pixmap(64, 64).save(&iconFile, "PNG");
-    iconFile.close();
+        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "Icon.icns");
 
-    if (!success) {
-        iconFile.remove();
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-        return;
-    }
+        QFile iconFile(iconPath);
+        if (!iconFile.open(QFile::WriteOnly)) {
+            QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
+            return;
+        }
 
-    if (DesktopServices::isFlatpak()) {
-        desktopFilePath = FS::PathCombine(desktopPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + ".desktop");
-        QFileDialog fileDialog;
-        // workaround to make sure the portal file dialog opens in the desktop directory
-        fileDialog.setDirectoryUrl(desktopPath);
-        desktopFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), desktopFilePath, tr("Desktop Entries") + " (*.desktop)");
-        if (desktopFilePath.isEmpty())
-            return;  // file dialog canceled by user
-        appPath = "flatpak";
-        QString flatpakAppId = BuildConfig.LAUNCHER_DESKTOPFILENAME;
-        flatpakAppId.remove(".desktop");
-        args.append({ "run", flatpakAppId });
-    }
+        QIcon icon = pIcon->icon();
+
+        bool success = icon.pixmap(1024, 1024).save(iconPath, "ICNS");
+        iconFile.close();
+
+        if (!success) {
+            iconFile.remove();
+            QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
+            return;
+        }
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+        if (appPath.startsWith("/tmp/.mount_")) {
+            // AppImage!
+            appPath = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
+            if (appPath.isEmpty()) {
+                QMessageBox::critical(this, tr("Create instance shortcut"),
+                                      tr("Launcher is running as misconfigured AppImage? ($APPIMAGE environment variable is missing)"));
+            } else if (appPath.endsWith("/")) {
+                appPath.chop(1);
+            }
+        }
+
+        auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+        if (icon == nullptr) {
+            icon = APPLICATION->icons()->icon("grass");
+        }
+
+        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.png");
+
+        QFile iconFile(iconPath);
+        if (!iconFile.open(QFile::WriteOnly)) {
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+            return;
+        }
+        bool success = icon->icon().pixmap(64, 64).save(&iconFile, "PNG");
+        iconFile.close();
+
+        if (!success) {
+            iconFile.remove();
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+            return;
+        }
+
+        if (DesktopServices::isFlatpak()) {
+            shortcutFilePath = FS::PathCombine(shortcutDirPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + ".desktop");
+            QFileDialog fileDialog;
+            // workaround to make sure the portal file dialog opens in the desktop directory
+            fileDialog.setDirectoryUrl(shortcutDirPath);
+            shortcutFilePath =
+                fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*.desktop)");
+            if (shortcutFilePath.isEmpty())
+                return;  // file dialog canceled by user
+            appPath = "flatpak";
+            QString flatpakAppId = BuildConfig.LAUNCHER_DESKTOPFILENAME;
+            flatpakAppId.remove(".desktop");
+            args.append({ "run", flatpakAppId });
+        }
 
 #elif defined(Q_OS_WIN)
-    auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-    if (icon == nullptr) {
-        icon = APPLICATION->icons()->icon("grass");
-    }
+        auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+        if (icon == nullptr) {
+            icon = APPLICATION->icons()->icon("grass");
+        }
 
-    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
+        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
 
-    // part of fix for weird bug involving the window icon being replaced
-    // dunno why it happens, but this 2-line fix seems to be enough, so w/e
-    auto appIcon = APPLICATION->getThemedIcon("logo");
+        // part of fix for weird bug involving the window icon being replaced
+        // dunno why it happens, but this 2-line fix seems to be enough, so w/e
+        auto appIcon = APPLICATION->getThemedIcon("logo");
 
-    QFile iconFile(iconPath);
-    if (!iconFile.open(QFile::WriteOnly)) {
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-        return;
-    }
-    bool success = icon->icon().pixmap(64, 64).save(&iconFile, "ICO");
-    iconFile.close();
+        QFile iconFile(iconPath);
+        if (!iconFile.open(QFile::WriteOnly)) {
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+            return;
+        }
+        bool success = icon->icon().pixmap(64, 64).save(&iconFile, "ICO");
+        iconFile.close();
 
-    // restore original window icon
-    QGuiApplication::setWindowIcon(appIcon);
+        // restore original window icon
+        QGuiApplication::setWindowIcon(appIcon);
 
-    if (!success) {
-        iconFile.remove();
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-        return;
-    }
+        if (!success) {
+            iconFile.remove();
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+            return;
+        }
 
 #else
-    QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on your platform!"));
-    return;
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on your platform!"));
+        return;
 #endif
-    args.append({ "--launch", m_selectedInstance->id() });
-    if (FS::createShortcut(desktopFilePath, appPath, args, m_selectedInstance->name(), iconPath)) {
+        args.append({ "--launch", m_selectedInstance->id() });
+
+        if (shortcutFilePath.isEmpty())
+            shortcutFilePath = FS::PathCombine(shortcutDirPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
+        if (!FS::createShortcut(shortcutFilePath, appPath, args, m_selectedInstance->name(), iconPath)) {
 #if not defined(Q_OS_MACOS)
-        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
-#else
-        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
+            iconFile.remove();
 #endif
-    } else {
-#if not defined(Q_OS_MACOS)
-        iconFile.remove();
-#endif
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
+        }
     }
+#if not defined(Q_OS_MACOS)
+    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
+#else
+    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
+#endif
 }
 
 void MainWindow::taskEnd()
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 8bbed9643..90540247e 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -65,6 +65,15 @@ enum InstSortMode {
     Sort_LastLaunch
 };
 
+enum ShortcutCreationMode {
+    // Create a shortcut in the applications
+    Shortcut_OnlyApplications,
+    // Create a shortcut in both locations
+    Shortcut_Both,
+    // Create a shortcut on the desktop
+    Shortcut_OnlyDesktop
+};
+
 LauncherPage::LauncherPage(QWidget* parent) : QWidget(parent), ui(new Ui::LauncherPage)
 {
     ui->setupUi(this);
@@ -254,6 +263,19 @@ void LauncherPage::applySettings()
     s->set("ModMetadataDisabled", ui->metadataDisableBtn->isChecked());
     s->set("ModDependenciesDisabled", ui->dependenciesDisableBtn->isChecked());
     s->set("SkipModpackUpdatePrompt", ui->skipModpackUpdatePromptBtn->isChecked());
+
+    auto shortcutMode = (ShortcutCreationMode) ui->createShortcutActionComboBox->currentIndex();
+    switch (shortcutMode) {
+        case Shortcut_OnlyApplications:
+            s->set("ShortcutCreationMode", "Applications");
+            break;
+        case Shortcut_Both:
+            s->set("ShortcutCreationMode", "Both");
+            break;
+        case Shortcut_OnlyDesktop:
+            s->set("ShortcutCreationMode", "Desktop");
+            break;
+    }
 }
 void LauncherPage::loadSettings()
 {
@@ -319,6 +341,19 @@ void LauncherPage::loadSettings()
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
     ui->dependenciesDisableBtn->setChecked(s->get("ModDependenciesDisabled").toBool());
     ui->skipModpackUpdatePromptBtn->setChecked(s->get("SkipModpackUpdatePrompt").toBool());
+
+    QString shortcutModeStr = s->get("ShortcutCreationMode").toString();
+    ShortcutCreationMode shortcutMode = Shortcut_OnlyDesktop;
+    if(shortcutModeStr == "Applications") {
+        shortcutMode = Shortcut_OnlyApplications;
+    } else if(shortcutModeStr == "Desktop") {
+        // Guess we don't need that, but it's here for completeness
+        shortcutMode = Shortcut_OnlyDesktop;
+    } else if(shortcutModeStr == "Both") {
+        shortcutMode = Shortcut_Both;
+    }
+
+    ui->createShortcutActionComboBox->setCurrentIndex(shortcutMode);
 }
 
 void LauncherPage::refreshFontPreview()
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 3cba468ff..1e08d8266 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -282,41 +282,6 @@
           <string>Miscellaneous</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="1" column="1">
-           <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="numberOfConcurrentTasksLabel">
-            <property name="text">
-             <string>Number of concurrent tasks</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QSpinBox" name="numberOfConcurrentTasksSpinBox">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="numberOfConcurrentDownloadsLabel">
-            <property name="text">
-             <string>Number of concurrent downloads</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="numberOfManualRetriesLabel">
-            <property name="text">
-             <string>Number of manual retries</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="1">
            <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
             <property name="minimum">
@@ -334,6 +299,13 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="1">
            <widget class="QSpinBox" name="timeoutSecondsSpinBox">
             <property name="suffix">
@@ -341,6 +313,60 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="numberOfConcurrentDownloadsLabel">
+            <property name="text">
+             <string>Number of concurrent downloads</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="numberOfManualRetriesLabel">
+            <property name="text">
+             <string>Number of manual retries</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="numberOfConcurrentTasksLabel">
+            <property name="text">
+             <string>Number of concurrent tasks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="numberOfConcurrentTasksSpinBox">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="createShortcutActionLabel">
+            <property name="text">
+             <string>Create shortcut action</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QComboBox" name="createShortcutActionComboBox">
+            <item>
+             <property name="text">
+              <string>Applications only</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Applications &amp; Desktop</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Desktop only</string>
+             </property>
+            </item>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>

From 59efca764c03450717f8544d96902624bcd6cad0 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Tue, 22 Oct 2024 21:20:22 +0200
Subject: [PATCH 02/13] removed creation of shortcuts for flatpak / appimage
 users

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 0961a5c4e..8979667f0 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1633,6 +1633,7 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
 #endif
         args.append({ "--launch", m_selectedInstance->id() });
 
+        bool userDefinedShortcutPath = !shortcutFilePath.isEmpty();
         if (shortcutFilePath.isEmpty())
             shortcutFilePath = FS::PathCombine(shortcutDirPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
         if (!FS::createShortcut(shortcutFilePath, appPath, args, m_selectedInstance->name(), iconPath)) {
@@ -1640,7 +1641,11 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered()
             iconFile.remove();
 #endif
             QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
+            return;
         }
+
+        if(userDefinedShortcutPath)
+            break;
     }
 #if not defined(Q_OS_MACOS)
     QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));

From b182a888aa3559ab3c0e8034533cc63040f84c34 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:39:03 +0200
Subject: [PATCH 03/13] revert changes to settings and used menu for shortcuts

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/Application.cpp                  |   3 -
 launcher/ui/MainWindow.cpp                | 330 ++++++++++++----------
 launcher/ui/MainWindow.h                  |   9 +-
 launcher/ui/MainWindow.ui                 | 166 +++++------
 launcher/ui/pages/global/LauncherPage.cpp |  37 +--
 launcher/ui/pages/global/LauncherPage.ui  |  92 +++---
 6 files changed, 293 insertions(+), 344 deletions(-)

diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 8714799ff..ea749ca4c 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -701,9 +701,6 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         m_settings->registerSetting("InstSortMode", "Name");
         m_settings->registerSetting("SelectedInstance", QString());
 
-        // Shortcut creation
-        m_settings->registerSetting("ShortcutCreationMode", "Desktop");
-
         // Window state and geometry
         m_settings->registerSetting("MainWindowState", "");
         m_settings->registerSetting("MainWindowGeometry", "");
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 8979667f0..511055b07 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -208,6 +208,13 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         exportInstanceMenu->addAction(ui->actionExportInstanceMrPack);
         exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
+
+        auto shortcutInstanceMenu = new QMenu(this);
+        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutDesktop);
+        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutApplications);
+        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutOther);
+
+        ui->actionCreateInstanceShortcut->setMenu(shortcutInstanceMenu);
     }
 
     // hide, disable and show stuff
@@ -235,6 +242,13 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         }
 
         ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
+
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+        bool isFlatpak = DesktopServices::isFlatpak();
+
+        ui->actionCreateInstanceShortcutDesktop->setEnabled(isFlatpak);
+        ui->actionCreateInstanceShortcutApplications->setEnabled(isFlatpak);
+#endif
     }
 
     // add the toolbar toggles to the view menu
@@ -1491,167 +1505,169 @@ void MainWindow::on_actionKillInstance_triggered()
     }
 }
 
-void MainWindow::on_actionCreateInstanceShortcut_triggered()
+void MainWindow::createInstanceShortcut(QString shortcutFilePath) {
+
+    QString appPath = QApplication::applicationFilePath();
+    QString iconPath;
+    QStringList args;
+#if defined(Q_OS_MACOS)
+    appPath = QApplication::applicationFilePath();
+    if (appPath.startsWith("/private/var/")) {
+        QMessageBox::critical(this, tr("Create instance shortcut"),
+                              tr("The launcher is in the folder it was extracted from, therefore it cannot create shortcuts."));
+        return;
+    }
+
+    auto pIcon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+    if (pIcon == nullptr) {
+        pIcon = APPLICATION->icons()->icon("grass");
+    }
+
+    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "Icon.icns");
+
+    QFile iconFile(iconPath);
+    if (!iconFile.open(QFile::WriteOnly)) {
+        QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
+        return;
+    }
+
+    QIcon icon = pIcon->icon();
+
+    bool success = icon.pixmap(1024, 1024).save(iconPath, "ICNS");
+    iconFile.close();
+
+    if (!success) {
+        iconFile.remove();
+        QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
+        return;
+    }
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+    if (appPath.startsWith("/tmp/.mount_")) {
+        // AppImage!
+        appPath = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
+        if (appPath.isEmpty()) {
+            QMessageBox::critical(this, tr("Create instance shortcut"),
+                                  tr("Launcher is running as misconfigured AppImage? ($APPIMAGE environment variable is missing)"));
+        } else if (appPath.endsWith("/")) {
+            appPath.chop(1);
+        }
+    }
+
+    auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+    if (icon == nullptr) {
+        icon = APPLICATION->icons()->icon("grass");
+    }
+
+    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.png");
+
+    QFile iconFile(iconPath);
+    if (!iconFile.open(QFile::WriteOnly)) {
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+        return;
+    }
+    bool success = icon->icon().pixmap(64, 64).save(&iconFile, "PNG");
+    iconFile.close();
+
+    if (!success) {
+        iconFile.remove();
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+        return;
+    }
+
+    if (DesktopServices::isFlatpak()) {
+        appPath = "flatpak";
+        QString flatpakAppId = BuildConfig.LAUNCHER_DESKTOPFILENAME;
+        flatpakAppId.remove(".desktop");
+        args.append({ "run", flatpakAppId });
+    }
+
+#elif defined(Q_OS_WIN)
+    auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
+    if (icon == nullptr) {
+        icon = APPLICATION->icons()->icon("grass");
+    }
+
+    iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
+
+    // part of fix for weird bug involving the window icon being replaced
+    // dunno why it happens, but this 2-line fix seems to be enough, so w/e
+    auto appIcon = APPLICATION->getThemedIcon("logo");
+
+    QFile iconFile(iconPath);
+    if (!iconFile.open(QFile::WriteOnly)) {
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+        return;
+    }
+    bool success = icon->icon().pixmap(64, 64).save(&iconFile, "ICO");
+    iconFile.close();
+
+    // restore original window icon
+    QGuiApplication::setWindowIcon(appIcon);
+
+    if (!success) {
+        iconFile.remove();
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
+        return;
+    }
+
+#else
+    QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on your platform!"));
+    return;
+#endif
+    args.append({ "--launch", m_selectedInstance->id() });
+
+    if (!FS::createShortcut(std::move(shortcutFilePath), appPath, args, m_selectedInstance->name(), iconPath)) {
+#if not defined(Q_OS_MACOS)
+        iconFile.remove();
+#endif
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
+        return;
+    }
+}
+
+void MainWindow::on_actionCreateInstanceShortcutOther_triggered() {
+        if (!m_selectedInstance)
+                return;
+
+        QString defaultedDir = FS::getDesktopDir();
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+        QString extension = ".desktop";
+#elif defined(Q_OS_WINDOWS)
+        QString extension = ".lnk";
+#else
+        QString extension = "";
+#endif
+
+        QString shortcutFilePath = FS::PathCombine(defaultedDir, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + extension);
+        QFileDialog fileDialog;
+        // workaround to make sure the portal file dialog opens in the desktop directory
+        fileDialog.setDirectoryUrl(defaultedDir);
+
+        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*.desktop)");
+        if (shortcutFilePath.isEmpty())
+            return;  // file dialog canceled by user
+
+        createInstanceShortcut(shortcutFilePath);
+        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
+}
+
+void MainWindow::on_actionCreateInstanceShortcutDesktop_triggered() {
+        if (!m_selectedInstance)
+                return;
+
+        QString shortcutFilePath = FS::PathCombine(FS::getDesktopDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
+        createInstanceShortcut(shortcutFilePath);
+        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
+}
+
+void MainWindow::on_actionCreateInstanceShortcutApplications_triggered()
 {
     if (!m_selectedInstance)
         return;
 
-    std::vector<QString> paths;
-    QString mode = APPLICATION->settings()->get("ShortcutCreationMode").toString();
-    if (mode == "Applications") {
-        paths.push_back(FS::getApplicationsDir());
-    } else if (mode == "Both") {
-        paths.push_back(FS::getDesktopDir());
-        paths.push_back(FS::getApplicationsDir());
-    } else {
-        // Default to desktop
-        paths.push_back(FS::getDesktopDir());
-    }
-
-    for (const QString& shortcutDirPath : paths) {
-        if (shortcutDirPath.isEmpty()) {
-            // TODO come up with an alternative solution (open "save file" dialog)
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
-            return;
-        }
-
-        QString shortcutFilePath;
-        QString appPath = QApplication::applicationFilePath();
-        QString iconPath;
-        QStringList args;
-#if defined(Q_OS_MACOS)
-        appPath = QApplication::applicationFilePath();
-        if (appPath.startsWith("/private/var/")) {
-            QMessageBox::critical(this, tr("Create instance shortcut"),
-                                  tr("The launcher is in the folder it was extracted from, therefore it cannot create shortcuts."));
-            return;
-        }
-
-        auto pIcon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-        if (pIcon == nullptr) {
-            pIcon = APPLICATION->icons()->icon("grass");
-        }
-
-        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "Icon.icns");
-
-        QFile iconFile(iconPath);
-        if (!iconFile.open(QFile::WriteOnly)) {
-            QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
-            return;
-        }
-
-        QIcon icon = pIcon->icon();
-
-        bool success = icon.pixmap(1024, 1024).save(iconPath, "ICNS");
-        iconFile.close();
-
-        if (!success) {
-            iconFile.remove();
-            QMessageBox::critical(this, tr("Create instance Application"), tr("Failed to create icon for Application."));
-            return;
-        }
-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        if (appPath.startsWith("/tmp/.mount_")) {
-            // AppImage!
-            appPath = QProcessEnvironment::systemEnvironment().value(QStringLiteral("APPIMAGE"));
-            if (appPath.isEmpty()) {
-                QMessageBox::critical(this, tr("Create instance shortcut"),
-                                      tr("Launcher is running as misconfigured AppImage? ($APPIMAGE environment variable is missing)"));
-            } else if (appPath.endsWith("/")) {
-                appPath.chop(1);
-            }
-        }
-
-        auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-        if (icon == nullptr) {
-            icon = APPLICATION->icons()->icon("grass");
-        }
-
-        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.png");
-
-        QFile iconFile(iconPath);
-        if (!iconFile.open(QFile::WriteOnly)) {
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-            return;
-        }
-        bool success = icon->icon().pixmap(64, 64).save(&iconFile, "PNG");
-        iconFile.close();
-
-        if (!success) {
-            iconFile.remove();
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-            return;
-        }
-
-        if (DesktopServices::isFlatpak()) {
-            shortcutFilePath = FS::PathCombine(shortcutDirPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + ".desktop");
-            QFileDialog fileDialog;
-            // workaround to make sure the portal file dialog opens in the desktop directory
-            fileDialog.setDirectoryUrl(shortcutDirPath);
-            shortcutFilePath =
-                fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*.desktop)");
-            if (shortcutFilePath.isEmpty())
-                return;  // file dialog canceled by user
-            appPath = "flatpak";
-            QString flatpakAppId = BuildConfig.LAUNCHER_DESKTOPFILENAME;
-            flatpakAppId.remove(".desktop");
-            args.append({ "run", flatpakAppId });
-        }
-
-#elif defined(Q_OS_WIN)
-        auto icon = APPLICATION->icons()->icon(m_selectedInstance->iconKey());
-        if (icon == nullptr) {
-            icon = APPLICATION->icons()->icon("grass");
-        }
-
-        iconPath = FS::PathCombine(m_selectedInstance->instanceRoot(), "icon.ico");
-
-        // part of fix for weird bug involving the window icon being replaced
-        // dunno why it happens, but this 2-line fix seems to be enough, so w/e
-        auto appIcon = APPLICATION->getThemedIcon("logo");
-
-        QFile iconFile(iconPath);
-        if (!iconFile.open(QFile::WriteOnly)) {
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-            return;
-        }
-        bool success = icon->icon().pixmap(64, 64).save(&iconFile, "ICO");
-        iconFile.close();
-
-        // restore original window icon
-        QGuiApplication::setWindowIcon(appIcon);
-
-        if (!success) {
-            iconFile.remove();
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create icon for shortcut."));
-            return;
-        }
-
-#else
-        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Not supported on your platform!"));
-        return;
-#endif
-        args.append({ "--launch", m_selectedInstance->id() });
-
-        bool userDefinedShortcutPath = !shortcutFilePath.isEmpty();
-        if (shortcutFilePath.isEmpty())
-            shortcutFilePath = FS::PathCombine(shortcutDirPath, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
-        if (!FS::createShortcut(shortcutFilePath, appPath, args, m_selectedInstance->name(), iconPath)) {
-#if not defined(Q_OS_MACOS)
-            iconFile.remove();
-#endif
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instance shortcut!"));
-            return;
-        }
-
-        if(userDefinedShortcutPath)
-            break;
-    }
-#if not defined(Q_OS_MACOS)
-    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
-#else
-    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
-#endif
+    QString shortcutFilePath = FS::PathCombine(FS::getApplicationsDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
+    createInstanceShortcut(shortcutFilePath);
+    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance in your applications folder!"));
 }
 
 void MainWindow::taskEnd()
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 0e692eda7..bdd4a1890 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -165,7 +165,13 @@ class MainWindow : public QMainWindow {
 
     void on_actionEditInstance_triggered();
 
-    void on_actionCreateInstanceShortcut_triggered();
+    inline void on_actionCreateInstanceShortcut_triggered() {
+        on_actionCreateInstanceShortcutDesktop_triggered();
+    };
+
+    void on_actionCreateInstanceShortcutDesktop_triggered();
+    void on_actionCreateInstanceShortcutApplications_triggered();
+    void on_actionCreateInstanceShortcutOther_triggered();
 
     void taskEnd();
 
@@ -226,6 +232,7 @@ class MainWindow : public QMainWindow {
     void setSelectedInstanceById(const QString& id);
     void updateStatusCenter();
     void setInstanceActionsEnabled(bool enabled);
+    void createInstanceShortcut(QString shortcutDirPath);
 
     void runModalTask(Task* task);
     void instanceFromInstanceTask(InstanceTask* task);
diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui
index f20c34206..3fa30c97e 100644
--- a/launcher/ui/MainWindow.ui
+++ b/launcher/ui/MainWindow.ui
@@ -131,7 +131,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>27</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="fileMenu">
@@ -235,8 +235,7 @@
   </widget>
   <action name="actionMoreNews">
    <property name="icon">
-    <iconset theme="news">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="news"/>
    </property>
    <property name="text">
     <string>More news...</string>
@@ -250,8 +249,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset theme="cat">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="cat"/>
    </property>
    <property name="text">
     <string>&amp;Meow</string>
@@ -286,8 +284,7 @@
   </action>
   <action name="actionAddInstance">
    <property name="icon">
-    <iconset theme="new">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="new"/>
    </property>
    <property name="text">
     <string>Add Instanc&amp;e...</string>
@@ -298,8 +295,7 @@
   </action>
   <action name="actionCheckUpdate">
    <property name="icon">
-    <iconset theme="checkupdate">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="checkupdate"/>
    </property>
    <property name="text">
     <string>&amp;Update...</string>
@@ -313,8 +309,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset theme="settings">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="settings"/>
    </property>
    <property name="text">
     <string>Setti&amp;ngs...</string>
@@ -328,8 +323,7 @@
   </action>
   <action name="actionManageAccounts">
    <property name="icon">
-    <iconset theme="accounts">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="accounts"/>
    </property>
    <property name="text">
     <string>&amp;Manage Accounts...</string>
@@ -337,8 +331,7 @@
   </action>
   <action name="actionLaunchInstance">
    <property name="icon">
-    <iconset theme="launch">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="launch"/>
    </property>
    <property name="text">
     <string>&amp;Launch</string>
@@ -349,8 +342,7 @@
   </action>
   <action name="actionKillInstance">
    <property name="icon">
-    <iconset theme="status-bad">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="status-bad"/>
    </property>
    <property name="text">
     <string>&amp;Kill</string>
@@ -364,8 +356,7 @@
   </action>
   <action name="actionRenameInstance">
    <property name="icon">
-    <iconset theme="rename">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="rename"/>
    </property>
    <property name="text">
     <string>Rename</string>
@@ -376,8 +367,7 @@
   </action>
   <action name="actionChangeInstGroup">
    <property name="icon">
-    <iconset theme="tag">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="tag"/>
    </property>
    <property name="text">
     <string>&amp;Change Group...</string>
@@ -399,8 +389,7 @@
   </action>
   <action name="actionEditInstance">
    <property name="icon">
-    <iconset theme="settings">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="settings"/>
    </property>
    <property name="text">
     <string>&amp;Edit...</string>
@@ -414,8 +403,7 @@
   </action>
   <action name="actionViewSelectedInstFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>&amp;Folder</string>
@@ -426,8 +414,7 @@
   </action>
   <action name="actionDeleteInstance">
    <property name="icon">
-    <iconset theme="delete">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="delete"/>
    </property>
    <property name="text">
     <string>Dele&amp;te</string>
@@ -441,8 +428,7 @@
   </action>
   <action name="actionCopyInstance">
    <property name="icon">
-    <iconset theme="copy">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="copy"/>
    </property>
    <property name="text">
     <string>Cop&amp;y...</string>
@@ -456,8 +442,7 @@
   </action>
   <action name="actionExportInstance">
    <property name="icon">
-    <iconset theme="export">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="export"/>
    </property>
    <property name="text">
     <string>E&amp;xport...</string>
@@ -468,8 +453,7 @@
   </action>
   <action name="actionExportInstanceZip">
    <property name="icon">
-    <iconset theme="launcher">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="launcher"/>
    </property>
    <property name="text">
     <string>Prism Launcher (zip)</string>
@@ -477,8 +461,7 @@
   </action>
   <action name="actionExportInstanceMrPack">
    <property name="icon">
-    <iconset theme="modrinth">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="modrinth"/>
    </property>
    <property name="text">
     <string>Modrinth (mrpack)</string>
@@ -486,8 +469,7 @@
   </action>
   <action name="actionExportInstanceFlamePack">
    <property name="icon">
-    <iconset theme="flame">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="flame"/>
    </property>
    <property name="text">
     <string>CurseForge (zip)</string>
@@ -495,20 +477,18 @@
   </action>
   <action name="actionCreateInstanceShortcut">
    <property name="icon">
-    <iconset theme="shortcut">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="shortcut"/>
    </property>
    <property name="text">
     <string>Create Shortcut</string>
    </property>
    <property name="toolTip">
-    <string>Creates a shortcut on your desktop to launch the selected instance.</string>
+    <string>Creates a shortcut on a selected folder to launch the selected instance.</string>
    </property>
   </action>
   <action name="actionNoAccountsAdded">
    <property name="icon">
-    <iconset theme="noaccount">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="noaccount"/>
    </property>
    <property name="text">
     <string>No accounts added!</string>
@@ -519,8 +499,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset theme="noaccount">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="noaccount"/>
    </property>
    <property name="text">
     <string>No Default Account</string>
@@ -531,8 +510,7 @@
   </action>
   <action name="actionCloseWindow">
    <property name="icon">
-    <iconset theme="status-bad">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="status-bad"/>
    </property>
    <property name="text">
     <string>Close &amp;Window</string>
@@ -546,8 +524,7 @@
   </action>
   <action name="actionViewInstanceFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>&amp;Instances</string>
@@ -558,8 +535,7 @@
   </action>
   <action name="actionViewLauncherRootFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Launcher &amp;Root</string>
@@ -570,8 +546,7 @@
   </action>
   <action name="actionViewCentralModsFolder">
    <property name="icon">
-    <iconset theme="centralmods">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="centralmods"/>
    </property>
    <property name="text">
     <string>&amp;Central Mods</string>
@@ -582,8 +557,7 @@
   </action>
   <action name="actionViewSkinsFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>&amp;Skins</string>
@@ -594,8 +568,7 @@
   </action>
   <action name="actionViewIconsFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Instance Icons</string>
@@ -606,8 +579,7 @@
   </action>
   <action name="actionViewLogsFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Logs</string>
@@ -623,8 +595,7 @@
   </action>
   <action name="actionReportBug">
    <property name="icon">
-    <iconset theme="bug">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="bug"/>
    </property>
    <property name="text">
     <string>Report a Bug or Suggest a Feature</string>
@@ -635,8 +606,7 @@
   </action>
   <action name="actionDISCORD">
    <property name="icon">
-    <iconset theme="discord">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="discord"/>
    </property>
    <property name="text">
     <string>&amp;Discord Guild</string>
@@ -647,8 +617,7 @@
   </action>
   <action name="actionMATRIX">
    <property name="icon">
-    <iconset theme="matrix">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="matrix"/>
    </property>
    <property name="text">
     <string>&amp;Matrix Space</string>
@@ -659,8 +628,7 @@
   </action>
   <action name="actionREDDIT">
    <property name="icon">
-    <iconset theme="reddit-alien">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="reddit-alien"/>
    </property>
    <property name="text">
     <string>Sub&amp;reddit</string>
@@ -671,8 +639,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset theme="about">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="about"/>
    </property>
    <property name="text">
     <string>&amp;About %1</string>
@@ -686,8 +653,7 @@
   </action>
   <action name="actionClearMetadata">
    <property name="icon">
-    <iconset theme="refresh">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="refresh"/>
    </property>
    <property name="text">
     <string>&amp;Clear Metadata Cache</string>
@@ -698,8 +664,7 @@
   </action>
   <action name="actionAddToPATH">
    <property name="icon">
-    <iconset theme="custom-commands">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="custom-commands"/>
    </property>
    <property name="text">
     <string>Install to &amp;PATH</string>
@@ -710,8 +675,7 @@
   </action>
   <action name="actionFoldersButton">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Folders</string>
@@ -722,8 +686,7 @@
   </action>
   <action name="actionHelpButton">
    <property name="icon">
-    <iconset theme="help">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="help"/>
    </property>
    <property name="text">
     <string>Help</string>
@@ -734,8 +697,7 @@
   </action>
   <action name="actionAccountsButton">
    <property name="icon">
-    <iconset theme="noaccount">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="noaccount"/>
    </property>
    <property name="text">
     <string>Accounts</string>
@@ -743,8 +705,7 @@
   </action>
   <action name="actionOpenWiki">
    <property name="icon">
-    <iconset theme="help">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="help"/>
    </property>
    <property name="text">
     <string>%1 &amp;Help</string>
@@ -755,8 +716,7 @@
   </action>
   <action name="actionViewWidgetThemeFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>&amp;Widget Themes</string>
@@ -767,8 +727,7 @@
   </action>
   <action name="actionViewIconThemeFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>I&amp;con Theme</string>
@@ -779,8 +738,7 @@
   </action>
   <action name="actionViewCatPackFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Cat Packs</string>
@@ -791,8 +749,7 @@
   </action>
   <action name="actionViewJavaFolder">
    <property name="icon">
-    <iconset theme="viewfolder">
-     <normaloff>.</normaloff>.</iconset>
+    <iconset theme="viewfolder"/>
    </property>
    <property name="text">
     <string>Java</string>
@@ -801,6 +758,39 @@
     <string>Open the Java folder in a file browser. Only available if the built-in Java downloader is used.</string>
    </property>
   </action>
+  <action name="actionCreateInstanceShortcutDesktop">
+   <property name="text">
+    <string>Desktop</string>
+   </property>
+   <property name="toolTip">
+    <string>Creates an shortcut to this instance on your desktop</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::TextHeuristicRole</enum>
+   </property>
+  </action>
+  <action name="actionCreateInstanceShortcutApplications">
+   <property name="text">
+    <string>Applications</string>
+   </property>
+   <property name="toolTip">
+    <string>Create a shortcut of this instance on your start menu</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::TextHeuristicRole</enum>
+   </property>
+  </action>
+  <action name="actionCreateInstanceShortcutOther">
+   <property name="text">
+    <string>Other...</string>
+   </property>
+   <property name="toolTip">
+    <string>Creates a shortcut in a folder selected by you</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::TextHeuristicRole</enum>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 90540247e..da4ba9023 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -65,15 +65,6 @@ enum InstSortMode {
     Sort_LastLaunch
 };
 
-enum ShortcutCreationMode {
-    // Create a shortcut in the applications
-    Shortcut_OnlyApplications,
-    // Create a shortcut in both locations
-    Shortcut_Both,
-    // Create a shortcut on the desktop
-    Shortcut_OnlyDesktop
-};
-
 LauncherPage::LauncherPage(QWidget* parent) : QWidget(parent), ui(new Ui::LauncherPage)
 {
     ui->setupUi(this);
@@ -263,19 +254,6 @@ void LauncherPage::applySettings()
     s->set("ModMetadataDisabled", ui->metadataDisableBtn->isChecked());
     s->set("ModDependenciesDisabled", ui->dependenciesDisableBtn->isChecked());
     s->set("SkipModpackUpdatePrompt", ui->skipModpackUpdatePromptBtn->isChecked());
-
-    auto shortcutMode = (ShortcutCreationMode) ui->createShortcutActionComboBox->currentIndex();
-    switch (shortcutMode) {
-        case Shortcut_OnlyApplications:
-            s->set("ShortcutCreationMode", "Applications");
-            break;
-        case Shortcut_Both:
-            s->set("ShortcutCreationMode", "Both");
-            break;
-        case Shortcut_OnlyDesktop:
-            s->set("ShortcutCreationMode", "Desktop");
-            break;
-    }
 }
 void LauncherPage::loadSettings()
 {
@@ -341,19 +319,6 @@ void LauncherPage::loadSettings()
     ui->metadataWarningLabel->setHidden(!ui->metadataDisableBtn->isChecked());
     ui->dependenciesDisableBtn->setChecked(s->get("ModDependenciesDisabled").toBool());
     ui->skipModpackUpdatePromptBtn->setChecked(s->get("SkipModpackUpdatePrompt").toBool());
-
-    QString shortcutModeStr = s->get("ShortcutCreationMode").toString();
-    ShortcutCreationMode shortcutMode = Shortcut_OnlyDesktop;
-    if(shortcutModeStr == "Applications") {
-        shortcutMode = Shortcut_OnlyApplications;
-    } else if(shortcutModeStr == "Desktop") {
-        // Guess we don't need that, but it's here for completeness
-        shortcutMode = Shortcut_OnlyDesktop;
-    } else if(shortcutModeStr == "Both") {
-        shortcutMode = Shortcut_Both;
-    }
-
-    ui->createShortcutActionComboBox->setCurrentIndex(shortcutMode);
 }
 
 void LauncherPage::refreshFontPreview()
@@ -404,4 +369,4 @@ void LauncherPage::refreshFontPreview()
 void LauncherPage::retranslate()
 {
     ui->retranslateUi(this);
-}
+}
\ No newline at end of file
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 1e08d8266..ff95bdfbb 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -282,23 +282,6 @@
           <string>Miscellaneous</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
-            <property name="minimum">
-             <number>0</number>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="timeoutSecondsLabel">
-            <property name="toolTip">
-             <string>Seconds to wait until the requests are terminated</string>
-            </property>
-            <property name="text">
-             <string>Timeout for HTTP requests</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <widget class="QSpinBox" name="numberOfConcurrentDownloadsSpinBox">
             <property name="minimum">
@@ -306,27 +289,6 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="timeoutSecondsSpinBox">
-            <property name="suffix">
-             <string>s</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="numberOfConcurrentDownloadsLabel">
-            <property name="text">
-             <string>Number of concurrent downloads</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="numberOfManualRetriesLabel">
-            <property name="text">
-             <string>Number of manual retries</string>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0">
            <widget class="QLabel" name="numberOfConcurrentTasksLabel">
             <property name="text">
@@ -341,30 +303,42 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <widget class="QLabel" name="createShortcutActionLabel">
+          <item row="1" column="0">
+           <widget class="QLabel" name="numberOfConcurrentDownloadsLabel">
             <property name="text">
-             <string>Create shortcut action</string>
+             <string>Number of concurrent downloads</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="1">
-           <widget class="QComboBox" name="createShortcutActionComboBox">
-            <item>
-             <property name="text">
-              <string>Applications only</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Applications &amp; Desktop</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Desktop only</string>
-             </property>
-            </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="numberOfManualRetriesLabel">
+            <property name="text">
+             <string>Number of manual retries</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="timeoutSecondsLabel">
+            <property name="toolTip">
+             <string>Seconds to wait until the requests are terminated</string>
+            </property>
+            <property name="text">
+             <string>Timeout for HTTP requests</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QSpinBox" name="timeoutSecondsSpinBox">
+            <property name="suffix">
+             <string>s</string>
+            </property>
            </widget>
           </item>
          </layout>
@@ -694,4 +668,4 @@
  <buttongroups>
   <buttongroup name="sortingModeGroup"/>
  </buttongroups>
-</ui>
+</ui>
\ No newline at end of file

From ef2f865159b23dd5715e77c838d7e7b1e0c2a694 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:45:50 +0200
Subject: [PATCH 04/13] add back folder checks / use specific extension

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 511055b07..599497224 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1506,6 +1506,8 @@ void MainWindow::on_actionKillInstance_triggered()
 }
 
 void MainWindow::createInstanceShortcut(QString shortcutFilePath) {
+    if(!m_selectedInstance)
+        return;
 
     QString appPath = QApplication::applicationFilePath();
     QString iconPath;
@@ -1643,7 +1645,7 @@ void MainWindow::on_actionCreateInstanceShortcutOther_triggered() {
         // workaround to make sure the portal file dialog opens in the desktop directory
         fileDialog.setDirectoryUrl(defaultedDir);
 
-        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*.desktop)");
+        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*." + extension + ")");
         if (shortcutFilePath.isEmpty())
             return;  // file dialog canceled by user
 
@@ -1655,6 +1657,12 @@ void MainWindow::on_actionCreateInstanceShortcutDesktop_triggered() {
         if (!m_selectedInstance)
                 return;
 
+        QString desktopDir = FS::getDesktopDir();
+        if (desktopDir.isEmpty()) {
+            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
+            return;
+        }
+
         QString shortcutFilePath = FS::PathCombine(FS::getDesktopDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
         createInstanceShortcut(shortcutFilePath);
         QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
@@ -1665,7 +1673,13 @@ void MainWindow::on_actionCreateInstanceShortcutApplications_triggered()
     if (!m_selectedInstance)
         return;
 
-    QString shortcutFilePath = FS::PathCombine(FS::getApplicationsDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
+    QString applicationsDir = FS::getApplicationsDir();
+    if (applicationsDir.isEmpty()) {
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find applications folder?!"));
+        return;
+    }
+
+    QString shortcutFilePath = FS::PathCombine(applicationsDir, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
     createInstanceShortcut(shortcutFilePath);
     QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance in your applications folder!"));
 }

From f1048c2e0d7593069e59282708838a5a5359f951 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:46:27 +0200
Subject: [PATCH 05/13] removed unnecessary macro

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 599497224..6b9daa398 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -243,12 +243,10 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
 
         ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
         bool isFlatpak = DesktopServices::isFlatpak();
 
         ui->actionCreateInstanceShortcutDesktop->setEnabled(isFlatpak);
         ui->actionCreateInstanceShortcutApplications->setEnabled(isFlatpak);
-#endif
     }
 
     // add the toolbar toggles to the view menu

From b16e12c9af4288a853b1c0b013a7d406d8952be8 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:49:08 +0200
Subject: [PATCH 06/13] remove dot

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 6b9daa398..37d4422e4 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1643,7 +1643,7 @@ void MainWindow::on_actionCreateInstanceShortcutOther_triggered() {
         // workaround to make sure the portal file dialog opens in the desktop directory
         fileDialog.setDirectoryUrl(defaultedDir);
 
-        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*." + extension + ")");
+        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*" + extension + ")");
         if (shortcutFilePath.isEmpty())
             return;  // file dialog canceled by user
 

From 43ccf18449fa7eeee0b1fa001c64b01c7d072ec3 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:51:47 +0200
Subject: [PATCH 07/13] fix default action for flatpak

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 10 ++++++++++
 launcher/ui/MainWindow.h   |  4 +---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 37d4422e4..e73a702f8 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1651,6 +1651,16 @@ void MainWindow::on_actionCreateInstanceShortcutOther_triggered() {
         QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
 }
 
+void MainWindow::on_actionCreateInstanceShortcut_triggered() {
+    if(!m_selectedInstance)
+        return;
+
+    if(DesktopServices::isFlatpak())
+        onactionCreateInstanceShortcutOther_triggered();
+    else
+        on_actionCreateInstanceShortcutDesktop_triggered();
+}
+
 void MainWindow::on_actionCreateInstanceShortcutDesktop_triggered() {
         if (!m_selectedInstance)
                 return;
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index bdd4a1890..f3f2de730 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -165,9 +165,7 @@ class MainWindow : public QMainWindow {
 
     void on_actionEditInstance_triggered();
 
-    inline void on_actionCreateInstanceShortcut_triggered() {
-        on_actionCreateInstanceShortcutDesktop_triggered();
-    };
+    void on_actionCreateInstanceShortcut_triggered();
 
     void on_actionCreateInstanceShortcutDesktop_triggered();
     void on_actionCreateInstanceShortcutApplications_triggered();

From cd3db28fceea38602979571aa254e7d7e6a34c2f Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:52:44 +0200
Subject: [PATCH 08/13] fixed typo

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index e73a702f8..535089343 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1656,7 +1656,7 @@ void MainWindow::on_actionCreateInstanceShortcut_triggered() {
         return;
 
     if(DesktopServices::isFlatpak())
-        onactionCreateInstanceShortcutOther_triggered();
+        on_actionCreateInstanceShortcutOther_triggered();
     else
         on_actionCreateInstanceShortcutDesktop_triggered();
 }

From 7c60f375f35cebbbaaa72555e8195096cd14e9aa Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Fri, 25 Oct 2024 14:15:04 +0200
Subject: [PATCH 09/13] hide actions if not available

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/MainWindow.cpp | 117 ++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 52 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 535089343..b6b85bb62 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -209,12 +209,25 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
         ui->actionExportInstance->setMenu(exportInstanceMenu);
 
-        auto shortcutInstanceMenu = new QMenu(this);
-        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutDesktop);
-        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutApplications);
-        shortcutInstanceMenu->addAction(ui->actionCreateInstanceShortcutOther);
+        QList<QAction*> shortcutActions = { ui->actionCreateInstanceShortcutOther };
+        if (!DesktopServices::isFlatpak()) {
+            QString desktopDir = FS::getDesktopDir();
+            QString applicationDir = FS::getApplicationsDir();
 
-        ui->actionCreateInstanceShortcut->setMenu(shortcutInstanceMenu);
+            if(!applicationDir.isEmpty())
+                shortcutActions.push_front(ui->actionCreateInstanceShortcutApplications);
+
+            if(!desktopDir.isEmpty())
+                shortcutActions.push_front(ui->actionCreateInstanceShortcutDesktop);
+        }
+
+        if(shortcutActions.length() > 1) {
+            auto shortcutInstanceMenu = new QMenu(this);
+
+            for(auto action : shortcutActions)
+                shortcutInstanceMenu->addAction(action);
+            ui->actionCreateInstanceShortcut->setMenu(shortcutInstanceMenu);
+        }
     }
 
     // hide, disable and show stuff
@@ -242,11 +255,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
         }
 
         ui->actionViewJavaFolder->setEnabled(BuildConfig.JAVA_DOWNLOADER_ENABLED);
-
-        bool isFlatpak = DesktopServices::isFlatpak();
-
-        ui->actionCreateInstanceShortcutDesktop->setEnabled(isFlatpak);
-        ui->actionCreateInstanceShortcutApplications->setEnabled(isFlatpak);
     }
 
     // add the toolbar toggles to the view menu
@@ -1503,8 +1511,9 @@ void MainWindow::on_actionKillInstance_triggered()
     }
 }
 
-void MainWindow::createInstanceShortcut(QString shortcutFilePath) {
-    if(!m_selectedInstance)
+void MainWindow::createInstanceShortcut(QString shortcutFilePath)
+{
+    if (!m_selectedInstance)
         return;
 
     QString appPath = QApplication::applicationFilePath();
@@ -1625,55 +1634,59 @@ void MainWindow::createInstanceShortcut(QString shortcutFilePath) {
     }
 }
 
-void MainWindow::on_actionCreateInstanceShortcutOther_triggered() {
-        if (!m_selectedInstance)
-                return;
-
-        QString defaultedDir = FS::getDesktopDir();
-#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-        QString extension = ".desktop";
-#elif defined(Q_OS_WINDOWS)
-        QString extension = ".lnk";
-#else
-        QString extension = "";
-#endif
-
-        QString shortcutFilePath = FS::PathCombine(defaultedDir, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + extension);
-        QFileDialog fileDialog;
-        // workaround to make sure the portal file dialog opens in the desktop directory
-        fileDialog.setDirectoryUrl(defaultedDir);
-
-        shortcutFilePath = fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*" + extension + ")");
-        if (shortcutFilePath.isEmpty())
-            return;  // file dialog canceled by user
-
-        createInstanceShortcut(shortcutFilePath);
-        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
-}
-
-void MainWindow::on_actionCreateInstanceShortcut_triggered() {
-    if(!m_selectedInstance)
+void MainWindow::on_actionCreateInstanceShortcutOther_triggered()
+{
+    if (!m_selectedInstance)
         return;
 
-    if(DesktopServices::isFlatpak())
+    QString defaultedDir = FS::getDesktopDir();
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
+    QString extension = ".desktop";
+#elif defined(Q_OS_WINDOWS)
+    QString extension = ".lnk";
+#else
+    QString extension = "";
+#endif
+
+    QString shortcutFilePath = FS::PathCombine(defaultedDir, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()) + extension);
+    QFileDialog fileDialog;
+    // workaround to make sure the portal file dialog opens in the desktop directory
+    fileDialog.setDirectoryUrl(defaultedDir);
+
+    shortcutFilePath =
+        fileDialog.getSaveFileName(this, tr("Create Shortcut"), shortcutFilePath, tr("Desktop Entries") + " (*" + extension + ")");
+    if (shortcutFilePath.isEmpty())
+        return;  // file dialog canceled by user
+
+    createInstanceShortcut(shortcutFilePath);
+    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
+}
+
+void MainWindow::on_actionCreateInstanceShortcut_triggered()
+{
+    if (!m_selectedInstance)
+        return;
+
+    if (DesktopServices::isFlatpak())
         on_actionCreateInstanceShortcutOther_triggered();
     else
         on_actionCreateInstanceShortcutDesktop_triggered();
 }
 
-void MainWindow::on_actionCreateInstanceShortcutDesktop_triggered() {
-        if (!m_selectedInstance)
-                return;
+void MainWindow::on_actionCreateInstanceShortcutDesktop_triggered()
+{
+    if (!m_selectedInstance)
+        return;
 
-        QString desktopDir = FS::getDesktopDir();
-        if (desktopDir.isEmpty()) {
-            QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
-            return;
-        }
+    QString desktopDir = FS::getDesktopDir();
+    if (desktopDir.isEmpty()) {
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Couldn't find desktop?!"));
+        return;
+    }
 
-        QString shortcutFilePath = FS::PathCombine(FS::getDesktopDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
-        createInstanceShortcut(shortcutFilePath);
-        QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
+    QString shortcutFilePath = FS::PathCombine(FS::getDesktopDir(), FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
+    createInstanceShortcut(shortcutFilePath);
+    QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance on your desktop!"));
 }
 
 void MainWindow::on_actionCreateInstanceShortcutApplications_triggered()

From 8bb35f5b0b517177cb9869ee9ba60265e010e7a6 Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sat, 7 Dec 2024 19:43:09 +0100
Subject: [PATCH 10/13] add  macos support for shortcuts

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/FileSystem.cpp    | 11 +----------
 launcher/ui/MainWindow.cpp | 12 ++++++++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/launcher/FileSystem.cpp b/launcher/FileSystem.cpp
index 8f683a9fb..a02a0d642 100644
--- a/launcher/FileSystem.cpp
+++ b/launcher/FileSystem.cpp
@@ -931,16 +931,7 @@ bool createShortcut(QString destination, QString target, QStringList args, QStri
         return false;
     }
 #if defined(Q_OS_MACOS)
-    // Create the Application
-    QDir applicationDirectory =
-        QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation) + "/" + BuildConfig.LAUNCHER_NAME + " Instances/";
-
-    if (!applicationDirectory.mkpath(".")) {
-        qWarning() << "Couldn't create application directory";
-        return false;
-    }
-
-    QDir application = applicationDirectory.path() + "/" + name + ".app/";
+    QDir application = destination + ".app/";
 
     if (application.exists()) {
         qWarning() << "Application already exists!";
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index b6b85bb62..70659741e 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1658,6 +1658,8 @@ void MainWindow::on_actionCreateInstanceShortcutOther_triggered()
     if (shortcutFilePath.isEmpty())
         return;  // file dialog canceled by user
 
+    if(shortcutFilePath.endsWith(extension))
+        shortcutFilePath = shortcutFilePath.mid(0, shortcutFilePath.length() - extension.length());
     createInstanceShortcut(shortcutFilePath);
     QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance!"));
 }
@@ -1700,6 +1702,16 @@ void MainWindow::on_actionCreateInstanceShortcutApplications_triggered()
         return;
     }
 
+#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
+    applicationsDir = FS::PathCombine(applicationsDir, BuildConfig.LAUNCHER_DISPLAYNAME + " Instances");
+
+    QDir applicationsDirQ(applicationsDir);
+    if (!applicationsDirQ.mkpath(".")) {
+        QMessageBox::critical(this, tr("Create instance shortcut"), tr("Failed to create instances folder in applications folder!"));
+        return;
+    }
+#endif
+
     QString shortcutFilePath = FS::PathCombine(applicationsDir, FS::RemoveInvalidFilenameChars(m_selectedInstance->name()));
     createInstanceShortcut(shortcutFilePath);
     QMessageBox::information(this, tr("Create instance shortcut"), tr("Created a shortcut to this instance in your applications folder!"));

From c4ba7fc40159f74a10b8cff272727b5af98ed5bd Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sat, 7 Dec 2024 20:06:52 +0100
Subject: [PATCH 11/13] add newline back

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/pages/global/LauncherPage.cpp | 2 +-
 launcher/ui/pages/global/LauncherPage.ui  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index da4ba9023..8bbed9643 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -369,4 +369,4 @@ void LauncherPage::refreshFontPreview()
 void LauncherPage::retranslate()
 {
     ui->retranslateUi(this);
-}
\ No newline at end of file
+}
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index ff95bdfbb..3cba468ff 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -668,4 +668,4 @@
  <buttongroups>
   <buttongroup name="sortingModeGroup"/>
  </buttongroups>
-</ui>
\ No newline at end of file
+</ui>

From 1cd4b4978908cf0a5745055638bea1c2b85c8acb Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sat, 7 Dec 2024 20:26:48 +0100
Subject: [PATCH 12/13] git is making me crazy at this point

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/pages/global/LauncherPage.cpp | 1 +
 launcher/ui/pages/global/LauncherPage.ui  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 8bbed9643..154dddba5 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -370,3 +370,4 @@ void LauncherPage::retranslate()
 {
     ui->retranslateUi(this);
 }
+
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 3cba468ff..acca897c4 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -669,3 +669,4 @@
   <buttongroup name="sortingModeGroup"/>
  </buttongroups>
 </ui>
+

From c06f83507cde69b7b8dca1aada5a89419cf7050c Mon Sep 17 00:00:00 2001
From: sshcrack <34072808+sshcrack@users.noreply.github.com>
Date: Sat, 7 Dec 2024 20:29:09 +0100
Subject: [PATCH 13/13] now its too much newlines??

Signed-off-by: sshcrack <34072808+sshcrack@users.noreply.github.com>
---
 launcher/ui/pages/global/LauncherPage.cpp | 1 -
 launcher/ui/pages/global/LauncherPage.ui  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 154dddba5..8bbed9643 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -370,4 +370,3 @@ void LauncherPage::retranslate()
 {
     ui->retranslateUi(this);
 }
-
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index acca897c4..3cba468ff 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -669,4 +669,3 @@
   <buttongroup name="sortingModeGroup"/>
  </buttongroups>
 </ui>
-