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

dont allow primary/secondary tileset with the same (friendly) name, clearify duplicate error message

Browse source
This commit is contained in:
Karathan 2019-03-22 02:56:04 +01:00 committed by huderlem
parent 45be05426c
commit cf9a4bc0fc
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mainwindow.cpp
View file

@ -868,12 +868,13 @@ void MainWindow::on_actionNew_Tileset_triggered() {
return; return;
} }
QString fullDirectoryPath = editor->project->root + createTilesetDialog->path; QString fullDirectoryPath = editor->project->root + createTilesetDialog->path;
QString auxilaryPath = editor->project->root + "/data/tilesets/" + (createTilesetDialog->isSecondary ? "primary/" : "secondary/") + createTilesetDialog->friendlyName.toLower();
QDir directory; QDir directory;
if(directory.exists(fullDirectoryPath)) { if(directory.exists(fullDirectoryPath) || directory.exists(auxilaryPath)) {
logError(QString("Could not create tileset, could not create directory \"%1\", it already exists.").arg(fullDirectoryPath)); logError(QString("Could not create tileset \"%1\", it already exists.").arg(createTilesetDialog->friendlyName));
QMessageBox msgBox(this); QMessageBox msgBox(this);
msgBox.setText("Failed to add new tileset."); msgBox.setText("Failed to add new tileset.");
QString message = QString("The tileset already exists, view porymap.log for a complete description of the error."); QString message = QString("The tileset \"%1\" already exists.").arg(createTilesetDialog->friendlyName);
msgBox.setInformativeText(message); msgBox.setInformativeText(message);
msgBox.setDefaultButton(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok);
msgBox.setIcon(QMessageBox::Icon::Critical); msgBox.setIcon(QMessageBox::Icon::Critical);