Qtfred ships dialog direct edit (#7369)

MjnMixael · web-flow · commit c9419639721a · 2026-04-15T07:47:15.000-04:00
* fix some issues and convert to direct edit

* fix some comments

* some fixes

* var clash

* loops

* re add missing warning
diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.cpp b/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.cpp
diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.h b/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.h
@@ -44,14 +44,13 @@ class ShipEditorDialogModel : public AbstractDialogModel {
 
 	void set_modified();
 
-	bool update_ship(int ship);
-	bool update_data();
-
 	void ship_alt_name_close(int base_ship);
 	void ship_callsign_close(int base_ship);
 
 	static int make_ship_list(int* arr);
 
+	int computeArrivalMinDist() const;
+
 	bool enable = true;
 	int player_count;
 	int ship_count;
diff --git a/qtfred/src/ui/dialogs/FictionViewerDialog.cpp b/qtfred/src/ui/dialogs/FictionViewerDialog.cpp
@@ -39,7 +39,7 @@ void FictionViewerDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void FictionViewerDialog::reject()
diff --git a/qtfred/src/ui/dialogs/MissionSpecs/CustomDataDialog.cpp b/qtfred/src/ui/dialogs/MissionSpecs/CustomDataDialog.cpp
@@ -42,7 +42,7 @@ void CustomDataDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void CustomDataDialog::reject()
diff --git a/qtfred/src/ui/dialogs/MissionSpecs/CustomStringsDialog.cpp b/qtfred/src/ui/dialogs/MissionSpecs/CustomStringsDialog.cpp
@@ -42,7 +42,7 @@ void CustomStringsDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void CustomStringsDialog::reject()
diff --git a/qtfred/src/ui/dialogs/ReinforcementsEditorDialog.cpp b/qtfred/src/ui/dialogs/ReinforcementsEditorDialog.cpp
@@ -27,7 +27,7 @@ void ReinforcementsDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ReinforcementsDialog::reject()
diff --git a/qtfred/src/ui/dialogs/ShieldSystemDialog.cpp b/qtfred/src/ui/dialogs/ShieldSystemDialog.cpp
@@ -29,7 +29,7 @@ void ShieldSystemDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ShieldSystemDialog::reject()
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipAltShipClass.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipAltShipClass.cpp
@@ -25,7 +25,7 @@ void ShipAltShipClass::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ShipAltShipClass::reject()
@@ -210,7 +210,6 @@ void ShipAltShipClass::initUI()
 void ShipAltShipClass::updateUI()
 {
 	util::SignalBlockers blockers(this); // block signals while we set up the UI
-	QModelIndexList* list;
 	auto current = ui->classList->currentIndex();
 	auto ship_class = -1;
 	auto variable = -1;
@@ -223,32 +222,36 @@ void ShipAltShipClass::updateUI()
 	if (ui->variableCombo->model()->rowCount() <= 1) {
 		dynamic_cast<InverseSortFilterProxyModel*>(ui->shipCombo->model())->setFilterFixedString("Set From Variable");
 	}
-	list = new QModelIndexList(
-		ui->shipCombo->model()->match(ui->shipCombo->model()->index(0, 0), Qt::UserRole, ship_class));
-	if (!list->empty()) {
-		ui->shipCombo->setCurrentIndex(list->first().row());
-	} else {
-		if (ui->classList->model()->rowCount() != 0 && ship_class != -1) {
-			_viewport->dialogProvider->showButtonDialog(DialogType::Error,
-				"Error",
-				"Illegal ship class.\n Resetting to -1",
-				{DialogButton::Ok});
+	{
+		QModelIndexList shipMatches =
+			ui->shipCombo->model()->match(ui->shipCombo->model()->index(0, 0), Qt::UserRole, ship_class);
+		if (!shipMatches.empty()) {
+			ui->shipCombo->setCurrentIndex(shipMatches.first().row());
+		} else {
+			if (ui->classList->model()->rowCount() != 0 && ship_class != -1) {
+				_viewport->dialogProvider->showButtonDialog(DialogType::Error,
+					"Error",
+					"Illegal ship class.\n Resetting to -1",
+					{DialogButton::Ok});
+			}
+			ui->shipCombo->setCurrentIndex(0);
 		}
-		ui->shipCombo->setCurrentIndex(0);
 	}
 
-	auto varlist = new QModelIndexList(
-		ui->variableCombo->model()->match(ui->variableCombo->model()->index(0, 0), Qt::UserRole, variable));
-	if (!varlist->empty()) {
-		ui->variableCombo->setCurrentIndex(varlist->first().row());
-	} else {
-		if (ui->classList->model()->rowCount() != 0) {
-			_viewport->dialogProvider->showButtonDialog(DialogType::Error,
-				"Error",
-				"Illegal variable index.\n Resetting to -1",
-				{DialogButton::Ok});
+	{
+		QModelIndexList varMatches =
+			ui->variableCombo->model()->match(ui->variableCombo->model()->index(0, 0), Qt::UserRole, variable);
+		if (!varMatches.empty()) {
+			ui->variableCombo->setCurrentIndex(varMatches.first().row());
+		} else {
+			if (ui->classList->model()->rowCount() != 0) {
+				_viewport->dialogProvider->showButtonDialog(DialogType::Error,
+					"Error",
+					"Illegal variable index.\n Resetting to -1",
+					{DialogButton::Ok});
+			}
+			ui->variableCombo->setCurrentIndex(0);
 		}
-		ui->variableCombo->setCurrentIndex(0);
 	}
 
 	if (ui->variableCombo->model()->rowCount() <= 1) {
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipCustomWarpDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipCustomWarpDialog.cpp
@@ -80,24 +80,14 @@ void ShipCustomWarpDialog::on_comboBoxType_currentIndexChanged(int index)
 	_model->setType(index);
 }
 void ShipCustomWarpDialog::on_lineEditStartSound_editingFinished()
-{ // String wrangling reqired in order to avoid crashes when directly converting from Qstring to std::string on some
-	// enviroments
-	QString temp(ui->lineEditStartSound->text());
-	if (!temp.isEmpty()) {
-		_model->setStartSound(temp.toLatin1().constData());
-	} else {
-		_model->setStartSound("");
-	}
+{
+	SCP_string startSound = ui->lineEditStartSound->text().toUtf8().constData();
+	_model->setStartSound(startSound);
 }
 void ShipCustomWarpDialog::on_lineEditEndSound_editingFinished()
-{ // String wrangling reqired in order to avoid crashes when directly converting from Qstring to std::string on some
-	// enviroments
-	QString temp(ui->lineEditEndSound->text());
-	if (!temp.isEmpty()) {
-		_model->setEndSound(temp.toLatin1().constData());
-	} else {
-		_model->setEndSound("");
-	}
+{
+	SCP_string endSound = ui->lineEditEndSound->text().toUtf8().constData();
+	_model->setEndSound(endSound);
 }
 void ShipCustomWarpDialog::on_doubleSpinBoxEngage_valueChanged(double value)
 {
@@ -120,14 +110,9 @@ void ShipCustomWarpDialog::on_doubleSpinBoxRadius_valueChanged(double value)
 	_model->setRadius(value);
 }
 void ShipCustomWarpDialog::on_lineEditAnim_editingFinished()
-{ // String wrangling reqired in order to avoid crashes when directly converting from Qstring to std::string on some
-	// enviroments
-	QString temp(ui->lineEditAnim->text());
-	if (!temp.isEmpty()) {
-		_model->setAnim(temp.toLatin1().constData());
-	} else {
-		_model->setAnim("");
-	}
+{
+	SCP_string anim = ui->lineEditAnim->text().toUtf8().constData();
+	_model->setAnim(anim);
 }
 void ShipCustomWarpDialog::on_checkBoxSupercap_toggled(bool state)
 {
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.cpp
@@ -32,7 +32,6 @@ ShipEditorDialog::ShipEditorDialog(FredView* parent, EditorViewport* viewport)
 	ui->callsignCombo->lineEdit()->setMaxLength(CALLSIGN_LEN);
 
 	connect(_model.get(), &AbstractDialogModel::modelChanged, this, [this] { updateUI(false); });
-	connect(this, &QDialog::accepted, _model.get(), &ShipEditorDialogModel::apply);
 	connect(viewport->editor, &Editor::currentObjectChanged, this, &ShipEditorDialog::update);
 	connect(viewport->editor, &Editor::objectMarkingChanged, this, &ShipEditorDialog::update);
 
@@ -69,8 +68,6 @@ bool ShipEditorDialog::getIfMultipleShips() const
 
 void ShipEditorDialog::closeEvent(QCloseEvent* e)
 {
-	util::SignalBlockers blockers(this);
-	_model->apply();
 	_viewport->editor->autosave("ship editor");
 	QDialog::closeEvent(e);
 }
@@ -118,9 +115,6 @@ void ShipEditorDialog::on_tblInfoButton_clicked()
 void ShipEditorDialog::update()
 {
 	if (this->isVisible()) {
-		if (_model->getNumSelectedObjects() && _model->query_modified()) {
-			_model->apply();
-		}
 		_model->initializeData();
 		updateUI(true);
 	}
@@ -206,10 +200,11 @@ void ShipEditorDialog::updateColumnOne(bool overwrite)
 				for (auto j = 0; j < Mission_alt_type_count; j++) {
 					ui->altNameCombo->addItem(Mission_alt_types[j]);
 				}
-				if (ui->altNameCombo->findText(QString(altname.c_str()))) {
-					ui->altNameCombo->setCurrentIndex(ui->altNameCombo->findText(QString(altname.c_str())));
+				int altNameIdx = ui->altNameCombo->findText(QString(altname.c_str()));
+				if (altNameIdx >= 0) {
+					ui->altNameCombo->setCurrentIndex(altNameIdx);
 				} else {
-					ui->altNameCombo->setCurrentIndex(ui->altNameCombo->findText("<none>"));
+					ui->altNameCombo->setEditText("<none>");
 				}
 			}
 		}
@@ -218,19 +213,19 @@ void ShipEditorDialog::updateColumnOne(bool overwrite)
 		if (_model->getIfMultipleShips()) {
 			ui->callsignCombo->setEnabled(false);
 		} else {
-			ui->callsignCombo->clear();
 			auto callsign = _model->getCallsign();
 			ui->callsignCombo->setEnabled(true);
 			if (overwrite) {
+				ui->callsignCombo->clear();
 				ui->callsignCombo->addItem("<none>");
 				for (auto j = 0; j < Mission_callsign_count; j++) {
 					ui->callsignCombo->addItem(Mission_callsigns[j], QVariant(Mission_callsigns[j]));
 				}
-
-				if (ui->callsignCombo->findText(QString(callsign.c_str()))) {
-					ui->callsignCombo->setCurrentIndex(ui->callsignCombo->findText(QString(callsign.c_str())));
+				int callsignIdx = ui->callsignCombo->findText(QString(callsign.c_str()));
+				if (callsignIdx >= 0) {
+					ui->callsignCombo->setCurrentIndex(callsignIdx);
 				} else {
-					ui->altNameCombo->setCurrentIndex(ui->callsignCombo->findText("<none>"));
+					ui->callsignCombo->setEditText("<none>");
 				}
 			}
 		}
@@ -863,32 +858,32 @@ void ShipEditorDialog::on_departureLocationCombo_currentIndexChanged(int index)
 	auto depLocationIdx = ui->departureLocationCombo->itemData(index).toInt();
 	_model->setDepartureLocationIndex(depLocationIdx);
 }
-void fred::dialogs::ShipEditorDialog::on_departureTargetCombo_currentIndexChanged(int index)
+void ShipEditorDialog::on_departureTargetCombo_currentIndexChanged(int index)
 {
 	auto depLocationIdx = ui->departureTargetCombo->itemData(index).toInt();
 	_model->setDepartureTarget(depLocationIdx);
 }
-void fred::dialogs::ShipEditorDialog::on_departureDelaySpinBox_valueChanged(int value)
+void ShipEditorDialog::on_departureDelaySpinBox_valueChanged(int value)
 {
 	_model->setDepartureDelay(value);
 }
-void fred::dialogs::ShipEditorDialog::on_updateDepartureCueCheckBox_toggled(bool value)
+void ShipEditorDialog::on_updateDepartureCueCheckBox_toggled(bool value)
 {
 	_model->setDepartureCue(value);
 }
-void fred::dialogs::ShipEditorDialog::on_departureTree_rootNodeFormulaChanged(int old, int node)
+void ShipEditorDialog::on_departureTree_rootNodeFormulaChanged(int old, int node)
 {
 	_model->setDepartureFormula(old, node);
 }
-void fred::dialogs::ShipEditorDialog::on_departureTree_helpChanged(const QString& help)
+void ShipEditorDialog::on_departureTree_helpChanged(const QString& help)
 {
 	ui->helpText->setPlainText(help);
 }
-void fred::dialogs::ShipEditorDialog::on_departureTree_miniHelpChanged(const QString& help)
+void ShipEditorDialog::on_departureTree_miniHelpChanged(const QString& help)
 {
 	ui->HelpTitle->setText(help);
 }
-void fred::dialogs::ShipEditorDialog::on_noDepartureWarpCheckBox_toggled(bool value)
+void ShipEditorDialog::on_noDepartureWarpCheckBox_toggled(bool value)
 {
 	_model->setNoDepartureWarp(value);
 }
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipFlagsDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipFlagsDialog.cpp
@@ -45,7 +45,7 @@ void ShipFlagsDialog::accept() {
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ShipFlagsDialog::reject() {
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipGoalsDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipGoalsDialog.cpp
@@ -108,7 +108,7 @@ void ShipGoalsDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ShipGoalsDialog::reject()
@@ -316,11 +316,14 @@ void ShipGoalsDialog::updateUI()
 				_model->setDock(i, -1);
 				ship_subsys* cur_subsys;
 				auto subsysvalue = _model->getSubsys(i);
-				cur_subsys = GET_FIRST(&Ships[i].subsys_list);
-				while (cur_subsys != END_OF_LIST(&Ships[i].subsys_list)) {
-					subsys[i]->addItem(cur_subsys->system_info->subobj_name,
-						QVariant(QString(cur_subsys->system_info->subobj_name)));
-					cur_subsys = GET_NEXT(cur_subsys);
+				int target_ship_idx = _model->getObject(i) & DATA_MASK;
+				if (target_ship_idx >= 0 && target_ship_idx < MAX_SHIPS) {
+					cur_subsys = GET_FIRST(&Ships[target_ship_idx].subsys_list);
+					while (cur_subsys != END_OF_LIST(&Ships[target_ship_idx].subsys_list)) {
+						subsys[i]->addItem(cur_subsys->system_info->subobj_name,
+							QVariant(QString(cur_subsys->system_info->subobj_name)));
+						cur_subsys = GET_NEXT(cur_subsys);
+					}
 				}
 				if (subsysvalue.empty()) {
 					subsys[i]->setCurrentIndex(0);
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipInitialStatusDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipInitialStatusDialog.cpp
@@ -127,15 +127,13 @@ void ShipInitialStatusDialog::on_subIntegritySpinBox_valueChanged(int value)
 }
 void ShipInitialStatusDialog::on_cargoEdit_editingFinished()
 {
-	auto cargo = ui->cargoEdit->text();
-	auto cargofixed = cargo.toUtf8();
-	_model->setCargo(cargofixed.toStdString());
+	SCP_string cargo = ui->cargoEdit->text().toUtf8().constData();
+	_model->setCargo(cargo);
 }
 void ShipInitialStatusDialog::on_colourComboBox_currentIndexChanged(int index)
 {
-	auto string = ui->colourComboBox->itemText(index);
-	auto stringfixed = string.toUtf8();
-	_model->setColour(stringfixed.toStdString());
+	SCP_string colour = ui->colourComboBox->itemText(index).toUtf8().constData();
+	_model->setColour(colour);
 }
 void ShipInitialStatusDialog::on_okPushButton_clicked()
 {
@@ -327,9 +325,6 @@ void ShipInitialStatusDialog::list_dockees(int dock_types)
 }
 void ShipInitialStatusDialog::list_dockee_points(int shipnum)
 {
-	ship* shipp = &Ships[_model->getShip()];
-	ship* other_shipp = &Ships[shipnum];
-
 	// enable/disable dropdown
 	ui->dockeePointComboBox->setEnabled((shipnum >= 0));
 
@@ -341,6 +336,9 @@ void ShipInitialStatusDialog::list_dockee_points(int shipnum)
 		return;
 	}
 
+	ship* shipp = &Ships[_model->getShip()];
+	ship* other_shipp = &Ships[shipnum];
+
 	// get the required dock type(s)
 	int dock_type = model_get_dock_index_type(Ship_info[shipp->ship_info_index].model_num, cur_docker_point);
 
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipSpecialStatsDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipSpecialStatsDialog.cpp
@@ -30,7 +30,7 @@ void ShipSpecialStatsDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void ShipSpecialStatsDialog::reject()
diff --git a/qtfred/src/ui/dialogs/VariableDialog.cpp b/qtfred/src/ui/dialogs/VariableDialog.cpp
@@ -44,7 +44,7 @@ void VariableDialog::accept()
 	if (_model->apply()) {
 		QDialog::accept();
 	}
-	// else: validation failed, don�t close
+	// else: validation failed, don't close
 }
 
 void VariableDialog::reject()
diff --git a/qtfred/ui/ShipEditorDialog.ui b/qtfred/ui/ShipEditorDialog.ui

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void FictionViewerDialog::accept()`
`39`	`39`	`if (_model->apply()) {`
`40`	`40`	`QDialog::accept();`
`41`	`41`	`}`
`42`		`- // else: validation failed, don’t close`
	`42`	`+ // else: validation failed, don't close`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void FictionViewerDialog::reject()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void CustomDataDialog::accept()`
`42`	`42`	`if (_model->apply()) {`
`43`	`43`	`QDialog::accept();`
`44`	`44`	`}`
`45`		`- // else: validation failed, don’t close`
	`45`	`+ // else: validation failed, don't close`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`void CustomDataDialog::reject()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void CustomStringsDialog::accept()`
`42`	`42`	`if (_model->apply()) {`
`43`	`43`	`QDialog::accept();`
`44`	`44`	`}`
`45`		`- // else: validation failed, don’t close`
	`45`	`+ // else: validation failed, don't close`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`void CustomStringsDialog::reject()`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ void ReinforcementsDialog::accept()`
`27`	`27`	`if (_model->apply()) {`
`28`	`28`	`QDialog::accept();`
`29`	`29`	`}`
`30`		`- // else: validation failed, don’t close`
	`30`	`+ // else: validation failed, don't close`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`void ReinforcementsDialog::reject()`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void ShieldSystemDialog::accept()`
`29`	`29`	`if (_model->apply()) {`
`30`	`30`	`QDialog::accept();`
`31`	`31`	`}`
`32`		`- // else: validation failed, don’t close`
	`32`	`+ // else: validation failed, don't close`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`void ShieldSystemDialog::reject()`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ ShipEditorDialog::ShipEditorDialog(FredView* parent, EditorViewport* viewport)`
`32`	`32`	`ui->callsignCombo->lineEdit()->setMaxLength(CALLSIGN_LEN);`
`33`	`33`
`34`	`34`	`connect(_model.get(), &AbstractDialogModel::modelChanged, this, [this] { updateUI(false); });`
`35`		`- connect(this, &QDialog::accepted, _model.get(), &ShipEditorDialogModel::apply);`
`36`	`35`	`connect(viewport->editor, &Editor::currentObjectChanged, this, &ShipEditorDialog::update);`
`37`	`36`	`connect(viewport->editor, &Editor::objectMarkingChanged, this, &ShipEditorDialog::update);`
`38`	`37`
`@@ -69,8 +68,6 @@ bool ShipEditorDialog::getIfMultipleShips() const`
`69`	`68`
`70`	`69`	`void ShipEditorDialog::closeEvent(QCloseEvent* e)`
`71`	`70`	`{`
`72`		`- util::SignalBlockers blockers(this);`
`73`		`- _model->apply();`
`74`	`71`	`_viewport->editor->autosave("ship editor");`
`75`	`72`	`QDialog::closeEvent(e);`
`76`	`73`	`}`
`@@ -118,9 +115,6 @@ void ShipEditorDialog::on_tblInfoButton_clicked()`
`118`	`115`	`void ShipEditorDialog::update()`
`119`	`116`	`{`
`120`	`117`	`if (this->isVisible()) {`
`121`		`- if (_model->getNumSelectedObjects() && _model->query_modified()) {`
`122`		`- _model->apply();`
`123`		`- }`
`124`	`118`	`_model->initializeData();`
`125`	`119`	`updateUI(true);`
`126`	`120`	`}`
`@@ -206,10 +200,11 @@ void ShipEditorDialog::updateColumnOne(bool overwrite)`
`206`	`200`	`for (auto j = 0; j < Mission_alt_type_count; j++) {`
`207`	`201`	`ui->altNameCombo->addItem(Mission_alt_types[j]);`
`208`	`202`	`}`
`209`		`- if (ui->altNameCombo->findText(QString(altname.c_str()))) {`
`210`		`- ui->altNameCombo->setCurrentIndex(ui->altNameCombo->findText(QString(altname.c_str())));`
	`203`	`+ int altNameIdx = ui->altNameCombo->findText(QString(altname.c_str()));`
	`204`	`+ if (altNameIdx >= 0) {`
	`205`	`+ ui->altNameCombo->setCurrentIndex(altNameIdx);`
`211`	`206`	`} else {`
`212`		`- ui->altNameCombo->setCurrentIndex(ui->altNameCombo->findText("<none>"));`
	`207`	`+ ui->altNameCombo->setEditText("<none>");`
`213`	`208`	`}`
`214`	`209`	`}`
`215`	`210`	`}`
`@@ -218,19 +213,19 @@ void ShipEditorDialog::updateColumnOne(bool overwrite)`
`218`	`213`	`if (_model->getIfMultipleShips()) {`
`219`	`214`	`ui->callsignCombo->setEnabled(false);`
`220`	`215`	`} else {`
`221`		`- ui->callsignCombo->clear();`
`222`	`216`	`auto callsign = _model->getCallsign();`
`223`	`217`	`ui->callsignCombo->setEnabled(true);`
`224`	`218`	`if (overwrite) {`
	`219`	`+ ui->callsignCombo->clear();`
`225`	`220`	`ui->callsignCombo->addItem("<none>");`
`226`	`221`	`for (auto j = 0; j < Mission_callsign_count; j++) {`
`227`	`222`	`ui->callsignCombo->addItem(Mission_callsigns[j], QVariant(Mission_callsigns[j]));`
`228`	`223`	`}`
`229`		`-`
`230`		`- if (ui->callsignCombo->findText(QString(callsign.c_str()))) {`
`231`		`- ui->callsignCombo->setCurrentIndex(ui->callsignCombo->findText(QString(callsign.c_str())));`
	`224`	`+ int callsignIdx = ui->callsignCombo->findText(QString(callsign.c_str()));`
	`225`	`+ if (callsignIdx >= 0) {`
	`226`	`+ ui->callsignCombo->setCurrentIndex(callsignIdx);`
`232`	`227`	`} else {`
`233`		`- ui->altNameCombo->setCurrentIndex(ui->callsignCombo->findText("<none>"));`
	`228`	`+ ui->callsignCombo->setEditText("<none>");`
`234`	`229`	`}`
`235`	`230`	`}`
`236`	`231`	`}`
`@@ -863,32 +858,32 @@ void ShipEditorDialog::on_departureLocationCombo_currentIndexChanged(int index)`
`863`	`858`	`auto depLocationIdx = ui->departureLocationCombo->itemData(index).toInt();`
`864`	`859`	`_model->setDepartureLocationIndex(depLocationIdx);`
`865`	`860`	`}`
`866`		`-void fred::dialogs::ShipEditorDialog::on_departureTargetCombo_currentIndexChanged(int index)`
	`861`	`+void ShipEditorDialog::on_departureTargetCombo_currentIndexChanged(int index)`
`867`	`862`	`{`
`868`	`863`	`auto depLocationIdx = ui->departureTargetCombo->itemData(index).toInt();`
`869`	`864`	`_model->setDepartureTarget(depLocationIdx);`
`870`	`865`	`}`
`871`		`-void fred::dialogs::ShipEditorDialog::on_departureDelaySpinBox_valueChanged(int value)`
	`866`	`+void ShipEditorDialog::on_departureDelaySpinBox_valueChanged(int value)`
`872`	`867`	`{`
`873`	`868`	`_model->setDepartureDelay(value);`
`874`	`869`	`}`
`875`		`-void fred::dialogs::ShipEditorDialog::on_updateDepartureCueCheckBox_toggled(bool value)`
	`870`	`+void ShipEditorDialog::on_updateDepartureCueCheckBox_toggled(bool value)`
`876`	`871`	`{`
`877`	`872`	`_model->setDepartureCue(value);`
`878`	`873`	`}`
`879`		`-void fred::dialogs::ShipEditorDialog::on_departureTree_rootNodeFormulaChanged(int old, int node)`
	`874`	`+void ShipEditorDialog::on_departureTree_rootNodeFormulaChanged(int old, int node)`
`880`	`875`	`{`
`881`	`876`	`_model->setDepartureFormula(old, node);`
`882`	`877`	`}`
`883`		`-void fred::dialogs::ShipEditorDialog::on_departureTree_helpChanged(const QString& help)`
	`878`	`+void ShipEditorDialog::on_departureTree_helpChanged(const QString& help)`
`884`	`879`	`{`
`885`	`880`	`ui->helpText->setPlainText(help);`
`886`	`881`	`}`
`887`		`-void fred::dialogs::ShipEditorDialog::on_departureTree_miniHelpChanged(const QString& help)`
	`882`	`+void ShipEditorDialog::on_departureTree_miniHelpChanged(const QString& help)`
`888`	`883`	`{`
`889`	`884`	`ui->HelpTitle->setText(help);`
`890`	`885`	`}`
`891`		`-void fred::dialogs::ShipEditorDialog::on_noDepartureWarpCheckBox_toggled(bool value)`
	`886`	`+void ShipEditorDialog::on_noDepartureWarpCheckBox_toggled(bool value)`
`892`	`887`	`{`
`893`	`888`	`_model->setNoDepartureWarp(value);`
`894`	`889`	`}`