diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index 5af24b1b7..73e44efb1 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -47,11 +47,18 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
setWindowTitle(tr("Export Modrinth Pack"));
- ui->summary->setText(instance->settings()->get("ExportSummary").toString());
+
+ ui->authorLabel->hide();
+ ui->author->hide();
+
+ ui->summary->setPlainText(instance->settings()->get("ExportSummary").toString());
} else {
setWindowTitle(tr("Export CurseForge Pack"));
- ui->summaryLabel->setText(tr("&Author"));
- ui->summary->setText(instance->settings()->get("ExportAuthor").toString());
+
+ ui->summaryLabel->hide();
+ ui->summary->hide();
+
+ ui->author->setText(instance->settings()->get("ExportAuthor").toString());
}
// ensure a valid pack is generated
@@ -108,9 +115,13 @@ void ExportPackDialog::done(int result)
auto settings = instance->settings();
settings->set("ExportName", ui->name->text());
settings->set("ExportVersion", ui->version->text());
- settings->set(m_provider == ModPlatform::ResourceProvider::FLAME ? "ExportAuthor" : "ExportSummary", ui->summary->text());
settings->set("ExportOptionalFiles", ui->optionalFiles->isChecked());
+ if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+ settings->set("ExportSummary", ui->summary->toPlainText());
+ else
+ settings->set("ExportAuthor", ui->author->text());
+
if (result == Accepted) {
const QString name = ui->name->text().isEmpty() ? instance->name() : ui->name->text();
const QString filename = FS::RemoveInvalidFilenameChars(name);
@@ -134,10 +145,10 @@ void ExportPackDialog::done(int result)
Task* task;
if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
- task = new ModrinthPackExportTask(name, ui->version->text(), ui->summary->text(), ui->optionalFiles->isChecked(), instance,
- output, std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
+ task = new ModrinthPackExportTask(name, ui->version->text(), ui->summary->toPlainText(), ui->optionalFiles->isChecked(),
+ instance, output, std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
} else {
- task = new FlamePackExportTask(name, ui->version->text(), ui->summary->text(), ui->optionalFiles->isChecked(), instance, output,
+ task = new FlamePackExportTask(name, ui->version->text(), ui->author->text(), ui->optionalFiles->isChecked(), instance, output,
std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
}
diff --git a/launcher/ui/dialogs/ExportPackDialog.ui b/launcher/ui/dialogs/ExportPackDialog.ui
index 09dea72a8..a4a174212 100644
--- a/launcher/ui/dialogs/ExportPackDialog.ui
+++ b/launcher/ui/dialogs/ExportPackDialog.ui
@@ -7,7 +7,7 @@
0
0
650
- 510
+ 532
@@ -19,21 +19,8 @@
&Description
-
- -
-
-
- &Summary
-
-
- summary
-
-
-
- -
-
-
- -
+
+
-
&Name
@@ -43,7 +30,10 @@
- -
+
-
+
+
+ -
&Version
@@ -53,16 +43,43 @@
- -
-
-
- -
+
-
1.0.0
+ -
+
+
+ &Summary
+
+
+ summary
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ &Author
+
+
+ author
+
+
+
+ -
+
+
@@ -124,6 +141,7 @@
name
version
summary
+ author
files
optionalFiles