Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-25 07:18:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename getTilesets->getTilesetLabels

Browse Source
This commit is contained in:
Karathan 2019-03-23 15:49:30 +01:00 committed by huderlem
parent 8c3c498ac9
commit e305e42e61
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/project.h
View File

@ -98,7 +98,7 @@ public:
QList<QStringList>* parseAsm(QString text); QList<QStringList>* parseAsm(QString text);
QStringList getSongNames(); QStringList getSongNames();
QStringList getVisibilities(); QStringList getVisibilities();
QMap<QString, QStringList> getTilesets(); QMap<QString, QStringList> getTilesetLabels();
void readTilesetProperties(); void readTilesetProperties();
void readRegionMapSections(); void readRegionMapSections();
void readItemNames(); void readItemNames();

4
src/mainwindow.cpp
View File

@ -469,7 +469,7 @@ void MainWindow::displayMapProperties() {
ui->comboBox_Location->addItems(*project->regionMapSections); ui->comboBox_Location->addItems(*project->regionMapSections);
ui->comboBox_Location->setCurrentText(map->location); ui->comboBox_Location->setCurrentText(map->location);
QMap<QString, QStringList> tilesets = project->getTilesets(); QMap<QString, QStringList> tilesets = project->getTilesetLabels();
ui->comboBox_PrimaryTileset->addItems(tilesets.value("primary")); ui->comboBox_PrimaryTileset->addItems(tilesets.value("primary"));
ui->comboBox_PrimaryTileset->setCurrentText(map->layout->tileset_primary_label); ui->comboBox_PrimaryTileset->setCurrentText(map->layout->tileset_primary_label);
ui->comboBox_SecondaryTileset->addItems(tilesets.value("secondary")); ui->comboBox_SecondaryTileset->addItems(tilesets.value("secondary"));
@ -880,7 +880,7 @@ void MainWindow::on_actionNew_Tileset_triggered() {
msgBox.exec(); msgBox.exec();
return; return;
} }
QMap<QString, QStringList> tilesets = this->editor->project->getTilesets(); QMap<QString, QStringList> tilesets = this->editor->project->getTilesetLabels();
if(tilesets.value("primary").contains(createTilesetDialog->fullSymbolName) || tilesets.value("secondary").contains(createTilesetDialog->fullSymbolName)) { if(tilesets.value("primary").contains(createTilesetDialog->fullSymbolName) || tilesets.value("secondary").contains(createTilesetDialog->fullSymbolName)) {
logError(QString("Could not create tileset \"%1\", the symbol \"%2\" already exists.").arg(createTilesetDialog->friendlyName, createTilesetDialog->fullSymbolName)); logError(QString("Could not create tileset \"%1\", the symbol \"%2\" already exists.").arg(createTilesetDialog->friendlyName, createTilesetDialog->fullSymbolName));
QMessageBox msgBox(this); QMessageBox msgBox(this);

2
src/project.cpp
View File

@ -1407,7 +1407,7 @@ QStringList Project::getVisibilities() {
return names; return names;
} }
QMap<QString, QStringList> Project::getTilesets() { QMap<QString, QStringList> Project::getTilesetLabels() {
QMap<QString, QStringList> allTilesets; QMap<QString, QStringList> allTilesets;
QStringList primaryTilesets; QStringList primaryTilesets;
QStringList secondaryTilesets; QStringList secondaryTilesets;

2
src/ui/newmappopup.cpp
View File

@ -48,7 +48,7 @@ void NewMapPopup::useLayout(QString layoutId) {
void NewMapPopup::setDefaultValues(int groupNum, QString mapSec) { void NewMapPopup::setDefaultValues(int groupNum, QString mapSec) {
ui->lineEdit_NewMap_Name->setText(project->getNewMapName()); ui->lineEdit_NewMap_Name->setText(project->getNewMapName());
QMap<QString, QStringList> tilesets = project->getTilesets(); QMap<QString, QStringList> tilesets = project->getTilesetLabels();
ui->comboBox_NewMap_Primary_Tileset->addItems(tilesets.value("primary")); ui->comboBox_NewMap_Primary_Tileset->addItems(tilesets.value("primary"));
ui->comboBox_NewMap_Secondary_Tileset->addItems(tilesets.value("secondary")); ui->comboBox_NewMap_Secondary_Tileset->addItems(tilesets.value("secondary"));