Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-15 21:32:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Maintain master and working copies of data structures, to enable saving single maps at a time

Browse Source
This commit is contained in:
Marcus Huderle
2018-02-17 20:41:15 -08:00
parent 17e5892cd4
commit e4c5d53ffd
4 changed files with 116 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mainwindow.cpp
View File

@@ -73,26 +73,26 @@ void MainWindow::openProject(QString dir) {
QString MainWindow::getDefaultMap() {
if (editor && editor->project) {
QList<QStringList*> *names = editor->project->groupedMapNames;
if (names) {
QList<QStringList> names = editor->project->groupedMapNames;
if (!names.isEmpty()) {
QSettings settings;
QString key = "project:" + editor->project->root;
if (settings.contains(key)) {
QMap<QString, QVariant> qmap = settings.value(key).toMap();
if (qmap.contains("recent_map")) {
QString map_name = qmap.value("recent_map").toString();
for (int i = 0; i < names->length(); i++) {
if (names->value(i)->contains(map_name)) {
for (int i = 0; i < names.length(); i++) {
if (names.value(i).contains(map_name)) {
return map_name;
}
}
}
}
// Failing that, just get the first map in the list.
for (int i = 0; i < names->length(); i++) {
QStringList *list = names->value(i);
if (list->length()) {
return list->value(0);
for (int i = 0; i < names.length(); i++) {
QStringList list = names.value(i);
if (list.length()) {
return list.value(0);
}
}
}
@@ -327,9 +327,9 @@ void MainWindow::populateMapList() {
group->setData(i, MapListUserRoles::GroupRole);
maps->appendRow(group);
mapGroupsModel->append(group);
QStringList *names = project->groupedMapNames->value(i);
for (int j = 0; j < names->length(); j++) {
QString map_name = names->value(j);
QStringList names = project->groupedMapNames.value(i);
for (int j = 0; j < names.length(); j++) {
QString map_name = names.value(j);
QStandardItem *map = createMapItem(map_name, i, j);
group->appendRow(map);
}
@@ -387,7 +387,9 @@ void MainWindow::onAddNewMapToGroupClick(QAction* triggeredAction)
QStandardItem* groupItem = mapGroupsModel->at(groupNum);
QString newMapName = editor->project->getNewMapName();
editor->project->addNewMapToGroup(newMapName, groupNum);
Map* newMap = editor->project->addNewMapToGroup(newMapName, groupNum);
editor->project->saveMap(newMap);
editor->project->saveAllDataStructures();
int numMapsInGroup = groupItem->rowCount();
QStandardItem *newMapItem = createMapItem(newMapName, groupNum, numMapsInGroup);