QtFRED Mission Events Editor by MjnMixael · Pull Request #6961 · scp-fs2open/fs2open.github.com

MjnMixael · 2025-08-21T02:39:13Z

Cleans up and finishes the Mission Events editor. Adds missing features like annotations support, type to search for operators, message notes, etc. Also adds some new features like easy reorganizing of messages.

Sexp_tree is still kind of a mess as that file owns both the widget ui and the sexp tree data code. To get around this limitation the dialog passes an object to the events editor data model that allows the needed cross talk between the tree and the events data structures.

Fixes #3653

JohnAFernandez · 2025-08-24T16:37:19Z

+	}
+
+	// rename all sexp references to old events
+	for (int i = 0; i < (int)m_events.size(); i++) {


Suggested change

for (int i = 0; i < (int)m_events.size(); i++) {

for (int i = 0; i < static_cast<int>(m_events.size()); i++) {

JohnAFernandez · 2025-08-24T16:38:21Z

+			free(Messages[i].wave_info.name);
+	}
+
+	Num_messages = (int)m_messages.size() + Num_builtin_messages;


Suggested change

Num_messages = (int)m_messages.size() + Num_builtin_messages;

Num_messages = static_cast<int>(m_messages.size()) + Num_builtin_messages;

JohnAFernandez · 2025-08-24T16:38:40Z

+
+	Num_messages = (int)m_messages.size() + Num_builtin_messages;
+	Messages.resize(Num_messages);
+	for (int i = 0; i < (int)m_messages.size(); i++)


Suggested change

for (int i = 0; i < (int)m_messages.size(); i++)

for (int i = 0; i < static_cast<int>(m_messages.size()); i++)

JohnAFernandez · 2025-08-24T16:41:03Z

+	m_events.clear();
+	m_sig.clear();
+	m_cur_event = -1;
+	for (auto i = 0; i < (int)Mission_events.size(); i++) {


Suggested change

for (auto i = 0; i < (int)Mission_events.size(); i++) {

for (auto i = 0; i < static_cast<int>(Mission_events.size()); i++) {

JohnAFernandez · 2025-08-24T16:42:36Z

+
+int MissionEventsDialogModel::findFormulaByOriginalEventIndex(int orig) const
+{
+	for (int cur = 0; cur < (int)m_sig.size(); ++cur)


Suggested change

for (int cur = 0; cur < (int)m_sig.size(); ++cur)

for (int cur = 0; cur < static_cast<int>(m_sig.size()); ++cur)

JohnAFernandez · 2025-08-27T18:28:51Z

+QStringList sexp_tree::validOperatorsForNode(int nodeIndex)
+{
+	QStringList out;
+	if (nodeIndex < 0 || nodeIndex >= (int)tree_nodes.size())


Suggested change

if (nodeIndex < 0 || nodeIndex >= (int)tree_nodes.size())

if (nodeIndex < 0 || nodeIndex >= static_cast<int>(tree_nodes.size()))

JohnAFernandez · 2025-08-27T18:30:31Z

+	int nodeIdx = -1;
+	for (uint i = 0; i < tree_nodes.size(); ++i) {
+		if (tree_nodes[i].handle == item) {
+			nodeIdx = (int)i;


Suggested change

nodeIdx = (int)i;

nodeIdx = static_cast<int>(i);

JohnAFernandez · 2025-08-27T18:34:55Z

+	_opNodeIndex = -1;
+
+	// Commit operator if we resolved one
+	if (confirm && !chosenOp.isEmpty() && node >= 0 && node < (int)tree_nodes.size()) {


Suggested change

if (confirm && !chosenOp.isEmpty() && node >= 0 && node < (int)tree_nodes.size()) {

if (confirm && !chosenOp.isEmpty() && node >= 0 && node < static_cast<int>(tree_nodes.size())) {

JohnAFernandez

Whoops, misclicked. PLEASE ADDRESS THESE CHANGES, I PROMISE I AM NOT DOING CODE REVIEWS UNDER THE INFLUENCE!

JohnAFernandez

I guess that's done then.

wookieejedi · 2025-08-29T01:44:58Z

Will plan to merge tomorrow

The double quote conversions added in scp-fs2open#7008 were removed in scp-fs2open#6961, probably inadvertently due to the branch merge. This adds them back.

MjnMixael added the qtfred A feature or issue related to qtFred. label Aug 21, 2025

This was referenced Aug 22, 2025

QtFRED crashes while trying right mouse button on event #4182

Open

FR: Mission Event Editor Search Bar #6281

Open

Add/Modify Container dialog for qtFRED #3818

Closed

QtFRED Command Briefing Dialog #6968

Merged

MjnMixael force-pushed the qtfred_mission_events_dialog branch from 080aeeb to ebbed68 Compare August 23, 2025 15:31

MjnMixael added this to qtFRED2 Aug 23, 2025

github-project-automation Bot moved this to Work In Progress in qtFRED2 Aug 23, 2025

MjnMixael force-pushed the qtfred_mission_events_dialog branch from 7432a71 to 1652b94 Compare August 25, 2025 13:24

JohnAFernandez approved these changes Aug 28, 2025

View reviewed changes

github-project-automation Bot moved this from Work In Progress (PRs) to In Review (PRs) in qtFRED2 Aug 28, 2025

JohnAFernandez requested changes Aug 28, 2025

View reviewed changes

JohnAFernandez approved these changes Aug 28, 2025

View reviewed changes

MjnMixael added 17 commits August 28, 2025 18:43

Match file framework of mission events to the rest

77bb9bc

first pass at splitting up the model and ui layers

ffa7760

fix up message side of event editor

96706e8

fix event selection

37d2fd8

fix lots of event bugs

98e03b1

Get event annotations working

e0f1af6

type to search for operators

247c94b

control annotations

e184ef7

Add event dragging and fix event deletion

93a000b

cleanup

06f7f7f

Event and Msg order manipulation

6c41afd

implement some remaining message todos

4c1f6f3

minor cleanup

1631cc3

prep for browse ani dialog picker

8dc659a

basic file browser for now

a301a0c

cleanup

5a544f2

unused var

5ef30dd

MjnMixael added 7 commits August 28, 2025 18:44

more unused

a5a6bba

clang

c93d6db

static member access

b389e8b

rebase error

a8813bd

fix rebase error

624bd5b

address feedback

2df5cf2

missing parenthesis

172ae32

MjnMixael force-pushed the qtfred_mission_events_dialog branch from 5778885 to 172ae32 Compare August 28, 2025 23:44

wookieejedi merged commit b3db62c into scp-fs2open:master Aug 29, 2025
20 checks passed

github-project-automation Bot moved this from In Review (PRs) to Done in qtFRED2 Aug 29, 2025

MjnMixael deleted the qtfred_mission_events_dialog branch August 29, 2025 13:05

Goober5000 mentioned this pull request Sep 8, 2025

restore double quote conversion in event editor #7024

Merged

	for (int i = 0; i < (int)m_events.size(); i++) {
	for (int i = 0; i < static_cast<int>(m_events.size()); i++) {

	Num_messages = (int)m_messages.size() + Num_builtin_messages;
	Num_messages = static_cast<int>(m_messages.size()) + Num_builtin_messages;

	for (int i = 0; i < (int)m_messages.size(); i++)
	for (int i = 0; i < static_cast<int>(m_messages.size()); i++)

	for (auto i = 0; i < (int)Mission_events.size(); i++) {
	for (auto i = 0; i < static_cast<int>(Mission_events.size()); i++) {

	for (int cur = 0; cur < (int)m_sig.size(); ++cur)
	for (int cur = 0; cur < static_cast<int>(m_sig.size()); ++cur)

	if (nodeIndex < 0 \|\| nodeIndex >= (int)tree_nodes.size())
	if (nodeIndex < 0 \|\| nodeIndex >= static_cast<int>(tree_nodes.size()))

	if (confirm && !chosenOp.isEmpty() && node >= 0 && node < (int)tree_nodes.size()) {
	if (confirm && !chosenOp.isEmpty() && node >= 0 && node < static_cast<int>(tree_nodes.size())) {

Uh oh!

Conversation

MjnMixael commented Aug 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JohnAFernandez left a comment

Choose a reason for hiding this comment

Uh oh!

JohnAFernandez left a comment

Choose a reason for hiding this comment

Uh oh!

wookieejedi commented Aug 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MjnMixael commented Aug 21, 2025 •

edited

Loading