diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-06-04 19:01:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-04 19:01:50 -0700 |
| commit | 3dccc38f42bf64c922e96b9a224d87ca1cee98c6 (patch) | |
| tree | 717d036c1466d175f57c8f4f18b7d29e48b7e480 /launcher/ui/MainWindow.cpp | |
| parent | 1840505a0f887ebfc2c719113873ea3345b133fb (diff) | |
| parent | 3c87e5d31eb8fb33d6e63a38377c9729a130af45 (diff) | |
| download | PrismLauncher-3dccc38f42bf64c922e96b9a224d87ca1cee98c6.tar.gz PrismLauncher-3dccc38f42bf64c922e96b9a224d87ca1cee98c6.tar.bz2 PrismLauncher-3dccc38f42bf64c922e96b9a224d87ca1cee98c6.zip | |
Merge pull request #904 from TheKodeToad/mrpack-export
mrpack export
Diffstat (limited to 'launcher/ui/MainWindow.cpp')
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 72b7db64..cb194f66 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -2,7 +2,7 @@ /* * Prism Launcher - Minecraft Launcher * Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> - * Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me> + * Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,6 +107,7 @@ #include "ui/dialogs/CopyInstanceDialog.h" #include "ui/dialogs/EditAccountDialog.h" #include "ui/dialogs/ExportInstanceDialog.h" +#include "ui/dialogs/ExportMrPackDialog.h" #include "ui/dialogs/ImportResourceDialog.h" #include "ui/themes/ITheme.h" #include "ui/themes/ThemeManager.h" @@ -397,6 +398,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // removing this looks stupid view->setFocus(); + ui->actionExportInstance->setMenu(ui->exportInstanceMenu); + retranslateUi(); } @@ -1359,7 +1362,7 @@ void MainWindow::on_actionDeleteInstance_triggered() APPLICATION->instances()->deleteInstance(id); } -void MainWindow::on_actionExportInstance_triggered() +void MainWindow::on_actionExportInstanceZip_triggered() { if (m_selectedInstance) { @@ -1368,6 +1371,15 @@ void MainWindow::on_actionExportInstance_triggered() } } +void MainWindow::on_actionExportInstanceMrPack_triggered() +{ + if (m_selectedInstance) + { + ExportMrPackDialog dlg(m_selectedInstance, this); + dlg.exec(); + } +} + void MainWindow::on_actionRenameInstance_triggered() { if (m_selectedInstance) |