Skip to content

Commit 28b6a09

Browse files
committed
fix qtfred briefing and debriefing trees
1 parent 6f553f3 commit 28b6a09

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
@@ -252,6 +252,9 @@ void BriefingEditorDialog::initializeUi()
252252

253253
// Initialize the formula tree editor
254254
ui->formulaTreeView->initializeEditor(_viewport->editor, this);
255+
connect(ui->formulaTreeView, &sexp_tree_view::modified, this, [this]() {
256+
_model->setFormula(ui->formulaTreeView->_model.save_tree());
257+
});
255258

256259
on_movementSpeedComboBox_currentIndexChanged(ui->movementSpeedComboBox->currentIndex());
257260
on_rotationSpeedComboBox_currentIndexChanged(ui->rotationSpeedComboBox->currentIndex());
@@ -699,11 +702,6 @@ void BriefingEditorDialog::on_voiceFilePlayButton_clicked()
699702
_model->testSpeech();
700703
}
701704

702-
void BriefingEditorDialog::on_formulaTreeView_nodeChanged(int newTree)
703-
{
704-
_model->setFormula(newTree);
705-
}
706-
707705
void BriefingEditorDialog::on_defaultMusicComboBox_currentIndexChanged(int index)
708706
{
709707
_model->setBriefingMusicIndex(index);

qtfred/src/ui/dialogs/BriefingEditorDialog.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ class BriefingEditorDialog : public QDialog, public SexpTreeEditorInterface {
8383
void on_voiceFileLineEdit_textChanged(const QString& string);
8484
void on_voiceFileBrowseButton_clicked();
8585
void on_voiceFilePlayButton_clicked();
86-
void on_formulaTreeView_nodeChanged(int newTree);
87-
8886
void on_defaultMusicComboBox_currentIndexChanged(int index);
8987
void on_musicPackComboBox_currentIndexChanged(int /*index*/);
9088

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)