From 8d64f5cd0973ca508c78a9bc03e036d67d18012e Mon Sep 17 00:00:00 2001 From: Mike Nelson Date: Sat, 18 Jul 2026 23:05:54 -0500 Subject: [PATCH] signal and slot cleanup --- .../src/ui/dialogs/BackgroundEditorDialog.cpp | 19 +++++++------------ .../src/ui/dialogs/BackgroundEditorDialog.h | 1 - .../src/ui/dialogs/CommandBriefingDialog.cpp | 12 ++++++------ qtfred/src/ui/dialogs/MissionSpecDialog.cpp | 16 ---------------- qtfred/src/ui/dialogs/MissionSpecDialog.h | 4 ---- qtfred/src/ui/dialogs/VoiceActingManager.cpp | 2 +- qtfred/ui/BackgroundEditor.ui | 2 +- qtfred/ui/CommandBriefingDialog.ui | 8 ++++---- qtfred/ui/ObjectOrientationDialog.ui | 2 +- qtfred/ui/VoiceActingManager.ui | 4 ++-- 10 files changed, 22 insertions(+), 48 deletions(-) diff --git a/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp b/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp index 13017f816cf..075274477ed 100644 --- a/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp +++ b/qtfred/src/ui/dialogs/BackgroundEditorDialog.cpp @@ -221,22 +221,22 @@ void BackgroundEditorDialog::refreshSunList() const auto names = _model->getMissionSunNames(); - const int oldRow = ui->sunsListWidget->currentRow(); - ui->sunsListWidget->setUpdatesEnabled(false); - ui->sunsListWidget->clear(); + const int oldRow = ui->sunListWidget->currentRow(); + ui->sunListWidget->setUpdatesEnabled(false); + ui->sunListWidget->clear(); QStringList items; items.reserve(static_cast(names.size())); for (const auto& s : names) items << QString::fromStdString(s); - ui->sunsListWidget->addItems(items); + ui->sunListWidget->addItems(items); if (!items.isEmpty()) { - const int clamped = qBound(0, oldRow, ui->sunsListWidget->count() - 1); - ui->sunsListWidget->setCurrentRow(clamped); + const int clamped = qBound(0, oldRow, ui->sunListWidget->count() - 1); + ui->sunListWidget->setCurrentRow(clamped); } - ui->sunsListWidget->setUpdatesEnabled(true); + ui->sunListWidget->setUpdatesEnabled(true); updateSunControls(); } @@ -903,11 +903,6 @@ void BackgroundEditorDialog::on_skyboxHeadingSpin_valueChanged(double arg1) _model->setSkyboxHeading(static_cast(arg1)); } -void BackgroundEditorDialog::on_skyboxNoLightingCheckBox_toggled(bool checked) -{ - _model->setSkyboxNoLighting(checked); -} - void BackgroundEditorDialog::on_noLightingCheckBox_toggled(bool checked) { _model->setSkyboxNoLighting(checked); diff --git a/qtfred/src/ui/dialogs/BackgroundEditorDialog.h b/qtfred/src/ui/dialogs/BackgroundEditorDialog.h index e4004f99c58..42ea46fb77f 100644 --- a/qtfred/src/ui/dialogs/BackgroundEditorDialog.h +++ b/qtfred/src/ui/dialogs/BackgroundEditorDialog.h @@ -88,7 +88,6 @@ private slots: void on_skyboxPitchSpin_valueChanged(double arg1); void on_skyboxBankSpin_valueChanged(double arg1); void on_skyboxHeadingSpin_valueChanged(double arg1); - void on_skyboxNoLightingCheckBox_toggled(bool checked); void on_noLightingCheckBox_toggled(bool checked); void on_transparentCheckBox_toggled(bool checked); void on_forceClampCheckBox_toggled(bool checked); diff --git a/qtfred/src/ui/dialogs/CommandBriefingDialog.cpp b/qtfred/src/ui/dialogs/CommandBriefingDialog.cpp index 245426036e1..a28e3baa430 100644 --- a/qtfred/src/ui/dialogs/CommandBriefingDialog.cpp +++ b/qtfred/src/ui/dialogs/CommandBriefingDialog.cpp @@ -19,8 +19,8 @@ _viewport(viewport) this->setFocus(); ui->setupUi(this); - ui->speechFileName->setMaxLength(NAME_LENGTH - 1); - ui->animationFileName->setMaxLength(NAME_LENGTH - 1); + ui->speechFilename->setMaxLength(NAME_LENGTH - 1); + ui->animationFilename->setMaxLength(NAME_LENGTH - 1); ui->actionHighResolutionFilenameEdit->setMaxLength(NAME_LENGTH - 1); ui->actionLowResolutionFilenameEdit->setMaxLength(NAME_LENGTH - 1); @@ -87,8 +87,8 @@ void CommandBriefingDialog::updateUi() ui->actionChangeTeams->setCurrentIndex(ui->actionChangeTeams->findData(_model->getCurrentTeam())); ui->actionBriefingTextEditor->setPlainText(_model->getBriefingText().c_str()); - ui->animationFileName->setText(_model->getAnimationFilename().c_str()); - ui->speechFileName->setText(_model->getSpeechFilename().c_str()); + ui->animationFilename->setText(_model->getAnimationFilename().c_str()); + ui->speechFilename->setText(_model->getSpeechFilename().c_str()); ui->actionLowResolutionFilenameEdit->setText(_model->getLowResolutionFilename().c_str()); ui->actionHighResolutionFilenameEdit->setText(_model->getHighResolutionFilename().c_str()); @@ -120,9 +120,9 @@ void CommandBriefingDialog::enableDisableControls() ui->actionChangeTeams->setEnabled(_model->getMissionIsMultiTeam()); ui->actionCopyToOtherTeams->setEnabled(_model->getMissionIsMultiTeam()); - ui->animationFileName->setEnabled(total_stages > 0); + ui->animationFilename->setEnabled(total_stages > 0); ui->actionBrowseAnimation->setEnabled(total_stages > 0); - ui->speechFileName->setEnabled(total_stages > 0); + ui->speechFilename->setEnabled(total_stages > 0); ui->actionBrowseSpeechFile->setEnabled(total_stages > 0); ui->actionTestSpeechFileButton->setEnabled(total_stages > 0 && !_model->getSpeechFilename().empty()); diff --git a/qtfred/src/ui/dialogs/MissionSpecDialog.cpp b/qtfred/src/ui/dialogs/MissionSpecDialog.cpp index 4cf2c3ffccd..ff2e9b0a0a0 100644 --- a/qtfred/src/ui/dialogs/MissionSpecDialog.cpp +++ b/qtfred/src/ui/dialogs/MissionSpecDialog.cpp @@ -401,22 +401,6 @@ void MissionSpecDialog::on_supportRearmOptionsButton_clicked() } } -void MissionSpecDialog::on_toggleSupportShip_toggled(bool enabled) { - _model->setDisallowSupport(enabled); -} - -void MissionSpecDialog::on_toggleHullRepair_toggled(bool enabled) { - _model->setMissionFlagDirect(Mission::Mission_Flags::Support_repairs_hull, enabled); -} - -void MissionSpecDialog::on_hullRepairMax_valueChanged(double value) { - _model->setHullRepairMax((float)value); -} - -void MissionSpecDialog::on_subsysRepairMax_valueChanged(double value) { - _model->setSubsysRepairMax((float)value); -} - void MissionSpecDialog::on_toggleTrail_toggled(bool enabled) { _model->setMissionFlagDirect(Mission::Mission_Flags::Toggle_ship_trails, enabled); } diff --git a/qtfred/src/ui/dialogs/MissionSpecDialog.h b/qtfred/src/ui/dialogs/MissionSpecDialog.h index 33b4b4af85a..ba8f4bdeb0a 100644 --- a/qtfred/src/ui/dialogs/MissionSpecDialog.h +++ b/qtfred/src/ui/dialogs/MissionSpecDialog.h @@ -50,10 +50,6 @@ private slots: void on_supportRearmOptionsButton_clicked(); // Middle column - void on_toggleSupportShip_toggled(bool checked); - void on_toggleHullRepair_toggled(bool checked); - void on_hullRepairMax_valueChanged(double value); - void on_subsysRepairMax_valueChanged(double value); void on_toggleTrail_toggled(bool checked); void on_toggleSpeedDisplay_toggled(bool checked); void on_minDisplaySpeed_valueChanged(int value); diff --git a/qtfred/src/ui/dialogs/VoiceActingManager.cpp b/qtfred/src/ui/dialogs/VoiceActingManager.cpp index 01e5a145bd8..980ca7691a5 100644 --- a/qtfred/src/ui/dialogs/VoiceActingManager.cpp +++ b/qtfred/src/ui/dialogs/VoiceActingManager.cpp @@ -93,7 +93,7 @@ void VoiceActingManager::initializeUi() // Filename settings ui->includeSenderCheckBox->setChecked(_model->includeSenderInFilename()); - ui->replaceCheckBox->setChecked(_model->noReplace()); + ui->noReplaceCheckBox->setChecked(_model->noReplace()); ui->suffixComboBox->setCurrentIndex(suffixToIndex(_model->suffix())); // Script export diff --git a/qtfred/ui/BackgroundEditor.ui b/qtfred/ui/BackgroundEditor.ui index b6fa61dc639..57ae1ee6b3f 100644 --- a/qtfred/ui/BackgroundEditor.ui +++ b/qtfred/ui/BackgroundEditor.ui @@ -277,7 +277,7 @@ - + diff --git a/qtfred/ui/CommandBriefingDialog.ui b/qtfred/ui/CommandBriefingDialog.ui index 1b83182a370..5c512eb6ffd 100644 --- a/qtfred/ui/CommandBriefingDialog.ui +++ b/qtfred/ui/CommandBriefingDialog.ui @@ -170,7 +170,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -307,9 +307,9 @@ actionDeleteStage actionCopyToOtherTeams actionBriefingTextEditor - animationFileName + animationFilename actionBrowseAnimation - speechFileName + speechFilename actionBrowseSpeechFile actionTestSpeechFileButton actionLowResolutionFilenameEdit diff --git a/qtfred/ui/ObjectOrientationDialog.ui b/qtfred/ui/ObjectOrientationDialog.ui index b3d68d53005..fe0f90a852a 100644 --- a/qtfred/ui/ObjectOrientationDialog.ui +++ b/qtfred/ui/ObjectOrientationDialog.ui @@ -223,7 +223,7 @@ - + Transform Objects Independently diff --git a/qtfred/ui/VoiceActingManager.ui b/qtfred/ui/VoiceActingManager.ui index b03020ea41f..006dcb1fba7 100644 --- a/qtfred/ui/VoiceActingManager.ui +++ b/qtfred/ui/VoiceActingManager.ui @@ -156,9 +156,9 @@ - + - Replace existing file names + Don't replace existing file names