From b832e641b981269c0267c433faccbc5e550cd93b Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 16 Nov 2026 08:58:13 +0100 Subject: [PATCH] Implement recursive tree project structure and other smaller fixes --- QtGameMaker.pro | 4 + .../dialogs/actions/executecodedialog.cpp | 2 +- src/editor/dialogs/addeventdialog.cpp | 28 +- src/editor/dialogs/addeventdialog.h | 2 + .../dialogs/backgroundpropertiesdialog.cpp | 19 +- .../dialogs/backgroundpropertiesdialog.h | 4 +- src/editor/dialogs/codeeditordialog.cpp | 8 + src/editor/dialogs/codeeditordialog.h | 1 + src/editor/dialogs/fontpropertiesdialog.cpp | 15 +- src/editor/dialogs/fontpropertiesdialog.h | 4 +- src/editor/dialogs/objectpropertiesdialog.cpp | 101 ++- src/editor/dialogs/objectpropertiesdialog.h | 9 +- src/editor/dialogs/objectpropertiesdialog.ui | 10 +- src/editor/dialogs/pathpropertiesdialog.cpp | 39 +- src/editor/dialogs/pathpropertiesdialog.h | 7 +- src/editor/dialogs/projectchangesapplier.h | 8 + src/editor/dialogs/roompropertiesdialog.cpp | 45 +- src/editor/dialogs/roompropertiesdialog.h | 7 +- src/editor/dialogs/scriptpropertiesdialog.cpp | 13 +- src/editor/dialogs/scriptpropertiesdialog.h | 4 +- src/editor/dialogs/soundpropertiesdialog.cpp | 22 +- src/editor/dialogs/soundpropertiesdialog.h | 4 +- src/editor/dialogs/spritepropertiesdialog.cpp | 23 +- src/editor/dialogs/spritepropertiesdialog.h | 4 +- .../dialogs/timelinepropertiesdialog.cpp | 43 +- src/editor/dialogs/timelinepropertiesdialog.h | 6 +- src/editor/dialogs/triggersdialog.cpp | 1 - .../dialogs/userdefinedconstantsdialog.cpp | 1 - src/editor/mainwindow.cpp | 171 ++++- src/editor/mainwindow.h | 3 +- src/editor/mainwindow.ui | 2 +- src/editor/models/actionscontainermodel.cpp | 6 - src/editor/models/objecteventsmodel.cpp | 15 +- src/editor/models/projecttreemodel.cpp | 620 +++++++++++++----- src/editor/models/projecttreemodel.h | 17 +- src/editor/widgets/actiondragwidget.cpp | 3 +- src/editor/widgets/actionscontainerwidget.cpp | 1 - src/editor/widgets/draggabletreeview.cpp | 76 ++- src/editor/widgets/draggabletreeview.h | 6 + src/editor/widgets/drawingcanvaswidget.cpp | 2 - src/editor/widgets/objectselectorwidget.cpp | 75 ++- src/editor/widgets/objectselectorwidget.h | 7 +- src/editor/widgets/resourcemenuadapter.cpp | 236 +++++++ src/editor/widgets/resourcemenuadapter.h | 59 ++ src/projectcontainer.cpp | 43 +- src/projectcontainer.h | 25 +- src/projectserialization.cpp | 95 ++- src/resourcefolder.h | 232 +++++++ 48 files changed, 1666 insertions(+), 462 deletions(-) create mode 100644 src/editor/dialogs/projectchangesapplier.h create mode 100644 src/editor/widgets/resourcemenuadapter.cpp create mode 100644 src/editor/widgets/resourcemenuadapter.h create mode 100644 src/resourcefolder.h diff --git a/QtGameMaker.pro b/QtGameMaker.pro index 7aea98a..ed8dfd1 100644 --- a/QtGameMaker.pro +++ b/QtGameMaker.pro @@ -52,6 +52,7 @@ HEADERS += \ src/editor/widgets/qlineeditwithmenu.h \ src/editor/widgets/qscrollareawithmenu.h \ src/editor/widgets/roomeditwidget.h \ + src/editor/widgets/resourcemenuadapter.h \ src/editor/widgets/zoomablescrollarea.h \ src/engine/gameengine.h \ src/engine/glgamewindow.h \ @@ -60,12 +61,14 @@ HEADERS += \ src/engine/vulkangamewindow.h \ src/futurecpp.h \ src/projectcontainer.h \ + src/resourcefolder.h \ src/editor/imagehelpers.h \ src/editor/jshighlighter.h \ src/editor/mainwindow.h \ src/editor/dialogs/addeventdialog.h \ src/editor/dialogs/backgroundpropertiesdialog.h \ src/editor/dialogs/codeeditordialog.h \ + src/editor/dialogs/projectchangesapplier.h \ src/editor/dialogs/createspritedialog.h \ src/editor/dialogs/deletemomentsdialog.h \ src/editor/dialogs/editspritedialog.h \ @@ -131,6 +134,7 @@ SOURCES += \ src/editor/widgets/qlineeditwithmenu.cpp \ src/editor/widgets/qscrollareawithmenu.cpp \ src/editor/widgets/roomeditwidget.cpp \ + src/editor/widgets/resourcemenuadapter.cpp \ src/editor/widgets/zoomablescrollarea.cpp \ src/engine/gameengine.cpp \ src/engine/glgamewindow.cpp \ diff --git a/src/editor/dialogs/actions/executecodedialog.cpp b/src/editor/dialogs/actions/executecodedialog.cpp index c1e1ba9..d8348d4 100644 --- a/src/editor/dialogs/actions/executecodedialog.cpp +++ b/src/editor/dialogs/actions/executecodedialog.cpp @@ -73,7 +73,7 @@ void ExecuteCodeDialog::accept() m_action.appliesTo = AppliesToSelf{}; else if (m_radioButtonOther->isChecked()) m_action.appliesTo = AppliesToOther{}; - else if (m_radioButtonObject->isChecked()) + else if (m_radioButtonObject->isChecked() && !m_objectSelector->objectName().isEmpty()) m_action.appliesTo = AppliesToObject{ .objectName = m_objectSelector->objectName() }; else { diff --git a/src/editor/dialogs/addeventdialog.cpp b/src/editor/dialogs/addeventdialog.cpp index d088f09..c2d4059 100644 --- a/src/editor/dialogs/addeventdialog.cpp +++ b/src/editor/dialogs/addeventdialog.cpp @@ -5,6 +5,7 @@ #include #include "models/projecttreemodel.h" +#include "widgets/resourcemenuadapter.h" #include "mainwindow.h" #include "editorguiutils.h" #include "editorsettings.h" @@ -58,27 +59,14 @@ AddEventDialog::AddEventDialog(ProjectTreeModel &projectModel, MainWindow &mainW { auto menu = new QMenu; - connect(menu, &QMenu::aboutToShow, menu, [this,menu](){ - menu->clear(); - for (const Object &object : m_projectModel.project()->objects) - { - QIcon icon; - if (!object.spriteName.isEmpty()) - { - const auto &sprites = m_projectModel.project()->sprites; - const auto iter = std::find_if(std::cbegin(sprites), std::cend(sprites), - [&](const Sprite &sprite){ return sprite.name == object.spriteName; }); - if (iter != std::cend(sprites)) - { - if (!iter->pixmaps.empty()) - icon = iter->pixmaps.front(); - } + m_collisionMenuAdapter = std::make_unique( + m_projectModel, m_projectModel.rootFor(), *menu, + [this](const QModelIndex &index) { + if (const Object *object = m_projectModel.get(index)) { + m_eventType = object->name; + accept(); } - menu->addAction(icon, object.name, this, [this,&object](){ - m_eventType = object.name; accept(); - }); - } - }); + }); m_ui->pushButtonCollision->setMenu(menu); } diff --git a/src/editor/dialogs/addeventdialog.h b/src/editor/dialogs/addeventdialog.h index 49ec271..724d5f3 100644 --- a/src/editor/dialogs/addeventdialog.h +++ b/src/editor/dialogs/addeventdialog.h @@ -11,6 +11,7 @@ namespace Ui { class AddEventDialog; } class ProjectTreeModel; class MainWindow; +class ResourceMenuAdapter; class AddEventDialog : public QDialog { @@ -35,4 +36,5 @@ private: const std::unique_ptr m_ui; std::optional> m_eventType; + std::unique_ptr m_collisionMenuAdapter; }; diff --git a/src/editor/dialogs/backgroundpropertiesdialog.cpp b/src/editor/dialogs/backgroundpropertiesdialog.cpp index 33ee5ae..e0bb62e 100644 --- a/src/editor/dialogs/backgroundpropertiesdialog.cpp +++ b/src/editor/dialogs/backgroundpropertiesdialog.cpp @@ -61,24 +61,34 @@ void BackgroundPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool BackgroundPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_background.name != m_ui->lineEditName->text()) { if (!m_projectModel.rename(m_background, m_ui->lineEditName->text())) { QMessageBox::critical(this, tr("Renaming Background failed!"), tr("Renaming Background failed!")); - return; + return false; } } - if (!m_projectModel.setBackgroundPixmap(m_background, std::move(m_pixmap))) + if (!m_projectModel.setBackgroundPixmap(m_background, QPixmap{m_pixmap})) { QMessageBox::critical(this, tr("Setting Background pixmap failed!"), tr("Setting Background pixmap failed!")); - return; + return false; } m_background.tileset = m_ui->checkBoxTileset->isChecked(); - QDialog::accept(); + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); + return true; } void BackgroundPropertiesDialog::reject() @@ -154,6 +164,7 @@ void BackgroundPropertiesDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } diff --git a/src/editor/dialogs/backgroundpropertiesdialog.h b/src/editor/dialogs/backgroundpropertiesdialog.h index 5b7bbef..f657914 100644 --- a/src/editor/dialogs/backgroundpropertiesdialog.h +++ b/src/editor/dialogs/backgroundpropertiesdialog.h @@ -4,13 +4,14 @@ #include #include +#include "projectchangesapplier.h" namespace Ui { class BackgroundPropertiesDialog; } struct Background; class ProjectTreeModel; class MainWindow; -class BackgroundPropertiesDialog : public QDialog +class BackgroundPropertiesDialog : public QDialog, public ProjectChangesApplier { Q_OBJECT @@ -19,6 +20,7 @@ public: ~BackgroundPropertiesDialog(); void accept() override; + bool applyChanges() override; void reject() override; private slots: diff --git a/src/editor/dialogs/codeeditordialog.cpp b/src/editor/dialogs/codeeditordialog.cpp index 69ba018..d5dde20 100644 --- a/src/editor/dialogs/codeeditordialog.cpp +++ b/src/editor/dialogs/codeeditordialog.cpp @@ -111,10 +111,18 @@ void CodeEditorDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } +void CodeEditorDialog::markChangesApplied() +{ + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); +} + QAction *CodeEditorDialog::addToolbarWidget(QWidget *widget) { return m_ui->toolBar->addWidget(widget); diff --git a/src/editor/dialogs/codeeditordialog.h b/src/editor/dialogs/codeeditordialog.h index a75c9b2..ad9779f 100644 --- a/src/editor/dialogs/codeeditordialog.h +++ b/src/editor/dialogs/codeeditordialog.h @@ -29,6 +29,7 @@ protected slots: protected: bool m_unsavedChanges{}; + void markChangesApplied(); QAction *addToolbarWidget(QWidget *widget); diff --git a/src/editor/dialogs/fontpropertiesdialog.cpp b/src/editor/dialogs/fontpropertiesdialog.cpp index 02fe8a9..f33c200 100644 --- a/src/editor/dialogs/fontpropertiesdialog.cpp +++ b/src/editor/dialogs/fontpropertiesdialog.cpp @@ -69,12 +69,19 @@ void FontPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool FontPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_font.name != m_ui->lineEditName->text()) { if (!m_projectModel.rename(m_font, m_ui->lineEditName->text())) { QMessageBox::critical(this, tr("Renaming Font failed!"), tr("Renaming Font failed!")); - return; + return false; } } @@ -84,7 +91,10 @@ void FontPropertiesDialog::accept() .to = m_ui->spinBoxCharRangeTo->value(), }; - QDialog::accept(); + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); + return true; } void FontPropertiesDialog::reject() @@ -147,6 +157,7 @@ void FontPropertiesDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } diff --git a/src/editor/dialogs/fontpropertiesdialog.h b/src/editor/dialogs/fontpropertiesdialog.h index 1dbbbd4..2eefb72 100644 --- a/src/editor/dialogs/fontpropertiesdialog.h +++ b/src/editor/dialogs/fontpropertiesdialog.h @@ -3,13 +3,14 @@ #include #include +#include "projectchangesapplier.h" namespace Ui { class FontPropertiesDialog; } struct Font; class ProjectTreeModel; class MainWindow; -class FontPropertiesDialog : public QDialog +class FontPropertiesDialog : public QDialog, public ProjectChangesApplier { Q_OBJECT @@ -18,6 +19,7 @@ public: ~FontPropertiesDialog(); void accept() override; + bool applyChanges() override; void reject() override; private slots: diff --git a/src/editor/dialogs/objectpropertiesdialog.cpp b/src/editor/dialogs/objectpropertiesdialog.cpp index 2910ddf..e294b2f 100644 --- a/src/editor/dialogs/objectpropertiesdialog.cpp +++ b/src/editor/dialogs/objectpropertiesdialog.cpp @@ -13,6 +13,7 @@ #include "addeventdialog.h" #include "editorguiutils.h" #include "editorsettings.h" +#include "widgets/resourcemenuadapter.h" ObjectPropertiesDialog::ObjectPropertiesDialog(Object &object, ProjectTreeModel &projectModel, MainWindow &mainWindow) : QDialog{&mainWindow}, @@ -105,10 +106,18 @@ ObjectPropertiesDialog::ObjectPropertiesDialog(Object &object, ProjectTreeModel connect(m_ui->checkBoxPersistent, &QCheckBox::toggled, this, &ObjectPropertiesDialog::changed); - connect(m_menuSprites, &QMenu::aboutToShow, - this, &ObjectPropertiesDialog::spritesMenuAboutToShow); - connect(m_menuMaskSprites, &QMenu::aboutToShow, - this, &ObjectPropertiesDialog::maskSpritesMenuAboutToShow); + m_spriteMenuAdapter = std::make_unique( + m_projectModel, m_projectModel.rootFor(), *m_menuSprites, + [this](const QModelIndex &index) { + if (const Sprite *sprite = m_projectModel.get(index)) setSprite(*sprite); + }, + [this](QMenu &menu) { menu.addAction(tr(""), this, &ObjectPropertiesDialog::clearSprite); }); + m_maskMenuAdapter = std::make_unique( + m_projectModel, m_projectModel.rootFor(), *m_menuMaskSprites, + [this](const QModelIndex &index) { + if (const Sprite *sprite = m_projectModel.get(index)) setMaskSprite(*sprite); + }, + [this](QMenu &menu) { menu.addAction(tr(""), this, &ObjectPropertiesDialog::clearMaskSprite); }); connect(m_ui->widgetParent, &ObjectSelectorWidget::changed, this, &ObjectPropertiesDialog::changed); @@ -137,19 +146,26 @@ void ObjectPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool ObjectPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_object.name != m_ui->lineEditName->text()) { if (!m_projectModel.rename(m_object, m_ui->lineEditName->text())) { QMessageBox::critical(this, tr("Renaming Object failed!"), tr("Renaming Object failed!")); - return; + return false; } } - if (!m_projectModel.setObjectSpriteName(m_object, std::move(m_spriteName))) + if (!m_projectModel.setObjectSpriteName(m_object, QString{m_spriteName})) { QMessageBox::critical(this, tr("Setting Object Sprite failed!"), tr("Setting Object Sprite failed!")); - return; + return false; } m_object.visible = m_ui->checkBoxVisible->isChecked(); @@ -158,10 +174,13 @@ void ObjectPropertiesDialog::accept() m_object.persistent = m_ui->checkBoxPersistent->isChecked(); m_object.parentName = m_ui->widgetParent->objectName(); m_object.maskSpriteName = m_maskSpriteName; - m_object.events = std::move(m_events); - m_object.collisionEvents = std::move(m_collisionEvents); + m_object.events = m_events; + m_object.collisionEvents = m_collisionEvents; - QDialog::accept(); + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); + return true; } void ObjectPropertiesDialog::reject() @@ -275,12 +294,29 @@ void ObjectPropertiesDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } void ObjectPropertiesDialog::objectNameChanged(const Object &object, const QString &oldName) { + const auto renameTargets = [&object, &oldName](ActionsContainer &actions) { + for (Action &action : actions) + std::visit([&](auto &value) { + if (auto *target = std::get_if(&value.appliesTo); + target && target->objectName == oldName) + target->objectName = object.name; + }, action); + }; + for (auto &[event, actions] : m_events) renameTargets(actions); + for (auto &[event, actions] : m_collisionEvents) renameTargets(actions); + if (m_collisionEvents.contains(oldName)) + { + m_ui->actionsWidget->setActionsContainer(nullptr); + m_eventsModel->changeEvent(oldName, object.name); + } + if (&object == &m_object) { { @@ -323,6 +359,24 @@ void ObjectPropertiesDialog::objectAboutToBeRemoved(const Object &object) if (QSignalBlocker blocker{m_ui->widgetParent}; !m_ui->widgetParent->objectName().isEmpty() && m_ui->widgetParent->objectName() == object.name) m_ui->widgetParent->clearObject(); + + const auto clearTargets = [&object](ActionsContainer &actions) { + for (Action &action : actions) + std::visit([&object](auto &value) { + if (auto *target = std::get_if(&value.appliesTo); + target && target->objectName == object.name) + target->objectName.clear(); + }, action); + }; + for (auto &[event, actions] : m_events) + clearTargets(actions); + for (auto &[event, actions] : m_collisionEvents) + clearTargets(actions); + if (m_collisionEvents.contains(object.name)) + { + m_ui->actionsWidget->setActionsContainer(nullptr); + m_eventsModel->removeEvent(object.name); + } } void ObjectPropertiesDialog::spriteAboutToBeRemoved(const Sprite &sprite) @@ -358,28 +412,6 @@ void ObjectPropertiesDialog::spritePixmapsChanged(const Sprite &sprite) updateSpritePreview(sprite.pixmaps); } -void ObjectPropertiesDialog::spritesMenuAboutToShow() -{ - m_menuSprites->clear(); - m_menuSprites->addAction(tr(""), this, &ObjectPropertiesDialog::clearSprite); - for (const auto &sprite : m_projectModel.project()->sprites) - m_menuSprites->addAction(sprite.pixmaps.empty() ? QPixmap{} : sprite.pixmaps.front(), - sprite.name, - this, - [&sprite,this](){ setSprite(sprite); }); -} - -void ObjectPropertiesDialog::maskSpritesMenuAboutToShow() -{ - m_menuMaskSprites->clear(); - m_menuMaskSprites->addAction(tr(""), this, &ObjectPropertiesDialog::clearMaskSprite); - for (const auto &sprite : m_projectModel.project()->sprites) - m_menuMaskSprites->addAction(sprite.pixmaps.empty() ? QPixmap{} : sprite.pixmaps.front(), - sprite.name, - this, - [&sprite,this](){ setMaskSprite(sprite); }); -} - void ObjectPropertiesDialog::currentEventChanged(const QModelIndex &index) { if (index.isValid()) @@ -424,6 +456,9 @@ void ObjectPropertiesDialog::clearSprite() void ObjectPropertiesDialog::setSprite(const Sprite &sprite) { + if (m_spriteName == sprite.name) + return; + m_spriteName = sprite.name; updateSpritePreview(sprite.pixmaps); m_ui->lineEditSprite->setText(sprite.name); @@ -479,5 +514,5 @@ void ObjectPropertiesDialog::updateSpritePreview() void ObjectPropertiesDialog::updateSpritePreview(const std::vector &pixmaps) { - m_ui->labelSpritePreview->setPixmap(pixmaps.empty() ? QPixmap{} : pixmaps.front().scaled(32, m_ui->labelSpritePreview->height(), Qt::KeepAspectRatio)); + m_ui->labelSpritePreview->setPixmap(pixmaps.empty() ? QPixmap{} : pixmaps.front().scaled(32, 32, Qt::KeepAspectRatio)); } diff --git a/src/editor/dialogs/objectpropertiesdialog.h b/src/editor/dialogs/objectpropertiesdialog.h index 5765fd5..405fc1c 100644 --- a/src/editor/dialogs/objectpropertiesdialog.h +++ b/src/editor/dialogs/objectpropertiesdialog.h @@ -6,14 +6,16 @@ #include #include "projectcontainer.h" +#include "projectchangesapplier.h" class QMenu; namespace Ui { class ObjectPropertiesDialog; } class ProjectTreeModel; class ObjectEventsModel; class MainWindow; +class ResourceMenuAdapter; -class ObjectPropertiesDialog : public QDialog +class ObjectPropertiesDialog : public QDialog, public ProjectChangesApplier { Q_OBJECT @@ -22,6 +24,7 @@ public: ~ObjectPropertiesDialog(); void accept() override; + bool applyChanges() override; void reject() override; private slots: @@ -41,8 +44,6 @@ private slots: void spriteAboutToBeRemoved(const Sprite &sprite); void spritePixmapsChanged(const Sprite &sprite); - void spritesMenuAboutToShow(); - void maskSpritesMenuAboutToShow(); void currentEventChanged(const QModelIndex &index); void eventsContextMenuRequested(const QPoint &pos); void rowsInserted(const QModelIndex &parent, int first); @@ -73,6 +74,8 @@ private: QMenu * const m_menuSprites; QMenu * const m_menuMaskSprites; + std::unique_ptr m_spriteMenuAdapter; + std::unique_ptr m_maskMenuAdapter; QString m_spriteName; QString m_maskSpriteName; diff --git a/src/editor/dialogs/objectpropertiesdialog.ui b/src/editor/dialogs/objectpropertiesdialog.ui index fc54753..f7183ba 100644 --- a/src/editor/dialogs/objectpropertiesdialog.ui +++ b/src/editor/dialogs/objectpropertiesdialog.ui @@ -34,12 +34,6 @@ - - - 0 - 0 - - The name of the object @@ -58,13 +52,13 @@ 32 - 0 + 32 32 - 16777215 + 32 diff --git a/src/editor/dialogs/pathpropertiesdialog.cpp b/src/editor/dialogs/pathpropertiesdialog.cpp index 32d5538..3ea2995 100644 --- a/src/editor/dialogs/pathpropertiesdialog.cpp +++ b/src/editor/dialogs/pathpropertiesdialog.cpp @@ -11,6 +11,7 @@ #include "projectcontainer.h" #include "models/projecttreemodel.h" +#include "widgets/resourcemenuadapter.h" #include "models/pathpointsmodel.h" #include "mainwindow.h" @@ -71,8 +72,10 @@ PathPropertiesDialog::PathPropertiesDialog(Path &path, ProjectTreeModel &project m_ui->toolBar->addWidget(toolButton); } - connect(m_menuRooms, &QMenu::aboutToShow, - this, &PathPropertiesDialog::roomsMenuAboutToShow); + m_roomMenuAdapter = std::make_unique( + m_projectModel, m_projectModel.rootFor(), *m_menuRooms, + [](const QModelIndex &) {}, + [this](QMenu &menu) { menu.addAction(tr("No Room")); }); m_ui->treeView->setModel(m_pointsModel.get()); @@ -218,17 +221,22 @@ void PathPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool PathPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_path.name != m_ui->lineEditName->text()) { if (!m_projectModel.rename(m_path, m_ui->lineEditName->text())) { QMessageBox::critical(this, tr("Renaming Path failed!"), tr("Renaming Path failed!")); - return; + return false; } } - m_path.points = m_points; - if (m_ui->radioButtonStraight->isChecked()) m_path.type = Path::Type::Straight; else if (m_ui->radioButtonSmooth->isChecked()) @@ -236,16 +244,20 @@ void PathPropertiesDialog::accept() else { QMessageBox::critical(this, tr("No kind selected!"), tr("No kind selected!")); - return; + return false; } + m_path.points = m_points; m_path.closed = m_ui->checkBoxClosed->isChecked(); m_path.precision = m_ui->spinBoxPrecision->value(); m_path.snapX = m_spinBoxSnapX->value(); m_path.snapY = m_spinBoxSnapY->value(); m_path.gridEnabled = m_ui->actionGridEnabled->isChecked(); - QDialog::accept(); + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); + return true; } void PathPropertiesDialog::reject() @@ -428,6 +440,7 @@ void PathPropertiesDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } @@ -445,18 +458,6 @@ void PathPropertiesDialog::pathNameChanged(const Path &path) updateTitle(); } -void PathPropertiesDialog::roomsMenuAboutToShow() -{ - m_menuRooms->clear(); - qDebug() << "called" << tr("No Room"); - m_menuRooms->addAction(tr("No Room")); - for (const auto &room : m_projectModel.project()->rooms) - { - qDebug() << "called" << room.name; - m_menuRooms->addAction(room.name); - } -} - void PathPropertiesDialog::updateTitle() { setWindowTitle(tr("Path Properties: %0%1") diff --git a/src/editor/dialogs/pathpropertiesdialog.h b/src/editor/dialogs/pathpropertiesdialog.h index 6aa9705..064e7f6 100644 --- a/src/editor/dialogs/pathpropertiesdialog.h +++ b/src/editor/dialogs/pathpropertiesdialog.h @@ -6,6 +6,7 @@ #include #include "projectcontainer.h" +#include "projectchangesapplier.h" class QSpinBox; class QLabel; @@ -14,8 +15,9 @@ namespace Ui { class PathPropertiesDialog; } class ProjectTreeModel; class PathPointsModel; class MainWindow; +class ResourceMenuAdapter; -class PathPropertiesDialog : public QDialog +class PathPropertiesDialog : public QDialog, public ProjectChangesApplier { Q_OBJECT @@ -24,6 +26,7 @@ public: ~PathPropertiesDialog(); void accept() override; + bool applyChanges() override; void reject() override; private slots: @@ -55,7 +58,6 @@ private slots: void pathNameChanged(const Path &path); - void roomsMenuAboutToShow(); private: void updateTitle(); @@ -78,6 +80,7 @@ private: QSpinBox * const m_spinBoxSnapY; QMenu * const m_menuRooms; + std::unique_ptr m_roomMenuAdapter; QLabel * const m_labelX; QLabel * const m_labelY; diff --git a/src/editor/dialogs/projectchangesapplier.h b/src/editor/dialogs/projectchangesapplier.h new file mode 100644 index 0000000..9b965ae --- /dev/null +++ b/src/editor/dialogs/projectchangesapplier.h @@ -0,0 +1,8 @@ +#pragma once + +class ProjectChangesApplier +{ +public: + virtual ~ProjectChangesApplier() = default; + virtual bool applyChanges() = 0; +}; diff --git a/src/editor/dialogs/roompropertiesdialog.cpp b/src/editor/dialogs/roompropertiesdialog.cpp index 10790f4..6d74fa2 100644 --- a/src/editor/dialogs/roompropertiesdialog.cpp +++ b/src/editor/dialogs/roompropertiesdialog.cpp @@ -10,6 +10,7 @@ #include "projectcontainer.h" #include "models/projecttreemodel.h" +#include "widgets/resourcemenuadapter.h" #include "roomscene.h" #include "editorguiutils.h" #include "genericcodeeditordialog.h" @@ -31,6 +32,8 @@ RoomPropertiesDialog::RoomPropertiesDialog(Room &room, ProjectTreeModel &project m_labelY{new QLabel{tr("y: %0").arg(0)}} { m_ui->setupUi(this); + m_ui->splitter->setStretchFactor(0, 0); + m_ui->splitter->setStretchFactor(1, 1); updateTitle(); @@ -188,8 +191,11 @@ RoomPropertiesDialog::RoomPropertiesDialog(Room &room, ProjectTreeModel &project connect(m_ui->roomEditWidget, &RoomEditWidget::changed, this, &RoomPropertiesDialog::changed); - connect(m_menuObjects, &QMenu::aboutToShow, - this, &RoomPropertiesDialog::objectsMenuAboutToShow); + m_objectMenuAdapter = std::make_unique( + m_projectModel, m_projectModel.rootFor(), *m_menuObjects, + [this](const QModelIndex &index) { + if (const Object *object = m_projectModel.get(index)) setObject(*object); + }); if (!m_projectModel.project()->objects.empty()) setObject(m_projectModel.project()->objects.back()); @@ -209,12 +215,19 @@ void RoomPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool RoomPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_room.name != m_ui->lineEditName->text()) { if (!m_projectModel.rename(m_room, m_ui->lineEditName->text())) { QMessageBox::critical(this, tr("Renaming Room failed!"), tr("Renaming Room failed!")); - return; + return false; } } @@ -231,7 +244,10 @@ void RoomPropertiesDialog::accept() m_room.objects = m_objects; - QDialog::accept(); + m_unsavedChanges = false; + setWindowModified(false); + updateTitle(); + return true; } void RoomPropertiesDialog::reject() @@ -315,6 +331,7 @@ void RoomPropertiesDialog::changed() if (!m_unsavedChanges) { m_unsavedChanges = true; + setWindowModified(true); updateTitle(); } } @@ -401,26 +418,6 @@ void RoomPropertiesDialog::objectSpriteNameChanged(const Object &object) m_ui->labelObjectPreview->setPixmap(std::move(pixmap)); } -void RoomPropertiesDialog::objectsMenuAboutToShow() -{ - m_menuObjects->clear(); - for (const auto &object : m_projectModel.project()->objects) - { - QIcon icon; - if (!object.spriteName.isEmpty()) - { - const auto iter = std::find_if(std::cbegin(m_projectModel.project()->sprites), std::cend(m_projectModel.project()->sprites), - [&object](const auto &sprite){ return object.spriteName == sprite.name; }); - if (iter == std::cend(m_projectModel.project()->sprites)) - qWarning() << "invalid sprite" << object.spriteName; - else if (!iter->pixmaps.empty() && !iter->pixmaps.front().isNull()) - icon = iter->pixmaps.front(); - } - m_menuObjects->addAction(icon, object.name, this, - [&object,this](){ setObject(object); }); - } -} - void RoomPropertiesDialog::cursorMoved(const QPoint &point) { m_labelX->setText(tr("X: %0").arg(point.x())); diff --git a/src/editor/dialogs/roompropertiesdialog.h b/src/editor/dialogs/roompropertiesdialog.h index 6facaa9..9e2f31a 100644 --- a/src/editor/dialogs/roompropertiesdialog.h +++ b/src/editor/dialogs/roompropertiesdialog.h @@ -5,6 +5,7 @@ #include #include "projectcontainer.h" +#include "projectchangesapplier.h" class QSpinBox; class QLabel; @@ -16,8 +17,9 @@ struct Object; class ProjectTreeModel; class RoomScene; class MainWindow; +class ResourceMenuAdapter; -class RoomPropertiesDialog : public QDialog +class RoomPropertiesDialog : public QDialog, public ProjectChangesApplier { Q_OBJECT @@ -26,6 +28,7 @@ public: ~RoomPropertiesDialog(); void accept() override; + bool applyChanges() override; void reject() override; private slots: @@ -46,7 +49,6 @@ private slots: void objectAboutToBeRemoved(const Object &object); void objectSpriteNameChanged(const Object &object); - void objectsMenuAboutToShow(); void cursorMoved(const QPoint &point); @@ -73,6 +75,7 @@ private: QSpinBox * const m_spinBoxSnapY; QMenu * const m_menuObjects; + std::unique_ptr m_objectMenuAdapter; QLabel * const m_labelX; QLabel * const m_labelY; diff --git a/src/editor/dialogs/scriptpropertiesdialog.cpp b/src/editor/dialogs/scriptpropertiesdialog.cpp index 56eaa38..16c33fa 100644 --- a/src/editor/dialogs/scriptpropertiesdialog.cpp +++ b/src/editor/dialogs/scriptpropertiesdialog.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include "projectcontainer.h" #include "models/projecttreemodel.h" @@ -43,18 +42,26 @@ void ScriptPropertiesDialog::accept() return; } + if (applyChanges()) QDialog::accept(); +} + +bool ScriptPropertiesDialog::applyChanges() +{ + if (!m_unsavedChanges) return true; + if (m_script.name != m_lineEditName->text()) { if (!m_projectModel.rename