diff --git a/fred2/FictionViewerDlg.cpp b/fred2/FictionViewerDlg.cpp index f4ec1df173d..1fbe2037c64 100644 --- a/fred2/FictionViewerDlg.cpp +++ b/fred2/FictionViewerDlg.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "fred.h" +#include "FREDDoc.h" #include "FictionViewerDlg.h" #include "missionui/fictionviewer.h" #include "gamesnd/eventmusic.h" @@ -84,6 +85,9 @@ void FictionViewerDlg::OnOK() { UpdateData(TRUE); + const auto old_stages = Fiction_viewer_stages; + const int old_music = Mission_music[SCORE_FICTION_VIEWER]; + // remove whitespace m_story_file.Trim(); m_font_file.Trim(); @@ -122,6 +126,15 @@ void FictionViewerDlg::OnOK() Mission_music[SCORE_FICTION_VIEWER] = m_fiction_music - 1; } + const auto same_stage = [](const fiction_viewer_stage& a, const fiction_viewer_stage& b) { + return !strcmp(a.story_filename, b.story_filename) && !strcmp(a.font_filename, b.font_filename) && + !strcmp(a.voice_filename, b.voice_filename); + }; + if (Mission_music[SCORE_FICTION_VIEWER] != old_music || old_stages.size() != Fiction_viewer_stages.size() || + (!old_stages.empty() && !same_stage(old_stages.front(), Fiction_viewer_stages.front()))) { + set_modified(); + } + CDialog::OnOK(); } diff --git a/fred2/eventeditor.cpp b/fred2/eventeditor.cpp index 51aa4234bca..7c439958ecf 100644 --- a/fred2/eventeditor.cpp +++ b/fred2/eventeditor.cpp @@ -856,6 +856,8 @@ void event_editor::OnButtonCancel() audiostream_close_file(m_wave_id, 0); m_wave_id = -1; + // copy the fields on screen into the editor's own lists first, or an edit to the selected event goes unnoticed + save(); if (query_modified()) { int z = MessageBox("Do you want to keep your changes?", "Close", MB_ICONQUESTION | MB_YESNOCANCEL); if (z == IDCANCEL){ @@ -868,6 +870,17 @@ void event_editor::OnButtonCancel() } } + close_discarding_changes(); +} + +void event_editor::close_discarding_changes() +{ + audiostream_close_file(m_wave_id, 0); + m_wave_id = -1; + // the media names were copied for this editor and only OK hands them to the mission + for (auto& msg : m_messages) { + message_free_media_names(msg); + } theApp.record_window_data(&Events_wnd_data, this); delete Event_editor_dlg; Event_editor_dlg = NULL; diff --git a/fred2/eventeditor.h b/fred2/eventeditor.h index 6596d3b71c6..3718749b970 100644 --- a/fred2/eventeditor.h +++ b/fred2/eventeditor.h @@ -71,6 +71,8 @@ class event_editor : public CDialog, public SexpTreeEditorInterface void save_event(int e); void move_handler(int node1, int node2, bool insert_before); void insert_handler(int old, int node); + void close_discarding_changes(); + void close_offering_changes() { OnButtonCancel(); } int query_modified(); void OnOK(); // default MFC OK behavior void OnCancel(); // default MFC Cancel behavior diff --git a/fred2/freddoc.cpp b/fred2/freddoc.cpp index 0e7e2d25b61..9d1f163fa00 100644 --- a/fred2/freddoc.cpp +++ b/fred2/freddoc.cpp @@ -114,6 +114,7 @@ bool CFREDDoc::autoload() { // Load Backup.002 r = load_mission(name, MPF_FAST_RELOAD); + recreate_event_editors(); Update_window = 1; // Delete Backup.001 @@ -221,6 +222,7 @@ void CFREDDoc::editor_init_mission() { reset_mission(); SetModifiedFlag(FALSE); recreate_dialogs(); + recreate_event_editors(); } bool CFREDDoc::load_mission(const char *pathname, int flags) { @@ -410,6 +412,9 @@ bool CFREDDoc::load_mission(const char *pathname, int flags) { Ship_editor_dialog.bypass_all--; recreate_dialogs(); + if (!(flags & MPF_FAST_RELOAD)) { + recreate_event_editors(); + } // This hook will allow for scripts to know when a mission has been loaded // which will then allow them to update any LuaEnums that may be related to sexps @@ -600,11 +605,13 @@ void CFREDDoc::OnFileImportFSM() { { // these aren't done automatically for imports theApp.AddToRecentFileList((LPCTSTR)dest_path); + SetPathName((LPCTSTR)dest_path, FALSE); SetTitle((LPCTSTR)Mission_filename); } } recreate_dialogs(); + recreate_event_editors(); } BOOL CFREDDoc::OnNewDocument() { @@ -799,6 +806,61 @@ void CFREDDoc::Serialize(CArchive& ar) { */ } +static void open_event_editor() +{ + Event_editor_dlg = new event_editor; + Event_editor_dlg->Create(event_editor::IDD); + Event_editor_dlg->SetWindowPos(&CWnd::wndTop, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + Event_editor_dlg->ShowWindow(SW_RESTORE); +} + +static void open_message_editor() +{ + Message_editor_dlg = new CMessageEditorDlg; + Message_editor_dlg->Create(CMessageEditorDlg::IDD); + Message_editor_dlg->SetWindowPos(&CWnd::wndTop, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + Message_editor_dlg->ShowWindow(SW_RESTORE); +} + +// Only when the mission is replaced, never on the reload after a save, which keeps the open editors' edits. +void CFREDDoc::recreate_event_editors() { + if (Event_editor_dlg) { + Event_editor_dlg->close_discarding_changes(); + open_event_editor(); + } + + if (Message_editor_dlg) { + Message_editor_dlg->OnCancel(); + open_message_editor(); + } +} + +// an editor's own close prompt deletes it on Yes and No, so a pointer still set means the user chose Cancel +BOOL CFREDDoc::SaveModified() +{ + const bool had_event_editor = Event_editor_dlg != nullptr; + const bool had_message_editor = Message_editor_dlg != nullptr; + + if (had_event_editor) { + Event_editor_dlg->close_offering_changes(); + } + if (had_message_editor) { + Message_editor_dlg->close_offering_changes(); + } + if (Event_editor_dlg != nullptr || Message_editor_dlg != nullptr) { + return FALSE; + } + + const BOOL result = CDocument::SaveModified(); + if (had_event_editor) { + open_event_editor(); + } + if (had_message_editor) { + open_message_editor(); + } + return result; +} + void CFREDDoc::recreate_dialogs() { if (Briefing_dialog) { Briefing_dialog->OnCancel(); diff --git a/fred2/freddoc.h b/fred2/freddoc.h index a80069f24b5..008e60f0b77 100644 --- a/fred2/freddoc.h +++ b/fred2/freddoc.h @@ -38,6 +38,8 @@ class CFREDDoc : public CDocument * @returns The file index of the loaded Undo item */ bool autoload(); + void recreate_event_editors(); + BOOL SaveModified() override; /** * @brief Read in a new mission file from disk diff --git a/fred2/fredview.cpp b/fred2/fredview.cpp index 15b7f251aff..1bfccb2c7a6 100644 --- a/fred2/fredview.cpp +++ b/fred2/fredview.cpp @@ -4160,7 +4160,8 @@ void CFREDView::OnRunFreeSpace() PROCESS_INFORMATION pi; char *lpMsgBuf; - if (!FREDDoc_ptr->SaveModified()) + // running does not replace the mission, so open editors keep their unapplied edits + if (!FREDDoc_ptr->CDocument::SaveModified()) return; ZeroMemory(&si, sizeof(si)); @@ -4307,13 +4308,15 @@ void CFREDView::OnRevert() if (!FREDDoc_ptr->SaveModified()) return; + const CString path = FREDDoc_ptr->GetPathName(); FREDDoc_ptr->DeleteContents(); - FREDDoc_ptr->OnOpenDocument(NULL); + FREDDoc_ptr->OnOpenDocument(path); } void CFREDView::OnUpdateRevert(CCmdUI* pCmdUI) { - pCmdUI->Enable(*Mission_filename); + // New clears only the path; a multi-file import or a failed load clears only the name + pCmdUI->Enable(*Mission_filename && !FREDDoc_ptr->GetPathName().IsEmpty()); } BOOL CFREDView::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message) diff --git a/fred2/management.cpp b/fred2/management.cpp index 1c7f7ff0800..3fa63ef1e08 100644 --- a/fred2/management.cpp +++ b/fred2/management.cpp @@ -908,6 +908,7 @@ void create_new_mission() { reset_mission(); *Mission_filename = 0; + FREDDoc_ptr->recreate_event_editors(); FREDDoc_ptr->autosave("nothing"); Undo_count = 0; } diff --git a/fred2/messageeditordlg.h b/fred2/messageeditordlg.h index 055be3ced41..5009182979d 100644 --- a/fred2/messageeditordlg.h +++ b/fred2/messageeditordlg.h @@ -21,6 +21,7 @@ class CMessageEditorDlg : public CDialog int find_event(); int query_modified(); void OnCancel(); + void close_offering_changes() { OnClose(); } int update(int num); void update_cur_message(); void OnOK(); diff --git a/fred2/setglobalshipflags.cpp b/fred2/setglobalshipflags.cpp index e800436f32c..b25c4ca2c54 100644 --- a/fred2/setglobalshipflags.cpp +++ b/fred2/setglobalshipflags.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "fred.h" #include "SetGlobalShipFlags.h" +#include "FREDDoc.h" #ifdef _DEBUG #undef THIS_FILE @@ -47,54 +48,73 @@ END_MESSAGE_MAP() void SetGlobalShipFlags::OnNoShields() { int i; + bool changed = false; for (i=0; i= 0) { + changed |= !Objects[Ships[i].objnum].flags[Object::Object_Flags::No_shields]; Objects[Ships[i].objnum].flags.set(Object::Object_Flags::No_shields); } } + if (changed) + set_modified(); } void SetGlobalShipFlags::OnNoSubspaceDrive() { int i; + bool changed = false; for (i=0; i= 0) { // only for fighters and bombers - Ships[i].flags.set(Ship::Ship_Flags::No_subspace_drive, Ship_info[Ships[i].ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[Ships[i].ship_info_index].is_fighter_bomber(); + changed |= Ships[i].flags[Ship::Ship_Flags::No_subspace_drive] != value; + Ships[i].flags.set(Ship::Ship_Flags::No_subspace_drive, value); } } + if (changed) + set_modified(); } void SetGlobalShipFlags::OnPrimitiveSensors() { int i; + bool changed = false; for (i=0; i= 0) { // only for fighters and bombers - Ships[i].flags.set(Ship::Ship_Flags::Primitive_sensors, Ship_info[Ships[i].ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[Ships[i].ship_info_index].is_fighter_bomber(); + changed |= Ships[i].flags[Ship::Ship_Flags::Primitive_sensors] != value; + Ships[i].flags.set(Ship::Ship_Flags::Primitive_sensors, value); } } + if (changed) + set_modified(); } void SetGlobalShipFlags::OnAffectedByGravity() { int i; + bool changed = false; for (i=0; i= 0) { // only for fighters and bombers - Ships[i].flags.set(Ship::Ship_Flags::Affected_by_gravity, Ship_info[Ships[i].ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[Ships[i].ship_info_index].is_fighter_bomber(); + changed |= Ships[i].flags[Ship::Ship_Flags::Affected_by_gravity] != value; + Ships[i].flags.set(Ship::Ship_Flags::Affected_by_gravity, value); } } + if (changed) + set_modified(); } diff --git a/fred2/shieldsysdlg.cpp b/fred2/shieldsysdlg.cpp index 607dd97680d..ccab4fb4773 100644 --- a/fred2/shieldsysdlg.cpp +++ b/fred2/shieldsysdlg.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "FRED.h" +#include "FREDDoc.h" #include "ShieldSysDlg.h" #include "ship/ship.h" #include "mission/missionparse.h" @@ -105,6 +106,7 @@ void shield_sys_dlg::OnOK() OnSelchangeTeam(); OnSelchangeType(); + bool changed = false; for (i=0; i= 0) { z = Shield_sys_teams[Ships[i].team]; @@ -114,12 +116,18 @@ void shield_sys_dlg::OnOK() else if (type_z == 1) z = 1; + const bool had_no_shields = Objects[Ships[i].objnum].flags[Object::Object_Flags::No_shields]; if (!z) Objects[Ships[i].objnum].flags.remove(Object::Object_Flags::No_shields); else if (z == 1) Objects[Ships[i].objnum].flags.set(Object::Object_Flags::No_shields); + if (Objects[Ships[i].objnum].flags[Object::Object_Flags::No_shields] != had_no_shields) + changed = true; } + if (changed) + set_modified(); + CDialog::OnOK(); } diff --git a/qtfred/src/mission/dialogs/AsteroidEditorDialogModel.cpp b/qtfred/src/mission/dialogs/AsteroidEditorDialogModel.cpp index 3cbda7a44e8..1a3a183e478 100644 --- a/qtfred/src/mission/dialogs/AsteroidEditorDialogModel.cpp +++ b/qtfred/src/mission/dialogs/AsteroidEditorDialogModel.cpp @@ -35,6 +35,9 @@ bool AsteroidEditorDialogModel::apply() return false; } Asteroid_field = _a_field; + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/BriefingEditorDialogModel.cpp b/qtfred/src/mission/dialogs/BriefingEditorDialogModel.cpp index 87781756589..2a8b3a5386b 100644 --- a/qtfred/src/mission/dialogs/BriefingEditorDialogModel.cpp +++ b/qtfred/src/mission/dialogs/BriefingEditorDialogModel.cpp @@ -106,6 +106,9 @@ bool BriefingEditorDialogModel::apply() Mission_music[SCORE_BRIEFING] = _briefingMusicIndex - 1; strcpy_s(The_mission.substitute_briefing_music_name, _subBriefingMusic.c_str()); + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp b/qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp index 46876471b84..fdc835cb751 100644 --- a/qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp +++ b/qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp @@ -19,6 +19,9 @@ bool CommandBriefingDialogModel::apply() Cmd_briefs[i] = _wipCommandBrief[i]; } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/DebriefingDialogModel.cpp b/qtfred/src/mission/dialogs/DebriefingDialogModel.cpp index 8b8932cf8ea..039bd6fb5fe 100644 --- a/qtfred/src/mission/dialogs/DebriefingDialogModel.cpp +++ b/qtfred/src/mission/dialogs/DebriefingDialogModel.cpp @@ -53,6 +53,9 @@ bool DebriefingDialogModel::apply() Mission_music[SCORE_DEBRIEFING_AVERAGE] = _averageMusic; Mission_music[SCORE_DEBRIEFING_FAILURE] = _failureMusic; + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/FictionViewerDialogModel.cpp b/qtfred/src/mission/dialogs/FictionViewerDialogModel.cpp index f8fede9b783..41ff19d00a9 100644 --- a/qtfred/src/mission/dialogs/FictionViewerDialogModel.cpp +++ b/qtfred/src/mission/dialogs/FictionViewerDialogModel.cpp @@ -25,6 +25,9 @@ bool FictionViewerDialogModel::apply() { // Commit working copy to mission Fiction_viewer_stages = _fictionViewerStages; + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.cpp b/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.cpp index ee316daf46a..959e819647e 100644 --- a/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.cpp +++ b/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.cpp @@ -20,46 +20,66 @@ void GlobalShipFlagsDialogModel::reject() { void GlobalShipFlagsDialogModel::setNoShieldsAll() { + bool changed = false; for (auto& ship : Ships) { if (ship.objnum >= 0) { + changed |= !Objects[ship.objnum].flags[Object::Object_Flags::No_shields]; Objects[ship.objnum].flags.set(Object::Object_Flags::No_shields); } } + if (changed) { + _editor->missionChanged(); + } } void GlobalShipFlagsDialogModel::setNoSubspaceDriveOnFightersBombers() { + bool changed = false; for (auto& ship : Ships) { if (ship.objnum >= 0) { // only for fighters and bombers - ship.flags.set(Ship::Ship_Flags::No_subspace_drive, - Ship_info[ship.ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[ship.ship_info_index].is_fighter_bomber(); + changed |= ship.flags[Ship::Ship_Flags::No_subspace_drive] != value; + ship.flags.set(Ship::Ship_Flags::No_subspace_drive, value); } } + if (changed) { + _editor->missionChanged(); + } } void GlobalShipFlagsDialogModel::setPrimitiveSensorsOnFightersBombers() { + bool changed = false; for (auto& ship : Ships) { if (ship.objnum >= 0) { // only for fighters and bombers - ship.flags.set(Ship::Ship_Flags::Primitive_sensors, - Ship_info[ship.ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[ship.ship_info_index].is_fighter_bomber(); + changed |= ship.flags[Ship::Ship_Flags::Primitive_sensors] != value; + ship.flags.set(Ship::Ship_Flags::Primitive_sensors, value); } } + if (changed) { + _editor->missionChanged(); + } } void GlobalShipFlagsDialogModel::setAffectedByGravityOnFightersBombers() { // FRED only affects fighters and bombers.. that seems really strange for this one + bool changed = false; for (auto& ship : Ships) { if (ship.objnum >= 0) { // only for fighters and bombers - ship.flags.set(Ship::Ship_Flags::Affected_by_gravity, - Ship_info[ship.ship_info_index].is_fighter_bomber()); + const bool value = Ship_info[ship.ship_info_index].is_fighter_bomber(); + changed |= ship.flags[Ship::Ship_Flags::Affected_by_gravity] != value; + ship.flags.set(Ship::Ship_Flags::Affected_by_gravity, value); } } + if (changed) { + _editor->missionChanged(); + } } } // namespace fso::fred::dialogs diff --git a/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.h b/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.h index da90be73f35..763923c180f 100644 --- a/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.h +++ b/qtfred/src/mission/dialogs/GlobalShipFlagsDialogModel.h @@ -14,13 +14,13 @@ class GlobalShipFlagsDialogModel : public AbstractDialogModel { bool apply() override; void reject() override; - static void setNoShieldsAll(); + void setNoShieldsAll(); - static void setNoSubspaceDriveOnFightersBombers(); + void setNoSubspaceDriveOnFightersBombers(); - static void setPrimitiveSensorsOnFightersBombers(); + void setPrimitiveSensorsOnFightersBombers(); - static void setAffectedByGravityOnFightersBombers(); + void setAffectedByGravityOnFightersBombers(); }; } // namespace fso::fred::dialogs diff --git a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp index 132eac7c28a..1b2fe6bcebb 100644 --- a/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp +++ b/qtfred/src/mission/dialogs/MissionSpecDialogModel.cpp @@ -227,6 +227,9 @@ bool MissionSpecDialogModel::apply() { scripting::hooks::FredOnMissionSpecsSave->run(); } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp b/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp index 96154b521e5..bf23482b597 100644 --- a/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp +++ b/qtfred/src/mission/dialogs/ReinforcementsEditorDialogModel.cpp @@ -93,6 +93,9 @@ bool ReinforcementsDialogModel::apply() _shipWingPool.clear(); _selectedReinforcementIndices.clear(); + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/ShieldSystemDialogModel.cpp b/qtfred/src/mission/dialogs/ShieldSystemDialogModel.cpp index 2a03450de85..c139088e930 100644 --- a/qtfred/src/mission/dialogs/ShieldSystemDialogModel.cpp +++ b/qtfred/src/mission/dialogs/ShieldSystemDialogModel.cpp @@ -5,6 +5,17 @@ namespace fso::fred::dialogs { +namespace { +SCP_vector noShieldFlags() +{ + SCP_vector flags; + for (const auto& ship : Ships) { + flags.push_back(ship.objnum >= 0 && Objects[ship.objnum].flags[Object::Object_Flags::No_shields]); + } + return flags; +} +} // namespace + ShieldSystemDialogModel::ShieldSystemDialogModel(QObject* parent, EditorViewport* viewport) : AbstractDialogModel(parent, viewport), _teams(Iff_info.size(), GlobalShieldStatus::HasShields) { @@ -76,14 +87,22 @@ void ShieldSystemDialogModel::applyTeam(bool hasShields) // apply), so importShieldSysData is a no-op for them. Mixed entries // stay Mixed, Has/No entries already match each ship's flag. _teams[_currTeam] = hasShields ? GlobalShieldStatus::HasShields : GlobalShieldStatus::NoShields; + const auto before = noShieldFlags(); _editor->importShieldSysData(_teams, _types); + if (noShieldFlags() != before) { + _editor->missionChanged(); + } refresh(); } void ShieldSystemDialogModel::applyType(bool hasShields) { _types[_currType] = hasShields ? GlobalShieldStatus::HasShields : GlobalShieldStatus::NoShields; + const auto before = noShieldFlags(); _editor->importShieldSysData(_teams, _types); + if (noShieldFlags() != before) { + _editor->missionChanged(); + } refresh(); } diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipAltShipClassModel.cpp b/qtfred/src/mission/dialogs/ShipEditor/ShipAltShipClassModel.cpp index a7b2c6df357..4069c172df8 100644 --- a/qtfred/src/mission/dialogs/ShipEditor/ShipAltShipClassModel.cpp +++ b/qtfred/src/mission/dialogs/ShipEditor/ShipAltShipClassModel.cpp @@ -25,6 +25,9 @@ bool ShipAltShipClassModel::apply() for (int i = 0; i < _numSelectedShips; i++) { Ships[_selectedShips[i]].s_alt_classes = _altClassPool; } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp b/qtfred/src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp index 8515c0522df..49d09c5f159 100644 --- a/qtfred/src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp +++ b/qtfred/src/mission/dialogs/ShipEditor/ShipFlagsDialogModel.cpp @@ -168,6 +168,9 @@ bool ShipFlagsDialogModel::apply() objp = GET_NEXT(objp); } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp b/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp index 4307d73dd6b..a3a2fe7d9a1 100644 --- a/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp +++ b/qtfred/src/mission/dialogs/TeamLoadoutDialogModel.cpp @@ -124,6 +124,9 @@ bool TeamLoadoutDialogModel::apply() out.do_not_validate = in.skipValidation; } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/VariableDialogModel.cpp b/qtfred/src/mission/dialogs/VariableDialogModel.cpp index fe04994b987..b4a6d18e068 100644 --- a/qtfred/src/mission/dialogs/VariableDialogModel.cpp +++ b/qtfred/src/mission/dialogs/VariableDialogModel.cpp @@ -97,6 +97,9 @@ bool VariableDialogModel::apply() update_sexp_containers(new_containers, renamed_containers); + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/mission/dialogs/VolumetricNebulaDialogModel.cpp b/qtfred/src/mission/dialogs/VolumetricNebulaDialogModel.cpp index 9ce09c52034..fef759b5631 100644 --- a/qtfred/src/mission/dialogs/VolumetricNebulaDialogModel.cpp +++ b/qtfred/src/mission/dialogs/VolumetricNebulaDialogModel.cpp @@ -22,6 +22,9 @@ bool VolumetricNebulaDialogModel::apply() } makeVolumetricsCopy(*The_mission.volumetrics, _volumetrics); } + if (query_modified()) { + _editor->missionChanged(); + } return true; } diff --git a/qtfred/src/ui/FredView.cpp b/qtfred/src/ui/FredView.cpp index a17fef0d342..2610ac1e653 100644 --- a/qtfred/src/ui/FredView.cpp +++ b/qtfred/src/ui/FredView.cpp @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -361,7 +362,9 @@ void FredView::setEditor(Editor* editor, EditorViewport* viewport) { } void FredView::loadMissionFile(const QString& pathName, int flags) { - if (!maybePromptToSaveMissionChanges(tr("loading another mission"))) { + SCP_vector toolDialogs; + auto reopenToolDialogs = ::util::finally([&toolDialogs]() { reopenMissionToolDialogs(toolDialogs); }); + if (!closeMissionToolDialogs(toolDialogs) || !maybePromptToSaveMissionChanges(tr("loading another mission"))) { return; } @@ -654,6 +657,12 @@ void FredView::on_actionRevert_triggered(bool) { QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (result != QMessageBox::Yes) return; + // tools close before the flag is cleared, or a tool's "keep your changes?" would bring the save prompt back + SCP_vector toolDialogs; + auto reopenToolDialogs = ::util::finally([&toolDialogs]() { reopenMissionToolDialogs(toolDialogs); }); + if (!closeMissionToolDialogs(toolDialogs)) { + return; + } // Clear modified flag so loadMissionFile doesn't prompt to save again _missionModified = false; loadMissionFile(saveName); @@ -672,11 +681,11 @@ void FredView::on_actionFS2_Compatibility_triggered(bool) { } void FredView::on_actionFS1_Mission_triggered(bool) { - if (!maybePromptToSaveMissionChanges(tr("importing an FS1 mission"))) { + SCP_vector toolDialogs; + auto reopenToolDialogs = ::util::finally([&toolDialogs]() { reopenMissionToolDialogs(toolDialogs); }); + if (!closeMissionToolDialogs(toolDialogs) || !maybePromptToSaveMissionChanges(tr("importing an FS1 mission"))) { return; } - // Mark as unmodified so loadMissionFile won't prompt again after import - _missionModified = false; QStringList srcPaths = QFileDialog::getOpenFileNames(this, tr("Select FS1 mission(s) to import"), @@ -697,6 +706,9 @@ void FredView::on_actionFS1_Mission_triggered(bool) { fso::fred::util::saveLastDir("missions/importFS1Dest", destDir); + // unmodified so loadMissionFile won't prompt again; not before the pickers, or cancelling one loses unsaved work + _missionModified = false; + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); int successes = 0; @@ -865,7 +877,9 @@ QSurface* FredView::getRenderSurface() { return ui->centralWidget->getRenderSurface(); } void FredView::newMission() { - if (!maybePromptToSaveMissionChanges(tr("creating a new mission"))) { + SCP_vector toolDialogs; + auto reopenToolDialogs = ::util::finally([&toolDialogs]() { reopenMissionToolDialogs(toolDialogs); }); + if (!closeMissionToolDialogs(toolDialogs) || !maybePromptToSaveMissionChanges(tr("creating a new mission"))) { return; } @@ -1707,6 +1721,43 @@ bool FredView::isMissionModified() const { return _missionModified; } +void FredView::registerMissionToolDialog(QWidget* dialog, std::function reopen) +{ + _missionToolDialogs.erase(std::remove_if(_missionToolDialogs.begin(), + _missionToolDialogs.end(), + [](const MissionToolDialog& tool) { return tool.dialog.isNull(); }), + _missionToolDialogs.end()); + _missionToolDialogs.push_back({dialog, std::move(reopen)}); +} + +// tool models copy the mission when built, so open tools are rebuilt around a load instead of kept +bool FredView::closeMissionToolDialogs(SCP_vector& closed) +{ + const auto open = _missionToolDialogs; + for (const auto& tool : open) { + if (tool.dialog.isNull()) { + continue; + } + const auto geometry = tool.dialog->saveGeometry(); + if (!tool.dialog->close()) { + return false; + } + closed.push_back({tool.reopen, geometry}); + // delete now, not at the next event loop pass, or the reopen would find this instance still alive + delete tool.dialog.data(); + } + return true; +} + +void FredView::reopenMissionToolDialogs(const SCP_vector& closed) +{ + for (const auto& tool : closed) { + if (auto* dialog = tool.reopen()) { + dialog->restoreGeometry(tool.geometry); + } + } +} + bool FredView::maybePromptToSaveMissionChanges(const QString& actionDescription) { if (!isMissionModified()) { return true; @@ -2268,10 +2319,14 @@ void FredView::closeEvent(QCloseEvent* event) { settings.setValue("FredView/transformLocalRotate", _tbLocalRotate); // Camera speeds are persisted on change in onUpdateViewSpeeds(), so no need to save them here. - if (!maybePromptToSaveMissionChanges(tr("closing QtFRED"))) { + // tools close first so their unapplied edits are offered before the save question, as on New/Open + SCP_vector toolDialogs; + auto reopenToolDialogs = ::util::finally([&toolDialogs]() { reopenMissionToolDialogs(toolDialogs); }); + if (!closeMissionToolDialogs(toolDialogs) || !maybePromptToSaveMissionChanges(tr("closing QtFRED"))) { event->ignore(); return; } + reopenToolDialogs.disable(); disconnect(); QMainWindow::closeEvent(event); @@ -2476,10 +2531,14 @@ namespace { // Opens a single instance of a dialog parented to `parent`, wired for // delete-on-close. If an instance is already open, it is raised and focused // rather than creating a second one. Returns the newly-created dialog, or -// nullptr if an existing instance was reused (so callers can do extra one-time -// setup only on first open). +// nullptr if an existing instance was reused. First-open setup belongs in +// `setup`, which also runs when the dialog is reopened after a mission load. template -DialogT* showSingleInstanceDialog(FredView* parent, EditorViewport* viewport) { +DialogT* showSingleInstanceDialog(FredView* parent, + EditorViewport* viewport, + bool showsMissionData = true, + const std::function& setup = {}) +{ if (auto* existing = parent->findChild(QString(), Qt::FindDirectChildrenOnly)) { existing->raise(); existing->activateWindow(); @@ -2487,6 +2546,14 @@ DialogT* showSingleInstanceDialog(FredView* parent, EditorViewport* viewport) { } auto* dialog = new DialogT(parent, viewport); dialog->setAttribute(Qt::WA_DeleteOnClose); + if (setup) { + setup(dialog); + } + if (showsMissionData) { + parent->registerMissionToolDialog(dialog, [parent, viewport, setup]() -> QWidget* { + return showSingleInstanceDialog(parent, viewport, true, setup); + }); + } dialog->show(); return dialog; } @@ -2527,9 +2594,12 @@ void FredView::onOtherKindSelected(int other_kind) { _viewport->cur_other_kind = static_cast(other_kind); } void FredView::on_actionAsteroid_Field_triggered(bool) { - if (auto* asteroidFieldEditor = showSingleInstanceDialog(this, _viewport)) { - connect(asteroidFieldEditor, &QDialog::finished, this, [this]() { fred->updateAllViewports(); }); - } + showSingleInstanceDialog(this, + _viewport, + true, + [this](dialogs::AsteroidEditorDialog* asteroidFieldEditor) { + connect(asteroidFieldEditor, &QDialog::finished, this, [this]() { fred->updateAllViewports(); }); + }); } void FredView::on_actionVolumetric_Nebula_triggered(bool) { @@ -2594,7 +2664,7 @@ void FredView::on_actionProps_triggered(bool) } void FredView::on_actionCampaign_triggered(bool) { //TODO: Save if Changes - showSingleInstanceDialog(this, _viewport); + showSingleInstanceDialog(this, _viewport, false); } void FredView::on_actionObject_Orientation_triggered(bool) { orientEditorTriggered(); @@ -3088,7 +3158,7 @@ void FredView::on_actionHelp_Topics_triggered(bool) { } void FredView::on_actionAbout_triggered(bool) { - showSingleInstanceDialog(this, _viewport); + showSingleInstanceDialog(this, _viewport, false); } void FredView::on_actionMission_Statistics_triggered(bool) { showSingleInstanceDialog(this, _viewport); @@ -3115,7 +3185,7 @@ void FredView::on_actionMission_Goals_triggered(bool) { void FredView::on_actionMusic_Player_triggered(bool) { - showSingleInstanceDialog(this, _viewport); + showSingleInstanceDialog(this, _viewport, false); } void FredView::on_actionCalculate_Relative_Coordinates_triggered(bool) { diff --git a/qtfred/src/ui/FredView.h b/qtfred/src/ui/FredView.h index 6f738721ed1..85f1c7a2149 100644 --- a/qtfred/src/ui/FredView.h +++ b/qtfred/src/ui/FredView.h @@ -11,12 +11,14 @@ #include #include #include +#include #include "missioneditor/missionsave.h" #include #include +#include #include #include @@ -51,6 +53,7 @@ class FredView: public QMainWindow, public IDialogProvider { void setEditor(Editor* editor, EditorViewport* viewport); void loadMissionFile(const QString& pathName, int flags = 0); + void registerMissionToolDialog(QWidget* dialog, std::function reopen); QSurface* getRenderSurface(); RenderWidget* getRenderWidget(); @@ -221,6 +224,13 @@ class FredView: public QMainWindow, public IDialogProvider { bool maybePromptToSaveMissionChanges(const QString& actionDescription); bool isMissionModified() const; + struct ClosedToolDialog { + std::function reopen; + QByteArray geometry; + }; + bool closeMissionToolDialogs(SCP_vector& closed); + static void reopenMissionToolDialogs(const SCP_vector& closed); + void on_mission_loaded(const std::string& filepath); void connectActionToViewSetting(QAction* option, bool* destination); @@ -288,6 +298,12 @@ class FredView: public QMainWindow, public IDialogProvider { std::unique_ptr ui; + struct MissionToolDialog { + QPointer dialog; + std::function reopen; + }; + SCP_vector _missionToolDialogs; + ObjectComboBox* _shipClassBox = nullptr; ObjectComboBox* _propClassBox = nullptr; ObjectComboBox* _otherClassBox = nullptr; diff --git a/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp b/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp index 1ad7f524038..9d583622a7b 100644 --- a/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp +++ b/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp @@ -30,10 +30,14 @@ BackgroundEditorDialog::BackgroundEditorDialog(FredView* parent, EditorViewport* BackgroundEditorDialog::~BackgroundEditorDialog() = default; -void BackgroundEditorDialog::closeEvent(QCloseEvent* e) +// every close reaches reject() (QDialog::closeEvent calls it; so does Esc); edits here are live and there is no OK +void BackgroundEditorDialog::reject() { _model->finalizeFogChanges(); - QDialog::closeEvent(e); + if (_model->query_modified()) { + _viewport->editor->missionChanged(); + } + QDialog::reject(); } void BackgroundEditorDialog::initializeUi() diff --git a/qtfred/src/ui/dialogs/BackgroundEditorDialog.h b/qtfred/src/ui/dialogs/BackgroundEditorDialog.h index 976543aee5b..3de3001c889 100644 --- a/qtfred/src/ui/dialogs/BackgroundEditorDialog.h +++ b/qtfred/src/ui/dialogs/BackgroundEditorDialog.h @@ -105,7 +105,7 @@ private slots: void on_lightingProfileCombo_currentIndexChanged(int index); protected: - void closeEvent(QCloseEvent* e) override; + void reject() override; private: // NOLINT(readability-redundant-access-specifiers) std::unique_ptr ui;