Skip to content

Fix scenario deletion logic and improve recent projects menu handling #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fatehmtd merged 1 commit into from
Jan 5, 2026
Merged

Fix scenario deletion logic and improve recent projects menu handling #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions RequestFlowApp/RequestFlow/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,16 @@ SceneGraphWidget* MainWindow::openScenario(view::SceneGraph* sceneGraph)
}
});

sysMenu->addAction(QIcon(":/ui/delete"), "Delete Scenario", [=]() {
sysMenu->addAction(QIcon(":/ui/delete"), "Delete Scenario", [this, sceneGraphWidget]() {
deleteScenario(sceneGraphWidget->getSceneGraph());
});
window->setSystemMenu(sysMenu);

connect(sceneGraph->getModelGraph(), &model::IdentifiableEntity::nameChanged, window, [=](const QString& str) {
connect(sceneGraph->getModelGraph(), &model::IdentifiableEntity::nameChanged, window, [sceneGraph, window, evaluateScenarioTitle](const QString& str) {
window->setWindowTitle(evaluateScenarioTitle(sceneGraph->getModelGraph()));
});

connect(sceneGraph->getModelGraph(), &model::Graph::activeEnvironmentChanged, window, [=]() {
connect(sceneGraph->getModelGraph(), &model::Graph::activeEnvironmentChanged, window, [sceneGraph, window, evaluateScenarioTitle]() {
window->setWindowTitle(evaluateScenarioTitle(sceneGraph->getModelGraph()));
});

Expand All @@ -317,9 +317,18 @@ void MainWindow::deleteScenario(view::SceneGraph* sceneGraph)
{
auto choice = QMessageBox::warning(this, "Delete Scenarion", QString("You are about to delete (%1), proceed ?").arg(sceneGraph->getModelGraph()->getName()), QMessageBox::Yes, QMessageBox::Cancel);
if (choice == QMessageBox::Yes) {
// delete the model graph then the widget
delete sceneGraph->getModelGraph();
auto graphWidget = sceneGraph->views().first();
delete graphWidget->parent();
const auto views = sceneGraph->views();
auto graphWidget = views.first();
QMdiSubWindow* mdiSubwindow = dynamic_cast<QMdiSubWindow*>(graphWidget->parentWidget());
QMdiArea* mdiArea = dynamic_cast<QMdiArea*>(mdiSubwindow->parent()->parent());
mdiArea->removeSubWindow(mdiSubwindow);
mdiArea->activateNextSubWindow();
auto subWindow = mdiArea->currentSubWindow();
mdiArea->setActiveSubWindow(subWindow);
subWindow->showMaximized();
mdiArea->showMaximized();
}
}

Expand Down Expand Up @@ -479,22 +488,22 @@ void MainWindow::onOpenProject()
void MainWindow::updateRecentProjectsList()
{
auto recentProjects = _settingsManager->enumRecentProjects();
//auto menu = _openProject->menu();

auto menu = _recentProjectsMenu;
auto actions = menu->actions();

for (auto action : actions) {
std::for_each(actions.begin(), actions.end(), [menu](QAction* action) {
menu->removeAction(action);
delete action;
}
});

// add an open project action
for (const auto& prj : recentProjects) {
std::for_each(recentProjects.begin(), recentProjects.end(), [this, menu](const QString& prj) {
auto action = menu->addAction(QIcon(":/ui/network"), prj);
connect(action, &QAction::triggered, this, [=]() {
openProject(prj);
});
}
});

if (recentProjects.size() > 0) {
menu->addSeparator();
Expand Down