atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Unsaved changes prompt for tileset editor when switching tilesets or maps

Browse source
This commit is contained in:
GriffinR 2020-07-01 22:08:36 -04:00 committed by huderlem
parent b16703a397
commit 257405f451
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mainwindow.cpp
View file

@ -2248,9 +2248,23 @@ void MainWindow::onMapCacheCleared() {
} }
void MainWindow::onTilesetsSaved(QString primaryTilesetLabel, QString secondaryTilesetLabel) { void MainWindow::onTilesetsSaved(QString primaryTilesetLabel, QString secondaryTilesetLabel) {
this->editor->updatePrimaryTileset(primaryTilesetLabel, true); // If saved tilesets are currently in-use, update them and redraw
this->editor->updateSecondaryTileset(secondaryTilesetLabel, true); // Otherwise overwrite the cache for the saved tileset
redrawMapScene(); bool updated = false;
if (primaryTilesetLabel == this->editor->map->layout->tileset_primary_label) {
this->editor->updatePrimaryTileset(primaryTilesetLabel, true);
updated = true;
} else {
this->editor->project->getTileset(primaryTilesetLabel, true);
}
if (secondaryTilesetLabel == this->editor->map->layout->tileset_secondary_label) {
this->editor->updateSecondaryTileset(secondaryTilesetLabel, true);
updated = true;
} else {
this->editor->project->getTileset(secondaryTilesetLabel, true);
}
if (updated)
redrawMapScene();
} }
void MainWindow::onWildMonDataChanged() { void MainWindow::onWildMonDataChanged() {

11
src/ui/tileseteditor.cpp
View file

@ -116,6 +116,17 @@ void TilesetEditor::setMap(Map *map) {
} }
void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) { void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) {
if (this->hasUnsavedChanges) {
QMessageBox::StandardButton result = QMessageBox::question(
this,
"porymap",
"Tileset has been modified, save changes?",
QMessageBox::No | QMessageBox::Yes,
QMessageBox::Yes);
if (result == QMessageBox::Yes)
this->on_actionSave_Tileset_triggered();
}
this->hasUnsavedChanges = false;
delete this->primaryTileset; delete this->primaryTileset;
delete this->secondaryTileset; delete this->secondaryTileset;
Tileset *primaryTileset = project->getTileset(primaryTilesetLabel); Tileset *primaryTileset = project->getTileset(primaryTilesetLabel);