ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

moved export to list to the mods page

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-11-14 18:40:45 +02:00
parent 99fbcbee4c
commit 6804e2ba59
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
7 changed files with 42 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/ui/MainWindow.cpp
View File

@ -96,7 +96,6 @@
#include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/CustomMessageBox.h"
#include "ui/dialogs/ExportInstanceDialog.h" #include "ui/dialogs/ExportInstanceDialog.h"
#include "ui/dialogs/ExportPackDialog.h" #include "ui/dialogs/ExportPackDialog.h"
#include "ui/dialogs/ExportToModListDialog.h"
#include "ui/dialogs/IconPickerDialog.h" #include "ui/dialogs/IconPickerDialog.h"
#include "ui/dialogs/ImportResourceDialog.h" #include "ui/dialogs/ImportResourceDialog.h"
#include "ui/dialogs/NewInstanceDialog.h" #include "ui/dialogs/NewInstanceDialog.h"
@ -208,7 +207,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWi
exportInstanceMenu->addAction(ui->actionExportInstanceZip); exportInstanceMenu->addAction(ui->actionExportInstanceZip);
exportInstanceMenu->addAction(ui->actionExportInstanceMrPack); exportInstanceMenu->addAction(ui->actionExportInstanceMrPack);
exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack); exportInstanceMenu->addAction(ui->actionExportInstanceFlamePack);
exportInstanceMenu->addAction(ui->actionExportInstanceToModList);
ui->actionExportInstance->setMenu(exportInstanceMenu); ui->actionExportInstance->setMenu(exportInstanceMenu);
} }
@ -1390,14 +1388,6 @@ void MainWindow::on_actionExportInstanceMrPack_triggered()
} }
} }
void MainWindow::on_actionExportInstanceToModList_triggered()
{
if (m_selectedInstance) {
ExportToModListDialog dlg(m_selectedInstance, this);
dlg.exec();
}
}
void MainWindow::on_actionExportInstanceFlamePack_triggered() void MainWindow::on_actionExportInstanceFlamePack_triggered()
{ {
if (m_selectedInstance) { if (m_selectedInstance) {

1
launcher/ui/MainWindow.h
View File

@ -156,7 +156,6 @@ class MainWindow : public QMainWindow {
void on_actionExportInstanceZip_triggered(); void on_actionExportInstanceZip_triggered();
void on_actionExportInstanceMrPack_triggered(); void on_actionExportInstanceMrPack_triggered();
void on_actionExportInstanceFlamePack_triggered(); void on_actionExportInstanceFlamePack_triggered();
void on_actionExportInstanceToModList_triggered();
void on_actionRenameInstance_triggered(); void on_actionRenameInstance_triggered();

9
launcher/ui/MainWindow.ui
View File

@ -479,15 +479,6 @@
<string>CurseForge (zip)</string> <string>CurseForge (zip)</string>
</property> </property>
</action> </action>
<action name="actionExportInstanceToModList">
<property name="icon">
<iconset theme="new">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="text">
<string>Mod List</string>
</property>
</action>
<action name="actionCreateInstanceShortcut"> <action name="actionCreateInstanceShortcut">
<property name="icon"> <property name="icon">
<iconset theme="shortcut"> <iconset theme="shortcut">

48
launcher/ui/dialogs/ExportToModListDialog.cpp
View File

@ -22,8 +22,6 @@
#include <QTextEdit> #include <QTextEdit>
#include "FileSystem.h" #include "FileSystem.h"
#include "Markdown.h" #include "Markdown.h"
#include "minecraft/MinecraftInstance.h"
#include "minecraft/mod/ModFolderModel.h"
#include "modplatform/helpers/ExportToModList.h" #include "modplatform/helpers/ExportToModList.h"
#include "ui_ExportToModListDialog.h" #include "ui_ExportToModListDialog.h"
@ -41,21 +39,12 @@ const QHash<ExportToModList::Formats, QString> ExportToModListDialog::exampleLin
{ ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" }, { ExportToModList::CSV, "{name},{url},{version},\"{authors}\"" },
}; };
ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* parent) ExportToModListDialog::ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent)
: QDialog(parent), m_template_changed(false), name(instance->name()), ui(new Ui::ExportToModListDialog) : QDialog(parent), m_mods(mods), m_template_changed(false), m_name(name), ui(new Ui::ExportToModListDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
enableCustom(false); enableCustom(false);
MinecraftInstance* mcInstance = dynamic_cast<MinecraftInstance*>(instance.get());
if (mcInstance) {
mcInstance->loaderModList()->update();
connect(mcInstance->loaderModList().get(), &ModFolderModel::updateFinished, this, [this, mcInstance]() {
m_allMods = mcInstance->loaderModList()->allMods();
triggerImp();
});
}
connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportToModListDialog::formatChanged); connect(ui->formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ExportToModListDialog::formatChanged);
connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger); connect(ui->authorsCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger); connect(ui->versionCheckBox, &QCheckBox::stateChanged, this, &ExportToModListDialog::trigger);
@ -64,7 +53,7 @@ ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* pare
connect(ui->versionButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Version); }); connect(ui->versionButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Version); });
connect(ui->urlButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Url); }); connect(ui->urlButton, &QPushButton::clicked, this, [this](bool) { addExtra(ExportToModList::Url); });
connect(ui->templateText, &QTextEdit::textChanged, this, [this] { connect(ui->templateText, &QTextEdit::textChanged, this, [this] {
if (ui->templateText->toPlainText() != exampleLines[format]) if (ui->templateText->toPlainText() != exampleLines[m_format])
ui->formatComboBox->setCurrentIndex(5); ui->formatComboBox->setCurrentIndex(5);
else else
triggerImp(); triggerImp();
@ -73,6 +62,7 @@ ExportToModListDialog::ExportToModListDialog(InstancePtr instance, QWidget* pare
this->ui->finalText->selectAll(); this->ui->finalText->selectAll();
this->ui->finalText->copy(); this->ui->finalText->copy();
}); });
triggerImp();
} }
ExportToModListDialog::~ExportToModListDialog() ExportToModListDialog::~ExportToModListDialog()
@ -86,38 +76,38 @@ void ExportToModListDialog::formatChanged(int index)
case 0: { case 0: {
enableCustom(false); enableCustom(false);
ui->resultText->show(); ui->resultText->show();
format = ExportToModList::HTML; m_format = ExportToModList::HTML;
break; break;
} }
case 1: { case 1: {
enableCustom(false); enableCustom(false);
ui->resultText->show(); ui->resultText->show();
format = ExportToModList::MARKDOWN; m_format = ExportToModList::MARKDOWN;
break; break;
} }
case 2: { case 2: {
enableCustom(false); enableCustom(false);
ui->resultText->hide(); ui->resultText->hide();
format = ExportToModList::PLAINTXT; m_format = ExportToModList::PLAINTXT;
break; break;
} }
case 3: { case 3: {
enableCustom(false); enableCustom(false);
ui->resultText->hide(); ui->resultText->hide();
format = ExportToModList::JSON; m_format = ExportToModList::JSON;
break; break;
} }
case 4: { case 4: {
enableCustom(false); enableCustom(false);
ui->resultText->hide(); ui->resultText->hide();
format = ExportToModList::CSV; m_format = ExportToModList::CSV;
break; break;
} }
case 5: { case 5: {
m_template_changed = true; m_template_changed = true;
enableCustom(true); enableCustom(true);
ui->resultText->hide(); ui->resultText->hide();
format = ExportToModList::CUSTOM; m_format = ExportToModList::CUSTOM;
break; break;
} }
} }
@ -126,8 +116,8 @@ void ExportToModListDialog::formatChanged(int index)
void ExportToModListDialog::triggerImp() void ExportToModListDialog::triggerImp()
{ {
if (format == ExportToModList::CUSTOM) { if (m_format == ExportToModList::CUSTOM) {
ui->finalText->setPlainText(ExportToModList::exportToModList(m_allMods, ui->templateText->toPlainText())); ui->finalText->setPlainText(ExportToModList::exportToModList(m_mods, ui->templateText->toPlainText()));
return; return;
} }
auto opt = 0; auto opt = 0;
@ -137,9 +127,9 @@ void ExportToModListDialog::triggerImp()
opt |= ExportToModList::Version; opt |= ExportToModList::Version;
if (ui->urlCheckBox->isChecked()) if (ui->urlCheckBox->isChecked())
opt |= ExportToModList::Url; opt |= ExportToModList::Url;
auto txt = ExportToModList::exportToModList(m_allMods, format, static_cast<ExportToModList::OptionalData>(opt)); auto txt = ExportToModList::exportToModList(m_mods, m_format, static_cast<ExportToModList::OptionalData>(opt));
ui->finalText->setPlainText(txt); ui->finalText->setPlainText(txt);
switch (format) { switch (m_format) {
case ExportToModList::CUSTOM: case ExportToModList::CUSTOM:
return; return;
case ExportToModList::HTML: case ExportToModList::HTML:
@ -155,7 +145,7 @@ void ExportToModListDialog::triggerImp()
case ExportToModList::CSV: case ExportToModList::CSV:
break; break;
} }
auto exampleLine = exampleLines[format]; auto exampleLine = exampleLines[m_format];
if (!m_template_changed && ui->templateText->toPlainText() != exampleLine) if (!m_template_changed && ui->templateText->toPlainText() != exampleLine)
ui->templateText->setPlainText(exampleLine); ui->templateText->setPlainText(exampleLine);
} }
@ -163,9 +153,9 @@ void ExportToModListDialog::triggerImp()
void ExportToModListDialog::done(int result) void ExportToModListDialog::done(int result)
{ {
if (result == Accepted) { if (result == Accepted) {
const QString filename = FS::RemoveInvalidFilenameChars(name); const QString filename = FS::RemoveInvalidFilenameChars(m_name);
const QString output = const QString output =
QFileDialog::getSaveFileName(this, tr("Export %1").arg(name), FS::PathCombine(QDir::homePath(), filename + extension()), QFileDialog::getSaveFileName(this, tr("Export %1").arg(m_name), FS::PathCombine(QDir::homePath(), filename + extension()),
"File (*.txt *.html *.md *.json *.csv)", nullptr); "File (*.txt *.html *.md *.json *.csv)", nullptr);
if (output.isEmpty()) if (output.isEmpty())
@ -178,7 +168,7 @@ void ExportToModListDialog::done(int result)
QString ExportToModListDialog::extension() QString ExportToModListDialog::extension()
{ {
switch (format) { switch (m_format) {
case ExportToModList::HTML: case ExportToModList::HTML:
return ".html"; return ".html";
case ExportToModList::MARKDOWN: case ExportToModList::MARKDOWN:
@ -197,7 +187,7 @@ QString ExportToModListDialog::extension()
void ExportToModListDialog::addExtra(ExportToModList::OptionalData option) void ExportToModListDialog::addExtra(ExportToModList::OptionalData option)
{ {
if (format != ExportToModList::CUSTOM) if (m_format != ExportToModList::CUSTOM)
return; return;
switch (option) { switch (option) {
case ExportToModList::Authors: case ExportToModList::Authors:

10
launcher/ui/dialogs/ExportToModListDialog.h
View File

@ -20,7 +20,6 @@
#include <QDialog> #include <QDialog>
#include <QList> #include <QList>
#include "BaseInstance.h"
#include "minecraft/mod/Mod.h" #include "minecraft/mod/Mod.h"
#include "modplatform/helpers/ExportToModList.h" #include "modplatform/helpers/ExportToModList.h"
@ -32,7 +31,7 @@ class ExportToModListDialog : public QDialog {
Q_OBJECT Q_OBJECT
public: public:
explicit ExportToModListDialog(InstancePtr instance, QWidget* parent = nullptr); explicit ExportToModListDialog(QString name, QList<Mod*> mods, QWidget* parent = nullptr);
~ExportToModListDialog(); ~ExportToModListDialog();
void done(int result) override; void done(int result) override;
@ -46,10 +45,11 @@ class ExportToModListDialog : public QDialog {
private: private:
QString extension(); QString extension();
void enableCustom(bool enabled); void enableCustom(bool enabled);
QList<Mod*> m_allMods;
QList<Mod*> m_mods;
bool m_template_changed; bool m_template_changed;
QString name; QString m_name;
ExportToModList::Formats format = ExportToModList::Formats::HTML; ExportToModList::Formats m_format = ExportToModList::Formats::HTML;
Ui::ExportToModListDialog* ui; Ui::ExportToModListDialog* ui;
static const QHash<ExportToModList::Formats, QString> exampleLines; static const QHash<ExportToModList::Formats, QString> exampleLines;
}; };

18
launcher/ui/pages/instance/ModFolderPage.cpp
View File

@ -37,6 +37,7 @@
*/ */
#include "ModFolderPage.h" #include "ModFolderPage.h"
#include "ui/dialogs/ExportToModListDialog.h"
#include "ui_ExternalResourcesPage.h" #include "ui_ExternalResourcesPage.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
@ -111,6 +112,10 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
connect(actionRemoveItemMetadata, &QAction::triggered, this, &ModFolderPage::deleteModMetadata); connect(actionRemoveItemMetadata, &QAction::triggered, this, &ModFolderPage::deleteModMetadata);
actionRemoveItemMetadata->setEnabled(false); actionRemoveItemMetadata->setEnabled(false);
auto actionExportMetadata = updateMenu->addAction(tr("Export metadata"));
actionExportMetadata->setToolTip(tr("Export mod's metadata to text"));
connect(actionExportMetadata, &QAction::triggered, this, &ModFolderPage::exportModMetadata);
ui->actionUpdateItem->setMenu(updateMenu); ui->actionUpdateItem->setMenu(updateMenu);
ui->actionUpdateItem->setToolTip(tr("Try to check or update all selected mods (all mods if none are selected)")); ui->actionUpdateItem->setToolTip(tr("Try to check or update all selected mods (all mods if none are selected)"));
@ -124,7 +129,7 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); }; auto check_allow_update = [this] { return ui->treeView->selectionModel()->hasSelection() || !m_model->empty(); };
connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
[this, check_allow_update, actionRemoveItemMetadata] { [this, check_allow_update, actionRemoveItemMetadata, actionExportMetadata] {
ui->actionUpdateItem->setEnabled(check_allow_update()); ui->actionUpdateItem->setEnabled(check_allow_update());
auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes(); auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
@ -360,3 +365,14 @@ void ModFolderPage::deleteModMetadata()
m_model->deleteModsMetadata(selection); m_model->deleteModsMetadata(selection);
} }
void ModFolderPage::exportModMetadata()
{
auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection()).indexes();
auto selectedMods = m_model->selectedMods(selection);
if (selectedMods.length() == 0)
selectedMods = m_model->allMods();
ExportToModListDialog dlg(m_instance->name(), selectedMods, this);
dlg.exec();
}

1
launcher/ui/pages/instance/ModFolderPage.h
View File

@ -62,6 +62,7 @@ class ModFolderPage : public ExternalResourcesPage {
private slots: private slots:
void removeItems(const QItemSelection& selection) override; void removeItems(const QItemSelection& selection) override;
void deleteModMetadata(); void deleteModMetadata();
void exportModMetadata();
void installMods(); void installMods();
void updateMods(bool includeDeps = false); void updateMods(bool includeDeps = false);