Skip to content

Commit 06601bc

Browse files
committed
fix qtfred briefing and debriefing trees
1 parent 4bf703c commit 06601bc

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

255255
// Initialize the formula tree editor
256256
ui->formulaTreeView->initializeEditor(_viewport->editor, this);
257+
connect(ui->formulaTreeView, &sexp_tree_view::modified, this, [this]() {
258+
_model->setFormula(ui->formulaTreeView->_model.save_tree());
259+
});
257260

258261
on_movementSpeedComboBox_currentIndexChanged(ui->movementSpeedComboBox->currentIndex());
259262
on_rotationSpeedComboBox_currentIndexChanged(ui->rotationSpeedComboBox->currentIndex());
@@ -701,11 +704,6 @@ void BriefingEditorDialog::on_voiceFilePlayButton_clicked()
701704
_model->testSpeech();
702705
}
703706

704-
void BriefingEditorDialog::on_formulaTreeView_nodeChanged(int newTree)
705-
{
706-
_model->setFormula(newTree);
707-
}
708-
709707
void BriefingEditorDialog::on_defaultMusicComboBox_currentIndexChanged(int index)
710708
{
711709
_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
@@ -82,6 +82,9 @@ void DebriefingDialog::initializeUi()
8282

8383
// Initialize the formula tree editor
8484
ui->formulaTreeView->initializeEditor(_viewport->editor, this);
85+
connect(ui->formulaTreeView, &sexp_tree_view::modified, this, [this]() {
86+
_model->setFormula(ui->formulaTreeView->_model.save_tree());
87+
});
8588
}
8689

8790
void DebriefingDialog::updateUi()
@@ -236,11 +239,6 @@ void DebriefingDialog::on_voiceFilePlayButton_clicked()
236239
_model->testSpeech();
237240
}
238241

239-
void DebriefingDialog::on_formulaTreeView_nodeChanged(int newTree)
240-
{
241-
_model->setFormula(newTree);
242-
}
243-
244242
void DebriefingDialog::on_successMusicComboBox_currentIndexChanged(int index)
245243
{
246244
_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)