Skip to content

Commit f823bfa

Browse files
committed
fix qtfred briefing and debriefing trees
1 parent 1433c95 commit f823bfa

4 files changed

Lines changed: 6 additions & 14 deletions

File tree

qtfred/src/ui/dialogs/BriefingEditorDialog.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ void BriefingEditorDialog::initializeUi()
9494

9595
// Initialize the formula tree editor
9696
ui->formulaTreeView->initializeEditor(_viewport->editor, this);
97+
connect(ui->formulaTreeView, &sexp_tree_view::modified, this, [this]() {
98+
_model->setFormula(ui->formulaTreeView->_model.save_tree());
99+
});
97100
}
98101

99102
void BriefingEditorDialog::updateUi()
@@ -367,11 +370,6 @@ void BriefingEditorDialog::on_voiceFilePlayButton_clicked()
367370
_model->testSpeech();
368371
}
369372

370-
void BriefingEditorDialog::on_formulaTreeView_nodeChanged(int newTree)
371-
{
372-
_model->setFormula(newTree);
373-
}
374-
375373
void BriefingEditorDialog::on_defaultMusicComboBox_currentIndexChanged(int index)
376374
{
377375
_model->setBriefingMusicIndex(index);

qtfred/src/ui/dialogs/BriefingEditorDialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ class BriefingEditorDialog : public QDialog, public SexpTreeEditorInterface {
7474
void on_voiceFileLineEdit_textChanged(const QString& string);
7575
void on_voiceFileBrowseButton_clicked();
7676
void on_voiceFilePlayButton_clicked();
77-
void on_formulaTreeView_nodeChanged(int newTree);
78-
7977
void on_defaultMusicComboBox_currentIndexChanged(int index);
8078
void on_musicPackComboBox_currentIndexChanged(int /*index*/);
8179

qtfred/src/ui/dialogs/DebriefingDialog.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ void DebriefingDialog::initializeUi()
8080

8181
// Initialize the formula tree editor
8282
ui->formulaTreeView->initializeEditor(_viewport->editor, this);
83+
connect(ui->formulaTreeView, &sexp_tree_view::modified, this, [this]() {
84+
_model->setFormula(ui->formulaTreeView->_model.save_tree());
85+
});
8386
}
8487

8588
void DebriefingDialog::updateUi()
@@ -234,11 +237,6 @@ void DebriefingDialog::on_voiceFilePlayButton_clicked()
234237
_model->testSpeech();
235238
}
236239

237-
void DebriefingDialog::on_formulaTreeView_nodeChanged(int newTree)
238-
{
239-
_model->setFormula(newTree);
240-
}
241-
242240
void DebriefingDialog::on_successMusicComboBox_currentIndexChanged(int index)
243241
{
244242
_model->setSuccessMusicTrack(index - 1); // -1 to account for "None"

qtfred/src/ui/dialogs/DebriefingDialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ private slots:
4747
void on_voiceFileLineEdit_textChanged(const QString& string);
4848
void on_voiceFileBrowseButton_clicked();
4949
void on_voiceFilePlayButton_clicked();
50-
void on_formulaTreeView_nodeChanged(int newTree);
51-
5250
void on_successMusicComboBox_currentIndexChanged(int index);
5351
void on_averageMusicComboBox_currentIndexChanged(int index);
5452
void on_failureMusicComboBox_currentIndexChanged(int index);

0 commit comments

Comments
 (0)