From 049b02cee46358a3d1dd13769e2c6f4ba27bc55e Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Jun 2023 21:06:01 +0300
Subject: finished up the curesforge export

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
 launcher/ui/dialogs/ExportMrPackDialog.cpp | 20 ++++++++++++++------
 launcher/ui/dialogs/ExportMrPackDialog.ui  | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 8 deletions(-)

(limited to 'launcher/ui/dialogs')

diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 16ef526a..aaa528aa 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -39,10 +39,13 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent, Mo
 {
     ui->setupUi(this);
     ui->name->setText(instance->name());
-    if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+    if (m_provider == ModPlatform::ResourceProvider::MODRINTH) {
         ui->summary->setText(instance->notes().split(QRegularExpression("\\r?\\n"))[0]);
-    else
+        ui->author->hide();
+        ui->authorLabel->hide();
+    } else {
         ui->summaryLabel->setText("ProjectID");
+    }
 
     // ensure a valid pack is generated
     // the name and version fields mustn't be empty
@@ -96,9 +99,14 @@ void ExportMrPackDialog::done(int result)
 {
     if (result == Accepted) {
         const QString filename = FS::RemoveInvalidFilenameChars(ui->name->text());
-        const QString output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
-                                                            FS::PathCombine(QDir::homePath(), filename + ".mrpack"),
-                                                            "Modrinth pack (*.mrpack *.zip)", nullptr);
+        QString output;
+        if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
+            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
+                                                  FS::PathCombine(QDir::homePath(), filename + ".mrpack"), "Modrinth pack (*.mrpack *.zip)",
+                                                  nullptr);
+        else
+            output = QFileDialog::getSaveFileName(this, tr("Export %1").arg(ui->name->text()),
+                                                  FS::PathCombine(QDir::homePath(), filename + ".zip"), "Curseforge pack (*.zip)", nullptr);
 
         if (output.isEmpty())
             return;
@@ -107,7 +115,7 @@ void ExportMrPackDialog::done(int result)
             task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
                                               [this](const QString& path) { return proxy->blockedPaths().covers(path); });
         else
-            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
+            task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->author->text(), ui->summary->text(), instance, output,
                                            [this](const QString& path) { return proxy->blockedPaths().covers(path); });
 
         connect(task, &Task::failed,
diff --git a/launcher/ui/dialogs/ExportMrPackDialog.ui b/launcher/ui/dialogs/ExportMrPackDialog.ui
index 9a789737..59ecb17c 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.ui
+++ b/launcher/ui/dialogs/ExportMrPackDialog.ui
@@ -24,7 +24,7 @@
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="3" column="0">
-       <widget class="QLabel" name="versionLabel">
+       <widget class="QLabel" name="summaryLabel">
         <property name="text">
          <string>Summary</string>
         </property>
@@ -41,7 +41,7 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="summaryLabel">
+       <widget class="QLabel" name="versionLabel">
         <property name="text">
          <string>Version</string>
         </property>
@@ -57,6 +57,16 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="authorLabel">
+        <property name="text">
+         <string>Author</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="author"/>
+      </item>
      </layout>
     </widget>
    </item>
-- 
cgit