From 5624de750b3fc0838107972b5b44543c65343b0f Mon Sep 17 00:00:00 2001 From: BigBahss Date: Tue, 15 Sep 2020 14:57:46 -0400 Subject: [PATCH 1/7] Save & restore tileset editor geometry & state from config --- include/config.h | 12 +++++++---- src/config.cpp | 45 +++++++++++++++++++++++++++++----------- src/mainwindow.cpp | 15 ++++++++------ src/ui/tileseteditor.cpp | 5 +++++ 4 files changed, 55 insertions(+), 22 deletions(-) diff --git a/include/config.h b/include/config.h index 4bd21cfe..e9aa6943 100644 --- a/include/config.h +++ b/include/config.h @@ -50,7 +50,8 @@ public: void setRecentMap(QString map); void setMapSortOrder(MapSortOrder order); void setPrettyCursors(bool enabled); - void setGeometry(QByteArray, QByteArray, QByteArray, QByteArray); + void setMainGeometry(QByteArray, QByteArray, QByteArray, QByteArray); + void setTilesetEditorGeometry(QByteArray, QByteArray); void setCollisionOpacity(int opacity); void setMetatilesZoom(int zoom); void setShowPlayerView(bool enabled); @@ -62,7 +63,8 @@ public: QString getRecentMap(); MapSortOrder getMapSortOrder(); bool getPrettyCursors(); - QMap getGeometry(); + QMap getMainGeometry(); + QMap getTilesetEditorGeometry(); int getCollisionOpacity(); int getMetatilesZoom(); bool getShowPlayerView(); @@ -83,11 +85,13 @@ private: QByteArray bytesFromString(QString); MapSortOrder mapSortOrder; bool prettyCursors; - QByteArray windowGeometry; - QByteArray windowState; + QByteArray mainWindowGeometry; + QByteArray mainWindowState; QByteArray mapSplitterState; QByteArray eventsSlpitterState; QByteArray mainSplitterState; + QByteArray tilesetEditorGeometry; + QByteArray tilesetEditorState; int collisionOpacity; int metatilesZoom; bool showPlayerView; diff --git a/src/config.cpp b/src/config.cpp index 8934f707..f12c3789 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -122,10 +122,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) { this->mapSortOrder = MapSortOrder::Group; logWarn(QString("Invalid config value for map_sort_order: '%1'. Must be 'group', 'area', or 'layout'.").arg(value)); } - } else if (key == "window_geometry") { - this->windowGeometry = bytesFromString(value); - } else if (key == "window_state") { - this->windowState = bytesFromString(value); + } else if (key == "main_window_geometry") { + this->mainWindowGeometry = bytesFromString(value); + } else if (key == "main_window_state") { + this->mainWindowState = bytesFromString(value); } else if (key == "map_splitter_state") { this->mapSplitterState = bytesFromString(value); } else if (key == "main_splitter_state") { @@ -137,6 +137,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) { logWarn(QString("Invalid config value for collision_opacity: '%1'. Must be an integer.").arg(value)); this->collisionOpacity = 50; } + } else if (key == "tileset_editor_geometry") { + this->tilesetEditorGeometry = bytesFromString(value); + } else if (key == "tileset_editor_state") { + this->tilesetEditorState = bytesFromString(value); } else if (key == "metatiles_zoom") { bool ok; this->metatilesZoom = qMax(10, qMin(100, value.toInt(&ok))); @@ -186,10 +190,12 @@ QMap PorymapConfig::getKeyValueMap() { map.insert("recent_map", this->recentMap); map.insert("pretty_cursors", this->prettyCursors ? "1" : "0"); map.insert("map_sort_order", mapSortOrderMap.value(this->mapSortOrder)); - map.insert("window_geometry", stringFromByteArray(this->windowGeometry)); - map.insert("window_state", stringFromByteArray(this->windowState)); + map.insert("main_window_geometry", stringFromByteArray(this->mainWindowGeometry)); + map.insert("main_window_state", stringFromByteArray(this->mainWindowState)); map.insert("map_splitter_state", stringFromByteArray(this->mapSplitterState)); map.insert("main_splitter_state", stringFromByteArray(this->mainSplitterState)); + map.insert("tileset_editor_geometry", stringFromByteArray(this->tilesetEditorGeometry)); + map.insert("tileset_editor_state", stringFromByteArray(this->tilesetEditorState)); map.insert("collision_opacity", QString("%1").arg(this->collisionOpacity)); map.insert("metatiles_zoom", QString("%1").arg(this->metatilesZoom)); map.insert("show_player_view", this->showPlayerView ? "1" : "0"); @@ -243,15 +249,21 @@ void PorymapConfig::setMonitorFiles(bool monitor) { this->save(); } -void PorymapConfig::setGeometry(QByteArray windowGeometry_, QByteArray windowState_, +void PorymapConfig::setMainGeometry(QByteArray mainWindowGeometry_, QByteArray mainWindowState_, QByteArray mapSplitterState_, QByteArray mainSplitterState_) { - this->windowGeometry = windowGeometry_; - this->windowState = windowState_; + this->mainWindowGeometry = mainWindowGeometry_; + this->mainWindowState = mainWindowState_; this->mapSplitterState = mapSplitterState_; this->mainSplitterState = mainSplitterState_; this->save(); } +void PorymapConfig::setTilesetEditorGeometry(QByteArray tilesetEditorGeometry_, QByteArray tilesetEditorState_) { + this->tilesetEditorGeometry = tilesetEditorGeometry_; + this->tilesetEditorState = tilesetEditorState_; + this->save(); +} + void PorymapConfig::setCollisionOpacity(int opacity) { this->collisionOpacity = opacity; // don't auto-save here because this can be called very frequently. @@ -296,17 +308,26 @@ bool PorymapConfig::getPrettyCursors() { return this->prettyCursors; } -QMap PorymapConfig::getGeometry() { +QMap PorymapConfig::getMainGeometry() { QMap geometry; - geometry.insert("window_geometry", this->windowGeometry); - geometry.insert("window_state", this->windowState); + geometry.insert("main_window_geometry", this->mainWindowGeometry); + geometry.insert("main_window_state", this->mainWindowState); geometry.insert("map_splitter_state", this->mapSplitterState); geometry.insert("main_splitter_state", this->mainSplitterState); return geometry; } +QMap PorymapConfig::getTilesetEditorGeometry() { + QMap geometry; + + geometry.insert("tileset_editor_geometry", this->tilesetEditorGeometry); + geometry.insert("tileset_editor_state", this->tilesetEditorState); + + return geometry; +} + int PorymapConfig::getCollisionOpacity() { return this->collisionOpacity; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e2ae8bdb..4738d004 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -350,10 +350,10 @@ void MainWindow::loadUserSettings() { } void MainWindow::restoreWindowState() { - logInfo("Restoring window geometry from previous session."); - QMap geometry = porymapConfig.getGeometry(); - this->restoreGeometry(geometry.value("window_geometry")); - this->restoreState(geometry.value("window_state")); + logInfo("Restoring main window geometry from previous session."); + QMap geometry = porymapConfig.getMainGeometry(); + this->restoreGeometry(geometry.value("main_window_geometry")); + this->restoreState(geometry.value("main_window_state")); this->ui->splitter_map->restoreState(geometry.value("map_splitter_state")); this->ui->splitter_main->restoreState(geometry.value("main_splitter_state")); } @@ -2518,7 +2518,10 @@ void MainWindow::on_actionTileset_Editor_triggered() this->tilesetEditor = new TilesetEditor(this->editor->project, this->editor->map, this); connect(this->tilesetEditor, SIGNAL(tilesetsSaved(QString, QString)), this, SLOT(onTilesetsSaved(QString, QString))); connect(this->tilesetEditor, &QObject::destroyed, [=](QObject *) { this->tilesetEditor = nullptr; }); - this->tilesetEditor->setAttribute(Qt::WA_DeleteOnClose); + logInfo("Restoring tileset editor geometry from previous session."); + QMap geometry = porymapConfig.getTilesetEditorGeometry(); + this->tilesetEditor->restoreGeometry(geometry.value("tileset_editor_geometry")); + this->tilesetEditor->restoreState(geometry.value("tileset_editor_state")); } if (!this->tilesetEditor->isVisible()) { @@ -2697,7 +2700,7 @@ void MainWindow::closeEvent(QCloseEvent *event) { } } - porymapConfig.setGeometry( + porymapConfig.setMainGeometry( this->saveGeometry(), this->saveState(), this->ui->splitter_map->saveState(), diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index 75a60b9a..de095a80 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -606,6 +606,11 @@ void TilesetEditor::closeEvent(QCloseEvent *event) } else { event->accept(); } + + porymapConfig.setTilesetEditorGeometry( + this->saveGeometry(), + this->saveState() + ); } void TilesetEditor::on_actionChange_Metatiles_Count_triggered() From daae6fe52bb414a5d91979a782bb8c9525f16d08 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Tue, 15 Sep 2020 19:03:15 -0400 Subject: [PATCH 2/7] Save & restore region map editor geometry & state from config --- include/config.h | 4 ++++ src/config.cpp | 21 +++++++++++++++++++++ src/mainwindow.cpp | 5 ++++- src/ui/regionmapeditor.cpp | 5 +++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index e9aa6943..54f592ea 100644 --- a/include/config.h +++ b/include/config.h @@ -52,6 +52,7 @@ public: void setPrettyCursors(bool enabled); void setMainGeometry(QByteArray, QByteArray, QByteArray, QByteArray); void setTilesetEditorGeometry(QByteArray, QByteArray); + void setRegionMapEditorGeometry(QByteArray, QByteArray); void setCollisionOpacity(int opacity); void setMetatilesZoom(int zoom); void setShowPlayerView(bool enabled); @@ -65,6 +66,7 @@ public: bool getPrettyCursors(); QMap getMainGeometry(); QMap getTilesetEditorGeometry(); + QMap getRegionMapEditorGeometry(); int getCollisionOpacity(); int getMetatilesZoom(); bool getShowPlayerView(); @@ -92,6 +94,8 @@ private: QByteArray mainSplitterState; QByteArray tilesetEditorGeometry; QByteArray tilesetEditorState; + QByteArray regionMapEditorGeometry; + QByteArray regionMapEditorState; int collisionOpacity; int metatilesZoom; bool showPlayerView; diff --git a/src/config.cpp b/src/config.cpp index f12c3789..349cb0e2 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -141,6 +141,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) { this->tilesetEditorGeometry = bytesFromString(value); } else if (key == "tileset_editor_state") { this->tilesetEditorState = bytesFromString(value); + } else if (key == "region_map_editor_geometry") { + this->regionMapEditorGeometry = bytesFromString(value); + } else if (key == "region_map_editor_state") { + this->regionMapEditorState = bytesFromString(value); } else if (key == "metatiles_zoom") { bool ok; this->metatilesZoom = qMax(10, qMin(100, value.toInt(&ok))); @@ -196,6 +200,8 @@ QMap PorymapConfig::getKeyValueMap() { map.insert("main_splitter_state", stringFromByteArray(this->mainSplitterState)); map.insert("tileset_editor_geometry", stringFromByteArray(this->tilesetEditorGeometry)); map.insert("tileset_editor_state", stringFromByteArray(this->tilesetEditorState)); + map.insert("region_map_editor_geometry", stringFromByteArray(this->regionMapEditorGeometry)); + map.insert("region_map_editor_state", stringFromByteArray(this->regionMapEditorState)); map.insert("collision_opacity", QString("%1").arg(this->collisionOpacity)); map.insert("metatiles_zoom", QString("%1").arg(this->metatilesZoom)); map.insert("show_player_view", this->showPlayerView ? "1" : "0"); @@ -264,6 +270,12 @@ void PorymapConfig::setTilesetEditorGeometry(QByteArray tilesetEditorGeometry_, this->save(); } +void PorymapConfig::setRegionMapEditorGeometry(QByteArray regionMapEditorGeometry_, QByteArray regionMapEditorState_) { + this->regionMapEditorGeometry = regionMapEditorGeometry_; + this->regionMapEditorState = regionMapEditorState_; + this->save(); +} + void PorymapConfig::setCollisionOpacity(int opacity) { this->collisionOpacity = opacity; // don't auto-save here because this can be called very frequently. @@ -328,6 +340,15 @@ QMap PorymapConfig::getTilesetEditorGeometry() { return geometry; } +QMap PorymapConfig::getRegionMapEditorGeometry() { + QMap geometry; + + geometry.insert("region_map_editor_geometry", this->regionMapEditorGeometry); + geometry.insert("region_map_editor_state", this->regionMapEditorState); + + return geometry; +} + int PorymapConfig::getCollisionOpacity() { return this->collisionOpacity; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4738d004..0e77fffc 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2661,7 +2661,10 @@ void MainWindow::on_actionRegion_Map_Editor_triggered() { return; } connect(this->regionMapEditor, &QObject::destroyed, [=](QObject *) { this->regionMapEditor = nullptr; }); - this->regionMapEditor->setAttribute(Qt::WA_DeleteOnClose); + logInfo("Restoring region map editor geometry from previous session."); + QMap geometry = porymapConfig.getRegionMapEditorGeometry(); + this->regionMapEditor->restoreGeometry(geometry.value("region_map_editor_geometry")); + this->regionMapEditor->restoreState(geometry.value("region_map_editor_state")); } if (!this->regionMapEditor->isVisible()) { diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp index 1ced19b6..b6d9030b 100644 --- a/src/ui/regionmapeditor.cpp +++ b/src/ui/regionmapeditor.cpp @@ -899,6 +899,11 @@ void RegionMapEditor::closeEvent(QCloseEvent *event) } else { event->accept(); } + + porymapConfig.setRegionMapEditorGeometry( + this->saveGeometry(), + this->saveState() + ); } void RegionMapEditor::on_verticalSlider_Zoom_Map_Image_valueChanged(int val) { From 8b7f4069cdab6c33a97b70a24cb671cdca4c6f37 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Tue, 15 Sep 2020 21:43:52 -0400 Subject: [PATCH 3/7] Save & restore palette editor geometry & state from config --- include/config.h | 4 ++++ include/ui/paletteeditor.h | 1 + src/config.cpp | 21 +++++++++++++++++++++ src/ui/paletteeditor.cpp | 10 +++++++++- src/ui/tileseteditor.cpp | 4 ++++ 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/include/config.h b/include/config.h index 54f592ea..008eeeb7 100644 --- a/include/config.h +++ b/include/config.h @@ -52,6 +52,7 @@ public: void setPrettyCursors(bool enabled); void setMainGeometry(QByteArray, QByteArray, QByteArray, QByteArray); void setTilesetEditorGeometry(QByteArray, QByteArray); + void setPaletteEditorGeometry(QByteArray, QByteArray); void setRegionMapEditorGeometry(QByteArray, QByteArray); void setCollisionOpacity(int opacity); void setMetatilesZoom(int zoom); @@ -66,6 +67,7 @@ public: bool getPrettyCursors(); QMap getMainGeometry(); QMap getTilesetEditorGeometry(); + QMap getPaletteEditorGeometry(); QMap getRegionMapEditorGeometry(); int getCollisionOpacity(); int getMetatilesZoom(); @@ -94,6 +96,8 @@ private: QByteArray mainSplitterState; QByteArray tilesetEditorGeometry; QByteArray tilesetEditorState; + QByteArray paletteEditorGeometry; + QByteArray paletteEditorState; QByteArray regionMapEditorGeometry; QByteArray regionMapEditorState; int collisionOpacity; diff --git a/include/ui/paletteeditor.h b/include/ui/paletteeditor.h index 9cd4da03..9bf58062 100644 --- a/include/ui/paletteeditor.h +++ b/include/ui/paletteeditor.h @@ -46,6 +46,7 @@ private: void setColor(int); void commitEditHistory(int paletteid); void setColorsFromHistory(PaletteHistoryItem*, int); + void closeEvent(QCloseEvent*); signals: void closed(); diff --git a/src/config.cpp b/src/config.cpp index 349cb0e2..3c9fe33d 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -141,6 +141,10 @@ void PorymapConfig::parseConfigKeyValue(QString key, QString value) { this->tilesetEditorGeometry = bytesFromString(value); } else if (key == "tileset_editor_state") { this->tilesetEditorState = bytesFromString(value); + } else if (key == "palette_editor_geometry") { + this->paletteEditorGeometry = bytesFromString(value); + } else if (key == "palette_editor_state") { + this->paletteEditorState = bytesFromString(value); } else if (key == "region_map_editor_geometry") { this->regionMapEditorGeometry = bytesFromString(value); } else if (key == "region_map_editor_state") { @@ -200,6 +204,8 @@ QMap PorymapConfig::getKeyValueMap() { map.insert("main_splitter_state", stringFromByteArray(this->mainSplitterState)); map.insert("tileset_editor_geometry", stringFromByteArray(this->tilesetEditorGeometry)); map.insert("tileset_editor_state", stringFromByteArray(this->tilesetEditorState)); + map.insert("palette_editor_geometry", stringFromByteArray(this->paletteEditorGeometry)); + map.insert("palette_editor_state", stringFromByteArray(this->paletteEditorState)); map.insert("region_map_editor_geometry", stringFromByteArray(this->regionMapEditorGeometry)); map.insert("region_map_editor_state", stringFromByteArray(this->regionMapEditorState)); map.insert("collision_opacity", QString("%1").arg(this->collisionOpacity)); @@ -270,6 +276,12 @@ void PorymapConfig::setTilesetEditorGeometry(QByteArray tilesetEditorGeometry_, this->save(); } +void PorymapConfig::setPaletteEditorGeometry(QByteArray paletteEditorGeometry_, QByteArray paletteEditorState_) { + this->paletteEditorGeometry = paletteEditorGeometry_; + this->paletteEditorState = paletteEditorState_; + this->save(); +} + void PorymapConfig::setRegionMapEditorGeometry(QByteArray regionMapEditorGeometry_, QByteArray regionMapEditorState_) { this->regionMapEditorGeometry = regionMapEditorGeometry_; this->regionMapEditorState = regionMapEditorState_; @@ -340,6 +352,15 @@ QMap PorymapConfig::getTilesetEditorGeometry() { return geometry; } +QMap PorymapConfig::getPaletteEditorGeometry() { + QMap geometry; + + geometry.insert("palette_editor_geometry", this->paletteEditorGeometry); + geometry.insert("palette_editor_state", this->paletteEditorState); + + return geometry; +} + QMap PorymapConfig::getRegionMapEditorGeometry() { QMap geometry; diff --git a/src/ui/paletteeditor.cpp b/src/ui/paletteeditor.cpp index fd9eeb9a..c24aad6a 100644 --- a/src/ui/paletteeditor.cpp +++ b/src/ui/paletteeditor.cpp @@ -1,9 +1,10 @@ #include "paletteeditor.h" #include "ui_paletteeditor.h" #include "paletteutil.h" +#include "config.h" +#include "log.h" #include #include -#include "log.h" PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset *secondaryTileset, int paletteId, QWidget *parent) : QMainWindow(parent), @@ -311,3 +312,10 @@ void PaletteEditor::on_actionImport_Palette_triggered() this->commitEditHistory(paletteId); emit this->changedPaletteColor(); } + +void PaletteEditor::closeEvent(QCloseEvent*) { + porymapConfig.setPaletteEditorGeometry( + this->saveGeometry(), + this->saveState() + ); +} diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index de095a80..580ad4cc 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -694,6 +694,10 @@ void TilesetEditor::on_actionChange_Palettes_triggered() this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this->paletteId, this); connect(this->paletteEditor, SIGNAL(changedPaletteColor()), this, SLOT(onPaletteEditorChangedPaletteColor())); connect(this->paletteEditor, SIGNAL(changedPalette(int)), this, SLOT(onPaletteEditorChangedPalette(int))); + logInfo("Restoring palette editor geometry from previous session."); + QMap geometry = porymapConfig.getPaletteEditorGeometry(); + this->paletteEditor->restoreGeometry(geometry.value("palette_editor_geometry")); + this->paletteEditor->restoreState(geometry.value("palette_editor_state")); } if (!this->paletteEditor->isVisible()) { From 81ad828a532bc46cb8219009c33691afc6012f86 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Tue, 15 Sep 2020 22:15:30 -0400 Subject: [PATCH 4/7] Fix palette editor windowTitle --- forms/paletteeditor.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/paletteeditor.ui b/forms/paletteeditor.ui index 03650e9f..b87b4398 100644 --- a/forms/paletteeditor.ui +++ b/forms/paletteeditor.ui @@ -14,7 +14,7 @@ Qt::ClickFocus - MainWindow + Palette Editor From 7cbdea4e26e04846f565b09086217bd876eeea0e Mon Sep 17 00:00:00 2001 From: BigBahss Date: Wed, 16 Sep 2020 04:08:17 -0400 Subject: [PATCH 5/7] Update CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aaeeef7..8f0d0d3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d - The New Map dialog now gives an option to specify the "Show Location Name" field. - Some new shortcuts were added in [porymap/#290](https://github.com/huderlem/porymap/pull/290). - All plain text boxes now have a clear button to delete the text. +- The window sizes and positions of the tileset editor, palette editor, and region map editor are now stored in `porymap.cfg`. ### Changed - Holding `shift` now toggles "Smart Path" drawing; when the "Smart Paths" checkbox is checked, holding `shift` will temporarily disable it. @@ -22,7 +23,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d ### Fixed - Fix a bug with the current metatile selection zoom. - Fix bug preventing the status bar from updating the current position while dragging events. -- Fix porymap icon not showing on window or panel on Linux +- Fix porymap icon not showing on window or panel on Linux. ## [4.3.1] - 2020-07-17 ### Added From e4095130c576acdc48d161875314213998be5af8 Mon Sep 17 00:00:00 2001 From: BigBahss Date: Fri, 25 Sep 2020 08:12:13 -0400 Subject: [PATCH 6/7] Fix closing tileset editor not closing palette editor --- include/ui/paletteeditor.h | 1 + include/ui/regionmapeditor.h | 1 + include/ui/tileseteditor.h | 9 +++++-- src/mainwindow.cpp | 15 ++++------- src/mainwindow_scriptapi.cpp | 2 +- src/ui/paletteeditor.cpp | 8 ++++++ src/ui/regionmapeditor.cpp | 8 ++++++ src/ui/tileseteditor.cpp | 52 +++++++++++++++++++++++++++--------- 8 files changed, 70 insertions(+), 26 deletions(-) diff --git a/include/ui/paletteeditor.h b/include/ui/paletteeditor.h index 9bf58062..2dbd6d29 100644 --- a/include/ui/paletteeditor.h +++ b/include/ui/paletteeditor.h @@ -45,6 +45,7 @@ private: void refreshColor(int); void setColor(int); void commitEditHistory(int paletteid); + void restoreWindowState(); void setColorsFromHistory(PaletteHistoryItem*, int); void closeEvent(QCloseEvent*); diff --git a/include/ui/regionmapeditor.h b/include/ui/regionmapeditor.h index a664df77..484103f3 100644 --- a/include/ui/regionmapeditor.h +++ b/include/ui/regionmapeditor.h @@ -97,6 +97,7 @@ private: bool createCityMap(QString name); bool tryInsertNewMapEntry(QString); + void restoreWindowState(); void closeEvent(QCloseEvent* event); private slots: diff --git a/include/ui/tileseteditor.h b/include/ui/tileseteditor.h index fde5a4be..a3aa4589 100644 --- a/include/ui/tileseteditor.h +++ b/include/ui/tileseteditor.h @@ -37,8 +37,9 @@ class TilesetEditor : public QMainWindow public: explicit TilesetEditor(Project*, Map*, QWidget *parent = nullptr); ~TilesetEditor(); - void setMap(Map*); - void setTilesets(QString, QString); + void update(Map *map, QString primaryTilsetLabel, QString secondaryTilesetLabel); + void updateMap(Map *map); + void updateTilesets(QString primaryTilsetLabel, QString secondaryTilesetLabel); bool selectMetatile(uint16_t metatileId); private slots: @@ -98,6 +99,9 @@ private: void initTileSelector(); void initSelectedTileItem(); void initMetatileLayersItem(); + void restoreWindowState(); + void setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel); + void reset(); void drawSelectedTiles(); void importTilesetTiles(Tileset*, bool); void importTilesetMetatiles(Tileset*, bool); @@ -110,6 +114,7 @@ private: MetatileLayersItem *metatileLayersItem = nullptr; PaletteEditor *paletteEditor = nullptr; Project *project = nullptr; + Map *map = nullptr; Metatile *metatile = nullptr; int paletteId; bool tileXFlip; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0e77fffc..8ef1e5af 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1206,8 +1206,11 @@ void MainWindow::on_actionNew_Tileset_triggered() { void MainWindow::updateTilesetEditor() { if (this->tilesetEditor) { - this->tilesetEditor->setMap(this->editor->map); - this->tilesetEditor->setTilesets(editor->ui->comboBox_PrimaryTileset->currentText(), editor->ui->comboBox_SecondaryTileset->currentText()); + this->tilesetEditor->update( + this->editor->map, + editor->ui->comboBox_PrimaryTileset->currentText(), + editor->ui->comboBox_SecondaryTileset->currentText() + ); } } @@ -2518,10 +2521,6 @@ void MainWindow::on_actionTileset_Editor_triggered() this->tilesetEditor = new TilesetEditor(this->editor->project, this->editor->map, this); connect(this->tilesetEditor, SIGNAL(tilesetsSaved(QString, QString)), this, SLOT(onTilesetsSaved(QString, QString))); connect(this->tilesetEditor, &QObject::destroyed, [=](QObject *) { this->tilesetEditor = nullptr; }); - logInfo("Restoring tileset editor geometry from previous session."); - QMap geometry = porymapConfig.getTilesetEditorGeometry(); - this->tilesetEditor->restoreGeometry(geometry.value("tileset_editor_geometry")); - this->tilesetEditor->restoreState(geometry.value("tileset_editor_state")); } if (!this->tilesetEditor->isVisible()) { @@ -2661,10 +2660,6 @@ void MainWindow::on_actionRegion_Map_Editor_triggered() { return; } connect(this->regionMapEditor, &QObject::destroyed, [=](QObject *) { this->regionMapEditor = nullptr; }); - logInfo("Restoring region map editor geometry from previous session."); - QMap geometry = porymapConfig.getRegionMapEditorGeometry(); - this->regionMapEditor->restoreGeometry(geometry.value("region_map_editor_geometry")); - this->regionMapEditor->restoreState(geometry.value("region_map_editor_state")); } if (!this->regionMapEditor->isVisible()) { diff --git a/src/mainwindow_scriptapi.cpp b/src/mainwindow_scriptapi.cpp index cc89fc0b..b60ba820 100644 --- a/src/mainwindow_scriptapi.cpp +++ b/src/mainwindow_scriptapi.cpp @@ -247,7 +247,7 @@ void MainWindow::addImage(int x, int y, QString filepath) { void MainWindow::refreshAfterPaletteChange(Tileset *tileset) { if (this->tilesetEditor) { - this->tilesetEditor->setTilesets(this->editor->map->layout->tileset_primary_label, this->editor->map->layout->tileset_secondary_label); + this->tilesetEditor->updateTilesets(this->editor->map->layout->tileset_primary_label, this->editor->map->layout->tileset_secondary_label); } this->editor->metatile_selector_item->draw(); this->editor->selected_border_metatiles_item->draw(); diff --git a/src/ui/paletteeditor.cpp b/src/ui/paletteeditor.cpp index c24aad6a..0e1366e6 100644 --- a/src/ui/paletteeditor.cpp +++ b/src/ui/paletteeditor.cpp @@ -113,6 +113,7 @@ PaletteEditor::PaletteEditor(Project *project, Tileset *primaryTileset, Tileset this->initColorSliders(); this->setPaletteId(paletteId); this->commitEditHistory(this->ui->spinBox_PaletteId->value()); + this->restoreWindowState(); } PaletteEditor::~PaletteEditor() @@ -228,6 +229,13 @@ void PaletteEditor::commitEditHistory(int paletteId) { this->palettesHistory[paletteId].push(commit); } +void PaletteEditor::restoreWindowState() { + logInfo("Restoring palette editor geometry from previous session."); + QMap geometry = porymapConfig.getPaletteEditorGeometry(); + this->restoreGeometry(geometry.value("palette_editor_geometry")); + this->restoreState(geometry.value("palette_editor_state")); +} + void PaletteEditor::on_actionUndo_triggered() { int paletteId = this->ui->spinBox_PaletteId->value(); diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp index b6d9030b..ce3440dd 100644 --- a/src/ui/regionmapeditor.cpp +++ b/src/ui/regionmapeditor.cpp @@ -24,6 +24,7 @@ RegionMapEditor::RegionMapEditor(QWidget *parent, Project *project_) : this->project = project_; this->region_map = new RegionMap; this->ui->action_RegionMap_Resize->setVisible(false); + this->restoreWindowState(); } RegionMapEditor::~RegionMapEditor() @@ -42,6 +43,13 @@ RegionMapEditor::~RegionMapEditor() delete scene_region_map_tiles; } +void RegionMapEditor::restoreWindowState() { + logInfo("Restoring region map editor geometry from previous session."); + QMap geometry = porymapConfig.getRegionMapEditorGeometry(); + this->restoreGeometry(geometry.value("region_map_editor_geometry")); + this->restoreState(geometry.value("region_map_editor_state")); +} + void RegionMapEditor::on_action_RegionMap_Save_triggered() { setCurrentSquareOptions(); if (project && region_map) { diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index 580ad4cc..af5da658 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -100,6 +100,7 @@ void TilesetEditor::init(Project *project, Map *map) { this->initTileSelector(); this->initSelectedTileItem(); this->metatileSelector->select(0); + this->restoreWindowState(); MetatileHistoryItem *commit = new MetatileHistoryItem(0, nullptr, this->metatile->copy()); metatileHistory.push(commit); @@ -113,11 +114,17 @@ bool TilesetEditor::selectMetatile(uint16_t metatileId) { return true; } -void TilesetEditor::setMap(Map *map) { +void TilesetEditor::update(Map *map, QString primaryTilesetLabel, QString secondaryTilesetLabel) { + this->updateMap(map); + this->updateTilesets(primaryTilesetLabel, secondaryTilesetLabel); +} + +void TilesetEditor::updateMap(Map *map) { + this->map = map; this->metatileSelector->map = map; } -void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) { +void TilesetEditor::updateTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) { if (this->hasUnsavedChanges) { QMessageBox::StandardButton result = QMessageBox::question( this, @@ -129,13 +136,17 @@ void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTi this->on_actionSave_Tileset_triggered(); } this->hasUnsavedChanges = false; - delete this->primaryTileset; - delete this->secondaryTileset; + this->setTilesets(primaryTilesetLabel, secondaryTilesetLabel); + this->refresh(); +} + +void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) { Tileset *primaryTileset = project->getTileset(primaryTilesetLabel); Tileset *secondaryTileset = project->getTileset(secondaryTilesetLabel); + if (this->primaryTileset) delete this->primaryTileset; + if (this->secondaryTileset) delete this->secondaryTileset; this->primaryTileset = primaryTileset->copy(); this->secondaryTileset = secondaryTileset->copy(); - this->refresh(); } void TilesetEditor::refresh() { @@ -196,6 +207,21 @@ void TilesetEditor::initSelectedTileItem() { this->ui->graphicsView_selectedTile->setFixedSize(this->selectedTilePixmapItem->pixmap().width() + 2, this->selectedTilePixmapItem->pixmap().height() + 2); } +void TilesetEditor::restoreWindowState() { + logInfo("Restoring tileset editor geometry from previous session."); + QMap geometry = porymapConfig.getTilesetEditorGeometry(); + this->restoreGeometry(geometry.value("tileset_editor_geometry")); + this->restoreState(geometry.value("tileset_editor_state")); +} + +void TilesetEditor::reset() { + this->hasUnsavedChanges = false; + this->setTilesets(this->primaryTileset->name, this->secondaryTileset->name); + if (this->paletteEditor) + this->paletteEditor->setTilesets(this->primaryTileset, this->secondaryTileset); + this->refresh(); +} + void TilesetEditor::drawSelectedTiles() { if (!this->selectedTileScene) { return; @@ -599,6 +625,7 @@ void TilesetEditor::closeEvent(QCloseEvent *event) this->on_actionSave_Tileset_triggered(); event->accept(); } else if (result == QMessageBox::No) { + this->reset(); event->accept(); } else if (result == QMessageBox::Cancel) { event->ignore(); @@ -607,10 +634,13 @@ void TilesetEditor::closeEvent(QCloseEvent *event) event->accept(); } - porymapConfig.setTilesetEditorGeometry( - this->saveGeometry(), - this->saveState() - ); + if (event->isAccepted()) { + if (this->paletteEditor) this->paletteEditor->close(); + porymapConfig.setTilesetEditorGeometry( + this->saveGeometry(), + this->saveState() + ); + } } void TilesetEditor::on_actionChange_Metatiles_Count_triggered() @@ -694,10 +724,6 @@ void TilesetEditor::on_actionChange_Palettes_triggered() this->paletteEditor = new PaletteEditor(this->project, this->primaryTileset, this->secondaryTileset, this->paletteId, this); connect(this->paletteEditor, SIGNAL(changedPaletteColor()), this, SLOT(onPaletteEditorChangedPaletteColor())); connect(this->paletteEditor, SIGNAL(changedPalette(int)), this, SLOT(onPaletteEditorChangedPalette(int))); - logInfo("Restoring palette editor geometry from previous session."); - QMap geometry = porymapConfig.getPaletteEditorGeometry(); - this->paletteEditor->restoreGeometry(geometry.value("palette_editor_geometry")); - this->paletteEditor->restoreState(geometry.value("palette_editor_state")); } if (!this->paletteEditor->isVisible()) { From f47e8b1903b71251083bf62559adfb6048b0546d Mon Sep 17 00:00:00 2001 From: BigBahss Date: Fri, 25 Sep 2020 08:20:51 -0400 Subject: [PATCH 7/7] Refactor TilesetEditor --- include/ui/tileseteditor.h | 11 +- src/ui/tileseteditor.cpp | 220 +++++++++++++++++++------------------ 2 files changed, 122 insertions(+), 109 deletions(-) diff --git a/include/ui/tileseteditor.h b/include/ui/tileseteditor.h index a3aa4589..283f9cde 100644 --- a/include/ui/tileseteditor.h +++ b/include/ui/tileseteditor.h @@ -93,13 +93,17 @@ private slots: void on_actionImport_Secondary_Metatiles_triggered(); private: - void init(Project*, Map*); - void closeEvent(QCloseEvent*); - void initMetatileSelector(Map*); + void initUi(); + void setMetatileBehaviors(); + void setMetatileLayersUi(); + void setVersionSpecificUi(); + void setMetatileLabelValidator(); + void initMetatileSelector(); void initTileSelector(); void initSelectedTileItem(); void initMetatileLayersItem(); void restoreWindowState(); + void initMetatileHistory(); void setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel); void reset(); void drawSelectedTiles(); @@ -107,6 +111,7 @@ private: void importTilesetMetatiles(Tileset*, bool); void refresh(); void saveMetatileLabel(); + void closeEvent(QCloseEvent*); Ui::TilesetEditor *ui; History metatileHistory; TilesetEditorMetatileSelector *metatileSelector = nullptr; diff --git a/src/ui/tileseteditor.cpp b/src/ui/tileseteditor.cpp index af5da658..950b8d46 100644 --- a/src/ui/tileseteditor.cpp +++ b/src/ui/tileseteditor.cpp @@ -14,10 +14,14 @@ TilesetEditor::TilesetEditor(Project *project, Map *map, QWidget *parent) : QMainWindow(parent), - ui(new Ui::TilesetEditor) + ui(new Ui::TilesetEditor), + project(project), + map(map), + hasUnsavedChanges(false) { - this->init(project, map); - new QShortcut(QKeySequence("Ctrl+Shift+Z"), this, SLOT(on_actionRedo_triggered())); + this->setTilesets(this->map->layout->tileset_primary_label, this->map->layout->tileset_secondary_label); + this->initUi(); + this->initMetatileHistory(); } TilesetEditor::~TilesetEditor() @@ -37,83 +41,6 @@ TilesetEditor::~TilesetEditor() delete metatileLayersScene; } -void TilesetEditor::init(Project *project, Map *map) { - ui->setupUi(this); - this->project = project; - - this->hasUnsavedChanges = false; - this->tileXFlip = ui->checkBox_xFlip->isChecked(); - this->tileYFlip = ui->checkBox_yFlip->isChecked(); - this->paletteId = ui->spinBox_paletteSelector->value(); - - Tileset *primaryTileset = project->getTileset(map->layout->tileset_primary_label); - Tileset *secondaryTileset = project->getTileset(map->layout->tileset_secondary_label); - if (this->primaryTileset) delete this->primaryTileset; - if (this->secondaryTileset) delete this->secondaryTileset; - this->primaryTileset = primaryTileset->copy(); - this->secondaryTileset = secondaryTileset->copy(); - - QList sortedBehaviors; - for (int num : project->metatileBehaviorMapInverse.keys()) { - this->ui->comboBox_metatileBehaviors->addItem(project->metatileBehaviorMapInverse[num], num); - } - - if (!projectConfig.getTripleLayerMetatilesEnabled()) { - this->ui->comboBox_layerType->addItem("Normal - Middle/Top", 0); - this->ui->comboBox_layerType->addItem("Covered - Bottom/Middle", 1); - this->ui->comboBox_layerType->addItem("Split - Bottom/Top", 2); - } else { - this->ui->comboBox_layerType->setVisible(false); - this->ui->label_layerType->setVisible(false); - this->ui->label_BottomTop->setText("Bottom/Middle/Top"); - } - - this->ui->spinBox_paletteSelector->setMinimum(0); - this->ui->spinBox_paletteSelector->setMaximum(Project::getNumPalettesTotal() - 1); - - if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) { - this->ui->comboBox_encounterType->setVisible(true); - this->ui->label_encounterType->setVisible(true); - this->ui->comboBox_encounterType->addItem("None", 0); - this->ui->comboBox_encounterType->addItem("Land", 1); - this->ui->comboBox_encounterType->addItem("Water", 2); - this->ui->comboBox_terrainType->setVisible(true); - this->ui->label_terrainType->setVisible(true); - this->ui->comboBox_terrainType->addItem("Normal", 0); - this->ui->comboBox_terrainType->addItem("Grass", 1); - this->ui->comboBox_terrainType->addItem("Water", 2); - this->ui->comboBox_terrainType->addItem("Waterfall", 3); - } else { - this->ui->comboBox_encounterType->setVisible(false); - this->ui->label_encounterType->setVisible(false); - this->ui->comboBox_terrainType->setVisible(false); - this->ui->label_terrainType->setVisible(false); - } - - //only allow characters valid for a symbol - QRegExp expression("[_A-Za-z0-9]*$"); - QRegExpValidator *validator = new QRegExpValidator(expression); - this->ui->lineEdit_metatileLabel->setValidator(validator); - - this->initMetatileSelector(map); - this->initMetatileLayersItem(); - this->initTileSelector(); - this->initSelectedTileItem(); - this->metatileSelector->select(0); - this->restoreWindowState(); - - MetatileHistoryItem *commit = new MetatileHistoryItem(0, nullptr, this->metatile->copy()); - metatileHistory.push(commit); -} - -bool TilesetEditor::selectMetatile(uint16_t metatileId) { - if (!Tileset::metatileIsValid(metatileId, this->primaryTileset, this->secondaryTileset)) return false; - this->metatileSelector->select(metatileId); - QPoint pos = this->metatileSelector->getMetatileIdCoordsOnWidget(metatileId); - this->ui->scrollArea_Metatiles->ensureVisible(pos.x(), pos.y()); - return true; -} - void TilesetEditor::update(Map *map, QString primaryTilesetLabel, QString secondaryTilesetLabel) { this->updateMap(map); this->updateTilesets(primaryTilesetLabel, secondaryTilesetLabel); @@ -140,6 +67,14 @@ void TilesetEditor::updateTilesets(QString primaryTilesetLabel, QString secondar this->refresh(); } +bool TilesetEditor::selectMetatile(uint16_t metatileId) { + if (!Tileset::metatileIsValid(metatileId, this->primaryTileset, this->secondaryTileset)) return false; + this->metatileSelector->select(metatileId); + QPoint pos = this->metatileSelector->getMetatileIdCoordsOnWidget(metatileId); + this->ui->scrollArea_Metatiles->ensureVisible(pos.x(), pos.y()); + return true; +} + void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTilesetLabel) { Tileset *primaryTileset = project->getTileset(primaryTilesetLabel); Tileset *secondaryTileset = project->getTileset(secondaryTilesetLabel); @@ -149,23 +84,77 @@ void TilesetEditor::setTilesets(QString primaryTilesetLabel, QString secondaryTi this->secondaryTileset = secondaryTileset->copy(); } -void TilesetEditor::refresh() { - this->metatileLayersItem->setTilesets(this->primaryTileset, this->secondaryTileset); - this->tileSelector->setTilesets(this->primaryTileset, this->secondaryTileset); - this->metatileSelector->setTilesets(this->primaryTileset, this->secondaryTileset); - this->metatileSelector->select(this->metatileSelector->getSelectedMetatile()); - this->drawSelectedTiles(); +void TilesetEditor::initUi() { + ui->setupUi(this); + new QShortcut(QKeySequence("Ctrl+Shift+Z"), this, SLOT(on_actionRedo_triggered())); + this->tileXFlip = ui->checkBox_xFlip->isChecked(); + this->tileYFlip = ui->checkBox_yFlip->isChecked(); + this->paletteId = ui->spinBox_paletteSelector->value(); + this->ui->spinBox_paletteSelector->setMinimum(0); + this->ui->spinBox_paletteSelector->setMaximum(Project::getNumPalettesTotal() - 1); - this->ui->graphicsView_Tiles->setSceneRect(0, 0, this->tileSelector->pixmap().width() + 2, this->tileSelector->pixmap().height() + 2); - this->ui->graphicsView_Tiles->setFixedSize(this->tileSelector->pixmap().width() + 2, this->tileSelector->pixmap().height() + 2); - this->ui->graphicsView_Metatiles->setSceneRect(0, 0, this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2); - this->ui->graphicsView_Metatiles->setFixedSize(this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2); - this->ui->graphicsView_selectedTile->setFixedSize(this->selectedTilePixmapItem->pixmap().width() + 2, this->selectedTilePixmapItem->pixmap().height() + 2); + this->setMetatileBehaviors(); + this->setMetatileLayersUi(); + this->setVersionSpecificUi(); + this->setMetatileLabelValidator(); + + this->initMetatileSelector(); + this->initMetatileLayersItem(); + this->initTileSelector(); + this->initSelectedTileItem(); + this->metatileSelector->select(0); + this->restoreWindowState(); } -void TilesetEditor::initMetatileSelector(Map *map) +void TilesetEditor::setMetatileBehaviors() { + for (int num : project->metatileBehaviorMapInverse.keys()) { + this->ui->comboBox_metatileBehaviors->addItem(project->metatileBehaviorMapInverse[num], num); + } +} + +void TilesetEditor::setMetatileLayersUi() { + if (!projectConfig.getTripleLayerMetatilesEnabled()) { + this->ui->comboBox_layerType->addItem("Normal - Middle/Top", 0); + this->ui->comboBox_layerType->addItem("Covered - Bottom/Middle", 1); + this->ui->comboBox_layerType->addItem("Split - Bottom/Top", 2); + } else { + this->ui->comboBox_layerType->setVisible(false); + this->ui->label_layerType->setVisible(false); + this->ui->label_BottomTop->setText("Bottom/Middle/Top"); + } +} + +void TilesetEditor::setVersionSpecificUi() { + if (projectConfig.getBaseGameVersion() == BaseGameVersion::pokefirered) { + this->ui->comboBox_encounterType->setVisible(true); + this->ui->label_encounterType->setVisible(true); + this->ui->comboBox_encounterType->addItem("None", 0); + this->ui->comboBox_encounterType->addItem("Land", 1); + this->ui->comboBox_encounterType->addItem("Water", 2); + this->ui->comboBox_terrainType->setVisible(true); + this->ui->label_terrainType->setVisible(true); + this->ui->comboBox_terrainType->addItem("Normal", 0); + this->ui->comboBox_terrainType->addItem("Grass", 1); + this->ui->comboBox_terrainType->addItem("Water", 2); + this->ui->comboBox_terrainType->addItem("Waterfall", 3); + } else { + this->ui->comboBox_encounterType->setVisible(false); + this->ui->label_encounterType->setVisible(false); + this->ui->comboBox_terrainType->setVisible(false); + this->ui->label_terrainType->setVisible(false); + } +} + +void TilesetEditor::setMetatileLabelValidator() { + //only allow characters valid for a symbol + QRegExp expression("[_A-Za-z0-9]*$"); + QRegExpValidator *validator = new QRegExpValidator(expression); + this->ui->lineEdit_metatileLabel->setValidator(validator); +} + +void TilesetEditor::initMetatileSelector() { - this->metatileSelector = new TilesetEditorMetatileSelector(this->primaryTileset, this->secondaryTileset, map); + this->metatileSelector = new TilesetEditorMetatileSelector(this->primaryTileset, this->secondaryTileset, this->map); connect(this->metatileSelector, SIGNAL(hoveredMetatileChanged(uint16_t)), this, SLOT(onHoveredMetatileChanged(uint16_t))); connect(this->metatileSelector, SIGNAL(hoveredMetatileCleared()), @@ -181,6 +170,19 @@ void TilesetEditor::initMetatileSelector(Map *map) this->ui->graphicsView_Metatiles->setFixedSize(this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2); } +void TilesetEditor::initMetatileLayersItem() { + Metatile *metatile = Tileset::getMetatile(this->metatileSelector->getSelectedMetatile(), this->primaryTileset, this->secondaryTileset); + this->metatileLayersItem = new MetatileLayersItem(metatile, this->primaryTileset, this->secondaryTileset); + connect(this->metatileLayersItem, SIGNAL(tileChanged(int, int)), + this, SLOT(onMetatileLayerTileChanged(int, int))); + connect(this->metatileLayersItem, SIGNAL(selectedTilesChanged(QPoint, int, int)), + this, SLOT(onMetatileLayerSelectionChanged(QPoint, int, int))); + + this->metatileLayersScene = new QGraphicsScene; + this->metatileLayersScene->addItem(this->metatileLayersItem); + this->ui->graphicsView_metatileLayers->setScene(this->metatileLayersScene); +} + void TilesetEditor::initTileSelector() { this->tileSelector = new TilesetEditorTileSelector(this->primaryTileset, this->secondaryTileset, projectConfig.getTripleLayerMetatilesEnabled()); @@ -214,6 +216,11 @@ void TilesetEditor::restoreWindowState() { this->restoreState(geometry.value("tileset_editor_state")); } +void TilesetEditor::initMetatileHistory() { + MetatileHistoryItem *commit = new MetatileHistoryItem(0, nullptr, this->metatile->copy()); + metatileHistory.push(commit); +} + void TilesetEditor::reset() { this->hasUnsavedChanges = false; this->setTilesets(this->primaryTileset->name, this->secondaryTileset->name); @@ -222,6 +229,20 @@ void TilesetEditor::reset() { this->refresh(); } +void TilesetEditor::refresh() { + this->metatileLayersItem->setTilesets(this->primaryTileset, this->secondaryTileset); + this->tileSelector->setTilesets(this->primaryTileset, this->secondaryTileset); + this->metatileSelector->setTilesets(this->primaryTileset, this->secondaryTileset); + this->metatileSelector->select(this->metatileSelector->getSelectedMetatile()); + this->drawSelectedTiles(); + + this->ui->graphicsView_Tiles->setSceneRect(0, 0, this->tileSelector->pixmap().width() + 2, this->tileSelector->pixmap().height() + 2); + this->ui->graphicsView_Tiles->setFixedSize(this->tileSelector->pixmap().width() + 2, this->tileSelector->pixmap().height() + 2); + this->ui->graphicsView_Metatiles->setSceneRect(0, 0, this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2); + this->ui->graphicsView_Metatiles->setFixedSize(this->metatileSelector->pixmap().width() + 2, this->metatileSelector->pixmap().height() + 2); + this->ui->graphicsView_selectedTile->setFixedSize(this->selectedTilePixmapItem->pixmap().width() + 2, this->selectedTilePixmapItem->pixmap().height() + 2); +} + void TilesetEditor::drawSelectedTiles() { if (!this->selectedTileScene) { return; @@ -248,19 +269,6 @@ void TilesetEditor::drawSelectedTiles() { this->ui->graphicsView_selectedTile->setFixedSize(this->selectedTilePixmapItem->pixmap().width() + 2, this->selectedTilePixmapItem->pixmap().height() + 2); } -void TilesetEditor::initMetatileLayersItem() { - Metatile *metatile = Tileset::getMetatile(this->metatileSelector->getSelectedMetatile(), this->primaryTileset, this->secondaryTileset); - this->metatileLayersItem = new MetatileLayersItem(metatile, this->primaryTileset, this->secondaryTileset); - connect(this->metatileLayersItem, SIGNAL(tileChanged(int, int)), - this, SLOT(onMetatileLayerTileChanged(int, int))); - connect(this->metatileLayersItem, SIGNAL(selectedTilesChanged(QPoint, int, int)), - this, SLOT(onMetatileLayerSelectionChanged(QPoint, int, int))); - - this->metatileLayersScene = new QGraphicsScene; - this->metatileLayersScene->addItem(this->metatileLayersItem); - this->ui->graphicsView_metatileLayers->setScene(this->metatileLayersScene); -} - void TilesetEditor::onHoveredMetatileChanged(uint16_t metatileId) { Metatile *metatile = Tileset::getMetatile(metatileId, this->primaryTileset, this->secondaryTileset); QString message;