From 5d14dede508bd67d2e1777ebd77aaa386314a0aa Mon Sep 17 00:00:00 2001 From: arthomnix Date: Sun, 3 Jul 2022 07:54:20 +0100 Subject: [PATCH] NOISSUE WIP implementation of the ability to create instance shortcuts Currently Linux-only and lacking some features --- launcher/CMakeLists.txt | 4 +- launcher/ui/MainWindow.cpp | 28 +- launcher/ui/MainWindow.h | 4 + launcher/ui/dialogs/CreateShortcutDialog.cpp | 117 ++++++++ launcher/ui/dialogs/CreateShortcutDialog.h | 40 +++ launcher/ui/dialogs/CreateShortcutDialog.ui | 275 +++++++++++++++++++ 6 files changed, 464 insertions(+), 4 deletions(-) create mode 100644 launcher/ui/dialogs/CreateShortcutDialog.cpp create mode 100644 launcher/ui/dialogs/CreateShortcutDialog.h create mode 100644 launcher/ui/dialogs/CreateShortcutDialog.ui diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index 2f72e0d3..bc0cce66 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -778,7 +778,8 @@ SET(LAUNCHER_SOURCES ui/dialogs/VersionSelectDialog.h ui/dialogs/SkinUploadDialog.cpp ui/dialogs/SkinUploadDialog.h - + ui/dialogs/CreateShortcutDialog.cpp + ui/dialogs/CreateShortcutDialog.h # GUI - widgets ui/widgets/Common.cpp @@ -876,6 +877,7 @@ qt5_wrap_ui(LAUNCHER_UI ui/dialogs/AboutDialog.ui ui/dialogs/LoginDialog.ui ui/dialogs/EditAccountDialog.ui + ui/dialogs/CreateShortcutDialog.ui ) qt5_add_resources(LAUNCHER_RESOURCES diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index c0ba8839..bbdfb043 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -83,14 +83,15 @@ #include "ui/dialogs/UpdateDialog.h" #include "ui/dialogs/EditAccountDialog.h" #include "ui/dialogs/NotificationDialog.h" +#include "ui/dialogs/CreateShortcutDialog.h" + #include "ui/dialogs/ExportInstanceDialog.h" - #include "UpdateController.h" + #include "KonamiCode.h" - #include "InstanceImportTask.h" -#include "InstanceCopyTask.h" +#include "InstanceCopyTask.h" #include "MMCTime.h" namespace { @@ -222,6 +223,9 @@ public: TranslatedAction actionLaunchInstanceOffline; TranslatedAction actionScreenshots; TranslatedAction actionExportInstance; +#if defined(Q_OS_LINUX) // currently only implemented for linux; TODO: other OS implementations + TranslatedAction actionCreateShortcut; +#endif QVector all_actions; LabeledToolButton *renameButton = nullptr; @@ -594,6 +598,15 @@ public: instanceToolBar->addSeparator(); +#if defined(Q_OS_LINUX) + actionCreateShortcut = TranslatedAction(MainWindow); + actionCreateShortcut->setObjectName(QStringLiteral("actionCreateShortcut")); + actionCreateShortcut.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Create Shortcut")); + actionCreateShortcut.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Create a shortcut that launches the selected instance")); + all_actions.append(&actionCreateShortcut); + instanceToolBar->addAction(actionCreateShortcut); +#endif + actionExportInstance = TranslatedAction(MainWindow); actionExportInstance->setObjectName(QStringLiteral("actionExportInstance")); actionExportInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Export Instance")); @@ -1844,6 +1857,15 @@ void MainWindow::on_actionLaunchInstance_triggered() } } +#if defined(Q_OS_LINUX) +void MainWindow::on_actionCreateShortcut_triggered() { + if (m_selectedInstance) + { + CreateShortcutDialog(this, m_selectedInstance).exec(); + } +} +#endif + void MainWindow::activateInstance(InstancePtr instance) { APPLICATION->launch(instance); diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h index e462c524..24d9fee0 100644 --- a/launcher/ui/MainWindow.h +++ b/launcher/ui/MainWindow.h @@ -141,6 +141,10 @@ private slots: void on_actionScreenshots_triggered(); +#if defined(Q_OS_LINUX) + void on_actionCreateShortcut_triggered(); +#endif + void taskEnd(); /** diff --git a/launcher/ui/dialogs/CreateShortcutDialog.cpp b/launcher/ui/dialogs/CreateShortcutDialog.cpp new file mode 100644 index 00000000..71b3c96b --- /dev/null +++ b/launcher/ui/dialogs/CreateShortcutDialog.cpp @@ -0,0 +1,117 @@ +/* + * Copyright 2022 arthomnix + * + * This source is subject to the Microsoft Public License (MS-PL). + * Please see the COPYING.md file for more information. + */ + +#include +#include +#include +#include +#include "CreateShortcutDialog.h" +#include "ui_CreateShortcutDialog.h" +#include "Application.h" +#include "minecraft/auth/AccountList.h" +#include "icons/IconList.h" + +CreateShortcutDialog::CreateShortcutDialog(QWidget *parent, InstancePtr instance) + :QDialog(parent), ui(new Ui::CreateShortcutDialog), m_instance(instance) +{ + ui->setupUi(this); + + QStringList accountNameList; + auto accounts = APPLICATION->accounts(); + + for (int i = 0; i < accounts->count(); i++) + { + accountNameList.append(accounts->at(i)->profileName()); + } + + ui->profileComboBox->addItems(accountNameList); + + if (accounts->defaultAccount()) + { + ui->profileComboBox->setCurrentText(accounts->defaultAccount()->profileName()); + } + + updateDialogState(); +} + +CreateShortcutDialog::~CreateShortcutDialog() +{ + delete ui; +} + +void CreateShortcutDialog::on_shortcutPathBrowse_clicked() +{ + QString linkExtension; +#ifdef Q_OS_LINUX + linkExtension = "desktop"; +#endif +#ifdef Q_OS_WIN + linkExtension = "lnk"; +#endif + QFileDialog fileDialog(this, tr("Select shortcut path"), QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)); + fileDialog.setDefaultSuffix(linkExtension); + fileDialog.setAcceptMode(QFileDialog::AcceptOpen); + fileDialog.setFileMode(QFileDialog::AnyFile); + if (fileDialog.exec()) + { + ui->shortcutPath->setText(fileDialog.selectedFiles().at(0)); + } + updateDialogState(); +} + +void CreateShortcutDialog::accept() +{ + createShortcut(); + QDialog::accept(); +} + + +void CreateShortcutDialog::updateDialogState() +{ + + ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled( + !ui->shortcutPath->text().isEmpty() + && (!ui->joinServerCheckBox->isChecked() || !ui->joinServer->text().isEmpty()) + && (!ui->offlineUsernameCheckBox->isChecked() || !ui->offlineUsername->text().isEmpty()) + && (!ui->useProfileCheckBox->isChecked() || !ui->profileComboBox->currentText().isEmpty()) + ); + ui->joinServer->setEnabled(ui->joinServerCheckBox->isChecked()); + ui->profileComboBox->setEnabled(ui->useProfileCheckBox->isChecked()); + ui->offlineUsernameCheckBox->setEnabled(ui->launchOfflineCheckBox->isChecked()); + ui->offlineUsername->setEnabled(ui->launchOfflineCheckBox->isChecked() && ui->offlineUsernameCheckBox->isChecked()); +} + +QString CreateShortcutDialog::getLaunchCommand() +{ + return QCoreApplication::applicationFilePath() + + " -l " + m_instance->id() + + (ui->joinServerCheckBox->isChecked() ? " -s " + ui->joinServer->text() : "") + + (ui->useProfileCheckBox->isChecked() ? " -a " + ui->profileComboBox->currentText() : "") + + (ui->launchOfflineCheckBox->isChecked() ? " -o" : "") + + (ui->offlineUsernameCheckBox->isChecked() ? " -n " + ui->offlineUsername->text() : ""); +} + +void CreateShortcutDialog::createShortcut() +{ + // Linux implementation using .desktop file +#ifdef Q_OS_LINUX + QFile desktopFile(ui->shortcutPath->text()); + if (desktopFile.open(QIODevice::WriteOnly)) + { + QTextStream stream(&desktopFile); + qDebug() << m_instance->iconKey(); + stream << "[Desktop Entry]" << endl + << "Type=Application" << endl + << "Name=" << m_instance->name() << " - " << BuildConfig.LAUNCHER_DISPLAYNAME << endl + << "Exec=" << getLaunchCommand() << endl; + desktopFile.setPermissions(QFile::ReadOwner | QFile::ReadGroup | QFile::ReadOther + | QFile::WriteOwner | QFile::ExeOwner | QFile::ExeGroup); + desktopFile.close(); + } +#endif + // TODO: implementations for other operating systems +} \ No newline at end of file diff --git a/launcher/ui/dialogs/CreateShortcutDialog.h b/launcher/ui/dialogs/CreateShortcutDialog.h new file mode 100644 index 00000000..4725fc5e --- /dev/null +++ b/launcher/ui/dialogs/CreateShortcutDialog.h @@ -0,0 +1,40 @@ +/* + * Copyright 2022 arthomnix + * + * This source is subject to the Microsoft Public License (MS-PL). + * Please see the COPYING.md file for more information. + */ + +#pragma once + +#include +#include "minecraft/auth/MinecraftAccount.h" +#include "BaseInstance.h" + +namespace Ui +{ + class CreateShortcutDialog; +} + +class CreateShortcutDialog : public QDialog +{ + Q_OBJECT + +public: + explicit CreateShortcutDialog(QWidget *parent = nullptr, InstancePtr instance = nullptr); + ~CreateShortcutDialog() override; + +private +slots: + void on_shortcutPathBrowse_clicked(); + void updateDialogState(); + void accept() override; + +private: + Ui::CreateShortcutDialog *ui; + InstancePtr m_instance; + + QString getLaunchCommand(); + + void createShortcut(); +}; \ No newline at end of file diff --git a/launcher/ui/dialogs/CreateShortcutDialog.ui b/launcher/ui/dialogs/CreateShortcutDialog.ui new file mode 100644 index 00000000..b3e17d12 --- /dev/null +++ b/launcher/ui/dialogs/CreateShortcutDialog.ui @@ -0,0 +1,275 @@ + + + + CreateShortcutDialog + + + + 0 + 0 + 796 + 230 + + + + + 796 + 230 + + + + Create Shortcut + + + + + + QLayout::SetDefaultConstraint + + + + + Join server on launch: + + + + + + + Shortcut path: + + + + + + + + + + + + + Launch in offline mode + + + + + + + + + + Browse + + + + + + + Use specific profile: + + + + + + + + + + Set offline mode username: + + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + CreateShortcutDialog + accept() + + + 397 + 207 + + + 397 + 114 + + + + + buttonBox + rejected() + CreateShortcutDialog + reject() + + + 397 + 207 + + + 397 + 114 + + + + + joinServer + textChanged(QString) + CreateShortcutDialog + updateDialogState() + + + 471 + 61 + + + 397 + 114 + + + + + joinServerCheckBox + stateChanged(int) + CreateShortcutDialog + updateDialogState() + + + 122 + 61 + + + 397 + 114 + + + + + launchOfflineCheckBox + stateChanged(int) + CreateShortcutDialog + updateDialogState() + + + 122 + 130 + + + 397 + 114 + + + + + offlineUsername + textChanged(QString) + CreateShortcutDialog + updateDialogState() + + + 471 + 162 + + + 397 + 114 + + + + + offlineUsernameCheckBox + stateChanged(int) + CreateShortcutDialog + updateDialogState() + + + 122 + 162 + + + 397 + 114 + + + + + profileComboBox + currentTextChanged(QString) + CreateShortcutDialog + updateDialogState() + + + 471 + 98 + + + 397 + 114 + + + + + shortcutPath + textChanged(QString) + CreateShortcutDialog + updateDialogState() + + + 471 + 23 + + + 397 + 114 + + + + + useProfileCheckBox + stateChanged(int) + CreateShortcutDialog + updateDialogState() + + + 122 + 98 + + + 397 + 114 + + + + +