QtFred layer dropdowns in object dialogs (#7385)

MjnMixael · web-flow · commit be6594d786ba · 2026-04-24T07:31:14.000-04:00
* layer dropdowns in object dialogs

* fix rebase issue

* silence Claude
diff --git a/qtfred/src/mission/dialogs/JumpNodeEditorDialogModel.cpp b/qtfred/src/mission/dialogs/JumpNodeEditorDialogModel.cpp
@@ -376,4 +376,26 @@ bool JumpNodeEditorDialogModel::getHidden() const
 	return _hidden;
 }
 
+SCP_string JumpNodeEditorDialogModel::getLayer() const
+{
+	if (_currentlySelectedNodeIndex < 0)
+		return "";
+	int objnum = getSelectedJumpNodeObjnum(_currentlySelectedNodeIndex);
+	if (objnum < 0)
+		return "";
+	return _viewport->getObjectLayerName(objnum);
+}
+
+void JumpNodeEditorDialogModel::setLayer(const SCP_string& v)
+{
+	if (_currentlySelectedNodeIndex < 0)
+		return;
+	int objnum = getSelectedJumpNodeObjnum(_currentlySelectedNodeIndex);
+	if (objnum < 0)
+		return;
+	_viewport->moveObjectToLayer(objnum, v);
+	set_modified();
+	_editor->missionChanged();
+}
+
 } // namespace fso::fred::dialogs
diff --git a/qtfred/src/mission/dialogs/JumpNodeEditorDialogModel.h b/qtfred/src/mission/dialogs/JumpNodeEditorDialogModel.h
@@ -35,6 +35,9 @@ class JumpNodeEditorDialogModel : public AbstractDialogModel {
 	void setHidden(bool v);
 	bool getHidden() const;
 
+	SCP_string getLayer() const;
+	void setLayer(const SCP_string& v);
+
   signals:
 	void jumpNodeMarkingChanged();
 
diff --git a/qtfred/src/mission/dialogs/PropEditorDialogModel.cpp b/qtfred/src/mission/dialogs/PropEditorDialogModel.cpp
@@ -280,6 +280,35 @@ void PropEditorDialogModel::setFlagState(size_t index, int state) {
 	}
 }
 
+SCP_string PropEditorDialogModel::getLayer() const
+{
+	SCP_string result;
+	bool first = true;
+	for (auto obj_idx : _selectedPropObjects) {
+		if (!query_valid_object(obj_idx) || Objects[obj_idx].type != OBJ_PROP)
+			continue;
+		SCP_string layer = _viewport->getObjectLayerName(obj_idx);
+		if (first) {
+			result = layer;
+			first = false;
+		} else if (result != layer) {
+			return "";
+		}
+	}
+	return result;
+}
+
+void PropEditorDialogModel::setLayer(const SCP_string& layer)
+{
+	for (auto obj_idx : _selectedPropObjects) {
+		if (!query_valid_object(obj_idx) || Objects[obj_idx].type != OBJ_PROP)
+			continue;
+		_viewport->moveObjectToLayer(obj_idx, layer);
+	}
+	set_modified();
+	_editor->missionChanged();
+}
+
 void PropEditorDialogModel::selectNextProp() {
 	if (!hasValidSelection()) {
 		if (hasAnyPropsInMission()) {
diff --git a/qtfred/src/mission/dialogs/PropEditorDialogModel.h b/qtfred/src/mission/dialogs/PropEditorDialogModel.h
@@ -28,6 +28,9 @@ class PropEditorDialogModel : public AbstractDialogModel {
 	void selectNextProp();
 	void selectPreviousProp();
 
+	SCP_string getLayer() const;
+	void setLayer(const SCP_string& layer);
+
  signals:
 	void modelDataChanged();
 
diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.cpp b/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.cpp
@@ -518,6 +518,26 @@ void ShipEditorDialogModel::initializeData()
 		arrivalPaths.clear();
 		departurePaths.clear();
 	}
+
+	// Compute common layer across all marked ships/players
+	{
+		_m_layer = "";
+		bool first = true;
+		for (auto* ptr = GET_FIRST(&obj_used_list); ptr != END_OF_LIST(&obj_used_list); ptr = GET_NEXT(ptr)) {
+			if (((ptr->type == OBJ_SHIP) || (ptr->type == OBJ_START)) &&
+				ptr->flags[Object::Object_Flags::Marked]) {
+				SCP_string layer = _viewport->getObjectLayerName(OBJ_INDEX(ptr));
+				if (first) {
+					_m_layer = layer;
+					first = false;
+				} else if (_m_layer != layer) {
+					_m_layer = "";
+					break;
+				}
+			}
+		}
+	}
+
 	modelChanged();
 }
 
@@ -898,6 +918,30 @@ int ShipEditorDialogModel::getTeam() const
 	return _m_team;
 }
 
+SCP_string ShipEditorDialogModel::getLayer() const
+{
+	return _m_layer;
+}
+
+void ShipEditorDialogModel::setLayer(const SCP_string& layer)
+{
+	if (_m_layer == layer)
+		return;
+	_m_layer = layer;
+
+	for (auto objp = GET_FIRST(&obj_used_list); objp != END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp)) {
+		if (objp->flags[Object::Object_Flags::Marked]) {
+			if (objp->type == OBJ_SHIP || objp->type == OBJ_START) {
+				int obj_idx = OBJ_INDEX(objp);
+				_viewport->moveObjectToLayer(obj_idx, layer);
+			}
+		}
+	}
+	set_modified();
+	_editor->missionChanged();
+	modelChanged();
+}
+
 void ShipEditorDialogModel::setCargo(const SCP_string& m_cargo)
 {
 	if (_m_cargo1 == m_cargo)
diff --git a/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.h b/qtfred/src/mission/dialogs/ShipEditor/ShipEditorDialogModel.h
@@ -24,6 +24,7 @@ class ShipEditorDialogModel : public AbstractDialogModel {
 	SCP_string _m_callsign;
 	int _m_ship_class;
 	int _m_team;
+	SCP_string _m_layer;
 	int _m_arrival_location;
 	int _m_departure_location;
 	int _m_ai_class;
@@ -94,6 +95,9 @@ class ShipEditorDialogModel : public AbstractDialogModel {
 	void setTeam(const int);
 	int getTeam() const;
 
+	void setLayer(const SCP_string& layer);
+	SCP_string getLayer() const;
+
 	void setCargo(const SCP_string&);
 	SCP_string getCargo() const;
 
diff --git a/qtfred/src/mission/dialogs/WaypointEditorDialogModel.cpp b/qtfred/src/mission/dialogs/WaypointEditorDialogModel.cpp
@@ -243,6 +243,44 @@ const SCP_vector<std::pair<SCP_string, int>>& WaypointEditorDialogModel::getWayp
 	return _waypointPathList;
 }
 
+SCP_string WaypointEditorDialogModel::getLayer() const
+{
+	if (_editor->cur_waypoint_list == nullptr)
+		return "";
+
+	int listIndex = find_index_of_waypoint_list(_editor->cur_waypoint_list);
+	SCP_string result;
+	bool first = true;
+
+	for (auto* ptr = GET_FIRST(&obj_used_list); ptr != END_OF_LIST(&obj_used_list); ptr = GET_NEXT(ptr)) {
+		if (ptr->type == OBJ_WAYPOINT && calc_waypoint_list_index(ptr->instance) == listIndex) {
+			SCP_string layer = _viewport->getObjectLayerName(OBJ_INDEX(ptr));
+			if (first) {
+				result = layer;
+				first = false;
+			} else if (result != layer) {
+				return "";
+			}
+		}
+	}
+	return result;
+}
+
+void WaypointEditorDialogModel::setLayer(const SCP_string& layer)
+{
+	if (_editor->cur_waypoint_list == nullptr)
+		return;
+
+	int listIndex = find_index_of_waypoint_list(_editor->cur_waypoint_list);
+	for (auto* ptr = GET_FIRST(&obj_used_list); ptr != END_OF_LIST(&obj_used_list); ptr = GET_NEXT(ptr)) {
+		if (ptr->type == OBJ_WAYPOINT && calc_waypoint_list_index(ptr->instance) == listIndex) {
+			_viewport->moveObjectToLayer(OBJ_INDEX(ptr), layer);
+		}
+	}
+	set_modified();
+	_editor->missionChanged();
+}
+
 bool WaypointEditorDialogModel::getNoDrawLines() const { return _noDrawLines; }
 void WaypointEditorDialogModel::setNoDrawLines(bool val) { modify(_noDrawLines, val); }
 
diff --git a/qtfred/src/mission/dialogs/WaypointEditorDialogModel.h b/qtfred/src/mission/dialogs/WaypointEditorDialogModel.h
@@ -31,6 +31,9 @@ class WaypointEditorDialogModel: public AbstractDialogModel {
 	bool isEnabled() const;
 	const SCP_vector<std::pair<SCP_string, int>>& getWaypointPathList() const;
 
+	SCP_string getLayer() const;
+	void setLayer(const SCP_string& layer);
+
 signals:
 	void waypointPathMarkingChanged();
 	
diff --git a/qtfred/src/ui/dialogs/JumpNodeEditorDialog.cpp b/qtfred/src/ui/dialogs/JumpNodeEditorDialog.cpp
@@ -56,7 +56,7 @@ void JumpNodeEditorDialog::updateJumpNodeListComboBox()
 void JumpNodeEditorDialog::updateUi()
 {
 	util::SignalBlockers blockers(this);
-	
+
 	ui->nameLineEdit->setText(QString::fromStdString(_model->getName()));
 	ui->displayNameLineEdit->setText(QString::fromStdString(_model->getDisplayName()));
 	ui->modelFileLineEdit->setText(QString::fromStdString(_model->getModelFilename()));
@@ -67,6 +67,12 @@ void JumpNodeEditorDialog::updateUi()
 	ui->alphaSpinBox->setValue(_model->getColorA());
 
 	ui->hiddenByDefaultCheckBox->setChecked(_model->getHidden());
+
+	ui->layerCombo->clear();
+	for (const auto& name : _viewport->getLayerNames()) {
+		ui->layerCombo->addItem(QString::fromStdString(name), QString::fromStdString(name));
+	}
+	ui->layerCombo->setCurrentIndex(ui->layerCombo->findData(QString::fromStdString(_model->getLayer())));
 }
 
 void JumpNodeEditorDialog::enableOrDisableControls()
@@ -81,6 +87,7 @@ void JumpNodeEditorDialog::enableOrDisableControls()
 	ui->blueSpinBox->setEnabled(enable);
 	ui->alphaSpinBox->setEnabled(enable);
 	ui->hiddenByDefaultCheckBox->setEnabled(enable);
+	ui->layerCombo->setEnabled(enable);
 }
 
 void JumpNodeEditorDialog::on_selectJumpNodeComboBox_currentIndexChanged(int index)
@@ -131,4 +138,11 @@ void JumpNodeEditorDialog::on_hiddenByDefaultCheckBox_toggled(bool checked)
 	_model->setHidden(checked);
 }
 
-} // namespace fso::fred::dialogs
+void JumpNodeEditorDialog::on_layerCombo_currentIndexChanged(int index)
+{
+	if (index < 0)
+		return;
+	_model->setLayer(ui->layerCombo->itemData(index).toString().toUtf8().constData());
+}
+
+} // namespace fso::fred::dialogs
diff --git a/qtfred/src/ui/dialogs/JumpNodeEditorDialog.h b/qtfred/src/ui/dialogs/JumpNodeEditorDialog.h
@@ -26,6 +26,7 @@ class JumpNodeEditorDialog : public QDialog {
 	void on_blueSpinBox_valueChanged(int value);
 	void on_alphaSpinBox_valueChanged(int value);
 	void on_hiddenByDefaultCheckBox_toggled(bool checked);
+	void on_layerCombo_currentIndexChanged(int index);
 
   private: // NOLINT(readability-redundant-access-specifiers)
 	EditorViewport* _viewport;
diff --git a/qtfred/src/ui/dialogs/PropEditorDialog.cpp b/qtfred/src/ui/dialogs/PropEditorDialog.cpp
@@ -11,7 +11,7 @@
 namespace fso::fred::dialogs {
 
 PropEditorDialog::PropEditorDialog(FredView* parent, EditorViewport* viewport)
-	: QDialog(parent), ui(new ::Ui::PropEditorDialog()), _model(new PropEditorDialogModel(this, viewport)) {
+	: QDialog(parent), ui(new ::Ui::PropEditorDialog()), _model(new PropEditorDialogModel(this, viewport)), _viewport(viewport) {
 	ui->setupUi(this);
 
 	ui->propNameLineEdit->setMaxLength(NAME_LENGTH - 1);
@@ -66,18 +66,25 @@ void PropEditorDialog::initializeUi() {
 	ui->propFlagsListWidget->setFilterVisible(true);
 	ui->propFlagsListWidget->setToolbarVisible(true);
 
+	ui->layerCombo->clear();
+	for (const auto& name : _viewport->getLayerNames()) {
+		ui->layerCombo->addItem(QString::fromStdString(name), QString::fromStdString(name));
+	}
+
 	const auto enable = _model->hasValidSelection();
 	const auto has_props = _model->hasAnyPropsInMission();
 	ui->propNameLineEdit->setEnabled(enable && !_model->hasMultipleSelection());
 	ui->propFlagsListWidget->setEnabled(enable);
 	ui->nextButton->setEnabled(has_props);
 	ui->prevButton->setEnabled(has_props);
+	ui->layerCombo->setEnabled(enable);
 }
 
 void PropEditorDialog::updateUi() {
 	util::SignalBlockers blockers(this);
 
 	ui->propNameLineEdit->setText(QString::fromStdString(_model->getPropName()));
+	ui->layerCombo->setCurrentIndex(ui->layerCombo->findData(QString::fromStdString(_model->getLayer())));
 }
 
 void PropEditorDialog::on_propNameLineEdit_editingFinished() {
@@ -95,4 +102,13 @@ void PropEditorDialog::on_prevButton_clicked() {
 	_model->selectPreviousProp();
 }
 
+void PropEditorDialog::on_layerCombo_currentIndexChanged(int index) {
+	if (index < 0)
+		return;
+	_model->setLayer(ui->layerCombo->itemData(index).toString().toUtf8().constData());
+	if (!_model->apply()) {
+		updateUi();
+	}
+}
+
 } // namespace fso::fred::dialogs
diff --git a/qtfred/src/ui/dialogs/PropEditorDialog.h b/qtfred/src/ui/dialogs/PropEditorDialog.h
@@ -22,10 +22,12 @@ class PropEditorDialog : public QDialog {
 	void on_propNameLineEdit_editingFinished();
 	void on_nextButton_clicked();
 	void on_prevButton_clicked();
+	void on_layerCombo_currentIndexChanged(int index);
 
  private: // NOLINT(readability-redundant-access-specifiers)
 	std::unique_ptr<::Ui::PropEditorDialog> ui;
 	std::unique_ptr<PropEditorDialogModel> _model;
+	EditorViewport* _viewport;
 
 	void initializeUi();
 	void updateUi();
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.cpp b/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.cpp
@@ -233,6 +233,14 @@ void ShipEditorDialog::updateColumnOne(bool overwrite)
 			}
 		}
 	}
+
+	// Layer combo — always rebuild so it reflects current mission layers
+	ui->layerCombo->clear();
+	for (const auto& name : _viewport->getLayerNames()) {
+		ui->layerCombo->addItem(QString::fromStdString(name), QString::fromStdString(name));
+	}
+	ui->layerCombo->setCurrentIndex(ui->layerCombo->findData(QString::fromStdString(_model->getLayer())));
+	ui->layerCombo->setEnabled(_model->getNumSelectedObjects() > 0);
 }
 void ShipEditorDialog::updateColumnTwo(bool overwrite)
 {
@@ -798,6 +806,12 @@ void ShipEditorDialog::on_teamCombo_currentIndexChanged(int index)
 	auto teamIdx = ui->teamCombo->itemData(index).toInt();
 	_model->setTeam(teamIdx);
 }
+void ShipEditorDialog::on_layerCombo_currentIndexChanged(int index)
+{
+	if (index < 0)
+		return;
+	_model->setLayer(ui->layerCombo->itemData(index).toString().toUtf8().constData());
+}
 void ShipEditorDialog::on_hotkeyCombo_currentIndexChanged(int index)
 {
 	auto hotkeyIdx = ui->hotkeyCombo->itemData(index).toInt();
diff --git a/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.h b/qtfred/src/ui/dialogs/ShipEditor/ShipEditorDialog.h
@@ -87,6 +87,7 @@ class ShipEditorDialog : public QDialog, public SexpTreeEditorInterface {
 	void on_shipClassCombo_currentIndexChanged(int);
 	void on_AIClassCombo_currentIndexChanged(int);
 	void on_teamCombo_currentIndexChanged(int);
+	void on_layerCombo_currentIndexChanged(int);
 
 	// column two
 	void on_hotkeyCombo_currentIndexChanged(int);
diff --git a/qtfred/src/ui/dialogs/WaypointEditorDialog.cpp b/qtfred/src/ui/dialogs/WaypointEditorDialog.cpp
diff --git a/qtfred/src/ui/dialogs/WaypointEditorDialog.h b/qtfred/src/ui/dialogs/WaypointEditorDialog.h
diff --git a/qtfred/ui/JumpNodeEditorDialog.ui b/qtfred/ui/JumpNodeEditorDialog.ui
diff --git a/qtfred/ui/PropEditorDialog.ui b/qtfred/ui/PropEditorDialog.ui
diff --git a/qtfred/ui/ShipEditorDialog.ui b/qtfred/ui/ShipEditorDialog.ui
diff --git a/qtfred/ui/WaypointEditorDialog.ui b/qtfred/ui/WaypointEditorDialog.ui
diff --git a/qtfred/ui/WingEditorDialog.ui b/qtfred/ui/WingEditorDialog.ui
