From 77de5c0aa70086291cd8b16d96f0ab78b8a6f5d6 Mon Sep 17 00:00:00 2001 From: The Force <2040992+TheForce172@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:37:05 +0000 Subject: [PATCH] Address Feedback --- qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp | 1 + .../src/mission/dialogs/ReinforcementsEditorDialogModel.cpp | 2 ++ qtfred/src/ui/FredView.cpp | 4 ++-- qtfred/src/ui/dialogs/MissionSpecDialog.cpp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp b/qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp index 13c1b883306..b15d0d5d100 100644 --- a/qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp +++ b/qtfred/src/mission/dialogs/LoadoutEditorDialogModel.cpp @@ -933,6 +933,7 @@ void LoadoutDialogModel::setRequiredWeapon(const SCP_vector& list, c } set_modified(); buildCurrentLists(); + modelChanged(); } bool LoadoutDialogModel::getSkipValidation() { diff --git a/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp b/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp index 9714c803890..32b01e37b50 100644 --- a/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp +++ b/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp @@ -260,6 +260,7 @@ void ReinforcementsDialogModel::setUseCount(int count) for (auto& reinforcement : _selectedReinforcementIndices) { std::get<1>(_reinforcementList[reinforcement]) = count; } + modelChanged(); set_modified(); } @@ -268,6 +269,7 @@ void ReinforcementsDialogModel::setBeforeArrivalDelay(int delay) for (auto& reinforcement : _selectedReinforcementIndices) { std::get<2>(_reinforcementList[reinforcement]) = delay; } + modelChanged(); set_modified(); } diff --git a/qtfred/src/ui/FredView.cpp b/qtfred/src/ui/FredView.cpp index eb8d2893faa..851a71faa1f 100644 --- a/qtfred/src/ui/FredView.cpp +++ b/qtfred/src/ui/FredView.cpp @@ -872,7 +872,7 @@ void FredView::orientEditorTriggered() { auto dialog = new dialogs::ObjectOrientEditorDialog(this, _viewport); dialog->setAttribute(Qt::WA_DeleteOnClose); // This is a modal dialog - dialog->show(); + dialog->exec(); } void FredView::onUpdateEditorActions() { ui->actionObjects->setEnabled(query_valid_object(fred->currentObject)); @@ -989,7 +989,7 @@ void FredView::on_actionSelectionList_triggered(bool) { auto dialog = new dialogs::SelectionDialog(this, _viewport); // This is a modal dialog dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); + dialog->exec(); } void FredView::on_actionOrbitSelected_triggered(bool enabled) { _viewport->Lookat_mode = enabled; diff --git a/qtfred/src/ui/dialogs/MissionSpecDialog.cpp b/qtfred/src/ui/dialogs/MissionSpecDialog.cpp index 30b68f25370..1b9a87c8f52 100644 --- a/qtfred/src/ui/dialogs/MissionSpecDialog.cpp +++ b/qtfred/src/ui/dialogs/MissionSpecDialog.cpp @@ -300,7 +300,7 @@ void MissionSpecDialog::squadronNameChanged(const QString & string) { void MissionSpecDialog::on_customWingNameButton_clicked() { CustomWingNamesDialog* dialog = new CustomWingNamesDialog(this, _viewport); dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); + dialog->exec(); } void MissionSpecDialog::on_squadronLogoButton_clicked() {