Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-23 01:57:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Message functions for Tileset Editor

Browse Source
This commit is contained in:
GriffinR 2025-05-12 23:19:09 -04:00
parent 00c82f43d2
commit 018ad49ac4
4 changed files with 58 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/ui/message.h
View File

@ -24,14 +24,16 @@ public:
class ErrorMessage : public Message {
public:
ErrorMessage(const QString &message, QWidget *parent);
static void show(const QString &message, QWidget *parent);
static void show(const QString &message, const QString &informativeText, QWidget *parent);
static void show(const QString &message, QWidget *parent) { ErrorMessage::show(message, QString(), parent); }
};
// Basic warning message with an 'Ok' button.
class WarningMessage : public Message {
public:
WarningMessage(const QString &message, QWidget *parent);
static void show(const QString &message, QWidget *parent);
static void show(const QString &message, const QString &informativeText, QWidget *parent);
static void show(const QString &message, QWidget *parent) { WarningMessage::show(message, QString(), parent); }
};
// Basic informational message with a 'Close' button.
@ -42,13 +44,22 @@ public:
static void show(const QString &message, QWidget *parent) { InfoMessage::show(message, QString(), parent); }
};
// Basic question message with a 'Yes' and 'No' button.
// Basic question message with a 'Yes' and 'No' button. Defaults to 'No'.
class QuestionMessage : public Message {
public:
QuestionMessage(const QString &message, QWidget *parent);
static int show(const QString &message, QWidget *parent);
};
// A question message with the text "<name> has been modified, save changes?".
// Has a 'Yes', 'No', and optional 'Cancel' button. Defaults to 'Yes'.
class SaveChangesMessage : public QuestionMessage {
public:
SaveChangesMessage(const QString &name, bool allowCancel, QWidget *parent);
static int show(const QString &name, bool allowCancel, QWidget *parent);
static int show(const QString &name, QWidget *parent) { return SaveChangesMessage::show(name, true, parent); }
};
// Error message directing users to their log file.
// Shows the most recent error as detailed text.
class RecentErrorMessage : public ErrorMessage {

6
src/mainwindow.cpp
View File

@ -3133,11 +3133,7 @@ bool MainWindow::closeProject() {
return true;
if (this->editor->project->hasUnsavedChanges()) {
QuestionMessage msgBox(QStringLiteral("The project has been modified, save changes?"), this);
msgBox.addButton(QMessageBox::Cancel);
msgBox.setDefaultButton(QMessageBox::Yes);
auto reply = msgBox.exec();
auto reply = SaveChangesMessage::show(QStringLiteral("The project"), this);
if (reply == QMessageBox::Yes) {
if (!save())
return false;

28
src/ui/message.cpp
View File

@ -52,6 +52,15 @@ QuestionMessage::QuestionMessage(const QString &message, QWidget *parent) :
setDefaultButton(QMessageBox::No);
}
SaveChangesMessage::SaveChangesMessage(const QString &name, bool allowCancel, QWidget *parent) :
QuestionMessage(QString("%1 has been modified, save changes?").arg(name), parent)
{
if (allowCancel) {
addButton(QMessageBox::Cancel);
}
setDefaultButton(QMessageBox::Yes);
}
RecentErrorMessage::RecentErrorMessage(const QString &message, QWidget *parent) :
ErrorMessage(message, parent)
{
@ -63,24 +72,31 @@ void RecentErrorMessage::show(const QString &message, QWidget *parent) {
auto msgBox = new RecentErrorMessage(message, parent);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->open();
};
}
void ErrorMessage::show(const QString &message, QWidget *parent) {
void ErrorMessage::show(const QString &message, const QString &informativeText, QWidget *parent) {
auto msgBox = new ErrorMessage(message, parent);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setInformativeText(informativeText);
msgBox->open();
};
}
void WarningMessage::show(const QString &message, QWidget *parent) {
void WarningMessage::show(const QString &message, const QString &informativeText, QWidget *parent) {
auto msgBox = new WarningMessage(message, parent);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setInformativeText(informativeText);
msgBox->open();
};
}
int QuestionMessage::show(const QString &message, QWidget *parent) {
QuestionMessage msgBox(message, parent);
return msgBox.exec();
};
}
int SaveChangesMessage::show(const QString &name, bool allowCancel, QWidget *parent) {
SaveChangesMessage msgBox(name, allowCancel, parent);
return msgBox.exec();
}
void InfoMessage::show(const QString &message, const QString &informativeText, QWidget *parent) {
auto msgBox = new InfoMessage(message, parent);

71
src/ui/tileseteditor.cpp
View File

@ -11,7 +11,7 @@
#include "validator.h"
#include "eventfilters.h"
#include "utility.h"
#include <QMessageBox>
#include "message.h"
#include <QDialogButtonBox>
#include <QCloseEvent>
#include <QImageReader>
@ -89,14 +89,10 @@ void TilesetEditor::updateLayout(Layout *layout) {
void TilesetEditor::updateTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) {
if (this->hasUnsavedChanges) {
QMessageBox::StandardButton result = QMessageBox::question(
this,
QApplication::applicationName(),
"Tileset has been modified, save changes?",
QMessageBox::No | QMessageBox::Yes,
QMessageBox::Yes);
if (result == QMessageBox::Yes)
auto result = SaveChangesMessage::show(QStringLiteral("Tileset"), false, this);
if (result == QMessageBox::Yes) {
this->save();
}
}
this->setTilesets(primaryTilesetLabel, secondaryTilesetLabel);
this->refresh();
@ -735,14 +731,11 @@ void TilesetEditor::importTilesetTiles(Tileset *tileset, bool primary) {
logError(QString("Failed to open image file: '%1'").arg(filepath));
}
if (image.width() == 0 || image.height() == 0 || image.width() % 8 != 0 || image.height() % 8 != 0) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import tiles.");
msgBox.setInformativeText(QString("The image dimensions (%1 x %2) are invalid. Width and height must be multiples of 8 pixels.")
ErrorMessage::show(QStringLiteral("Failed to import tiles."),
QString("The image dimensions (%1 x %2) are invalid. Width and height must be multiples of 8 pixels.")
.arg(image.width())
.arg(image.height()));
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
.arg(image.height()),
this);
return;
}
@ -752,27 +745,23 @@ void TilesetEditor::importTilesetTiles(Tileset *tileset, bool primary) {
int totalTiles = numTilesHigh * numTilesWide;
int maxAllowedTiles = primary ? Project::getNumTilesPrimary() : Project::getNumTilesTotal() - Project::getNumTilesPrimary();
if (totalTiles > maxAllowedTiles) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import tiles.");
msgBox.setInformativeText(QString("The maximum number of tiles allowed in the %1 tileset is %2, but the provided image contains %3 total tiles.")
ErrorMessage::show(QStringLiteral("Failed to import tiles."),
QString("The maximum number of tiles allowed in the %1 tileset is %2, but the provided image contains %3 total tiles.")
.arg(descriptor)
.arg(maxAllowedTiles)
.arg(totalTiles));
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
.arg(totalTiles),
this);
return;
}
// Ask user to provide a palette for the un-indexed image.
if (image.colorCount() == 0) {
QMessageBox msgBox(this);
msgBox.setText("Select Palette for Tiles");
msgBox.setInformativeText(QString("The provided image is not indexed. Please select a palette file for the image. An indexed image will be generated using the provided image and palette.")
.arg(image.colorCount()));
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Warning);
msgBox.exec();
auto msgBox = new QuestionMessage(QStringLiteral("Select a palette file for this image?"), this);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setInformativeText(QStringLiteral("The provided image is not indexed. "
"An indexed image will be generated using the provided image and palette."));
if (msgBox->exec() != QMessageBox::Yes)
return;
QString filepath = FileDialog::getOpenFileName(this, "Select Palette for Tiles Image", "", "Palette Files (*.pal *.act *tpl *gpl)");
if (filepath.isEmpty()) {
@ -782,13 +771,7 @@ void TilesetEditor::importTilesetTiles(Tileset *tileset, bool primary) {
bool error = false;
QList<QRgb> palette = PaletteUtil::parse(filepath, &error);
if (error) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import palette.");
QString message = QString("The palette file could not be processed. View porymap.log for specific errors.");
msgBox.setInformativeText(message);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
RecentErrorMessage::show(QStringLiteral("Failed to import palette."), this);
return;
}
@ -804,13 +787,7 @@ void TilesetEditor::importTilesetTiles(Tileset *tileset, bool primary) {
void TilesetEditor::closeEvent(QCloseEvent *event)
{
if (this->hasUnsavedChanges) {
QMessageBox::StandardButton result = QMessageBox::question(
this,
QApplication::applicationName(),
"Tileset has been modified, save changes?",
QMessageBox::No | QMessageBox::Yes | QMessageBox::Cancel,
QMessageBox::Yes);
auto result = SaveChangesMessage::show(QStringLiteral("Tileset"), this);
if (result == QMessageBox::Yes) {
if (this->save()) {
event->accept();
@ -1062,13 +1039,7 @@ void TilesetEditor::importTilesetMetatiles(Tileset *tileset, bool primary)
bool error = false;
QList<Metatile*> metatiles = AdvanceMapParser::parseMetatiles(filepath, &error, primary);
if (error) {
QMessageBox msgBox(this);
msgBox.setText("Failed to import metatiles from Advance Map 1.92 .bvd file.");
QString message = QString("The .bvd file could not be processed. View porymap.log for specific errors.");
msgBox.setInformativeText(message);
msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical);
msgBox.exec();
RecentErrorMessage::show(QStringLiteral("Failed to import metatiles from Advance Map 1.92 .bvd file."), this);
qDeleteAll(metatiles);
return;
}