1 files changed, 26 insertions, 64 deletions

diff --git a/editor/scene_create_dialog.cpp b/editor/scene_create_dialog.cpp
index 986f6bb87a..8f56267123 100644
--- a/editor/scene_create_dialog.cpp
+++ b/editor/scene_create_dialog.cpp
@@ -34,6 +34,7 @@
 #include "editor/create_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
+#include "editor/gui/editor_validation_panel.h"
 #include "scene/2d/node_2d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/gui/box_container.h"
@@ -41,7 +42,6 @@
 #include "scene/gui/grid_container.h"
 #include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
-#include "scene/gui/panel_container.h"
 #include "scene/resources/packed_scene.h"
 
 void SceneCreateDialog::_notification(int p_what) {
@@ -53,7 +53,6 @@ void SceneCreateDialog::_notification(int p_what) {
 			node_type_3d->set_icon(get_theme_icon(SNAME("Node3D"), SNAME("EditorIcons")));
 			node_type_gui->set_icon(get_theme_icon(SNAME("Control"), SNAME("EditorIcons")));
 			node_type_other->add_theme_icon_override(SNAME("icon"), get_theme_icon(SNAME("Node"), SNAME("EditorIcons")));
-			status_panel->add_theme_style_override("panel", get_theme_stylebox(SNAME("panel"), SNAME("Tree")));
 		} break;
 	}
 }
@@ -63,7 +62,7 @@ void SceneCreateDialog::config(const String &p_dir) {
 	root_name_edit->set_text("");
 	scene_name_edit->set_text("");
 	scene_name_edit->call_deferred(SNAME("grab_focus"));
-	update_dialog();
+	validation_panel->update();
 }
 
 void SceneCreateDialog::accept_create() {
@@ -82,40 +81,35 @@ void SceneCreateDialog::browse_types() {
 void SceneCreateDialog::on_type_picked() {
 	other_type_display->set_text(select_node_dialog->get_selected_type().get_slice(" ", 0));
 	if (node_type_other->is_pressed()) {
-		update_dialog();
+		validation_panel->update();
 	} else {
-		node_type_other->set_pressed(true); // Calls update_dialog() via group.
+		node_type_other->set_pressed(true); // Calls validation_panel->update() via group.
 	}
 }
 
 void SceneCreateDialog::update_dialog() {
 	scene_name = scene_name_edit->get_text().strip_edges();
-	update_error(file_error_label, MSG_OK, TTR("Scene name is valid."));
 
-	bool is_valid = true;
 	if (scene_name.is_empty()) {
-		update_error(file_error_label, MSG_ERROR, TTR("Scene name is empty."));
-		is_valid = false;
+		validation_panel->set_message(MSG_ID_PATH, TTR("Scene name is empty."), EditorValidationPanel::MSG_ERROR);
 	}
 
-	if (is_valid) {
+	if (validation_panel->is_valid()) {
 		if (!scene_name.ends_with(".")) {
 			scene_name += ".";
 		}
 		scene_name += scene_extension_picker->get_selected_metadata().operator String();
 	}
 
-	if (is_valid && !scene_name.is_valid_filename()) {
-		update_error(file_error_label, MSG_ERROR, TTR("File name invalid."));
-		is_valid = false;
+	if (validation_panel->is_valid() && !scene_name.is_valid_filename()) {
+		validation_panel->set_message(MSG_ID_PATH, TTR("File name invalid."), EditorValidationPanel::MSG_ERROR);
 	}
 
-	if (is_valid) {
+	if (validation_panel->is_valid()) {
 		scene_name = directory.path_join(scene_name);
 		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
 		if (da->file_exists(scene_name)) {
-			update_error(file_error_label, MSG_ERROR, TTR("File already exists."));
-			is_valid = false;
+			validation_panel->set_message(MSG_ID_PATH, TTR("File already exists."), EditorValidationPanel::MSG_ERROR);
 		}
 	}
 
@@ -126,8 +120,6 @@ void SceneCreateDialog::update_dialog() {
 		node_type_other->set_icon(nullptr);
 	}
 
-	update_error(node_error_label, MSG_OK, TTR("Root node valid."));
-
 	root_name = root_name_edit->get_text().strip_edges();
 	if (root_name.is_empty()) {
 		root_name = scene_name_edit->get_text().strip_edges();
@@ -135,39 +127,16 @@ void SceneCreateDialog::update_dialog() {
 		if (root_name.is_empty()) {
 			root_name_edit->set_placeholder(TTR("Leave empty to derive from scene name"));
 		} else {
-			// Respect the desired root node casing from ProjectSettings and ensure it's a valid node name.
-			String adjusted_root_name = Node::adjust_name_casing(root_name);
-			root_name = adjusted_root_name.validate_node_name();
-
-			bool has_invalid_characters = root_name != adjusted_root_name;
-			if (has_invalid_characters) {
-				update_error(node_error_label, MSG_WARNING, TTR("Invalid root node name characters have been replaced."));
-			}
-
-			root_name_edit->set_placeholder(root_name);
+			// Respect the desired root node casing from ProjectSettings.
+			root_name = Node::adjust_name_casing(root_name);
+			root_name_edit->set_placeholder(root_name.validate_node_name());
 		}
 	}
 
-	if (root_name.is_empty() || root_name.validate_node_name() != root_name) {
-		update_error(node_error_label, MSG_ERROR, TTR("Invalid root node name."));
-		is_valid = false;
-	}
-
-	get_ok_button()->set_disabled(!is_valid);
-}
-
-void SceneCreateDialog::update_error(Label *p_label, MsgType p_type, const String &p_msg) {
-	p_label->set_text(String::utf8("•  ") + p_msg);
-	switch (p_type) {
-		case MSG_OK:
-			p_label->add_theme_color_override("font_color", get_theme_color(SNAME("success_color"), SNAME("Editor")));
-			break;
-		case MSG_ERROR:
-			p_label->add_theme_color_override("font_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
-			break;
-		case MSG_WARNING:
-			p_label->add_theme_color_override("font_color", get_theme_color(SNAME("warning_color"), SNAME("Editor")));
-			break;
+	if (root_name.is_empty()) {
+		validation_panel->set_message(MSG_ID_ROOT, TTR("Invalid root node name."), EditorValidationPanel::MSG_ERROR);
+	} else if (root_name != root_name.validate_node_name()) {
+		validation_panel->set_message(MSG_ID_ROOT, TTR("Invalid root node name characters have been replaced."), EditorValidationPanel::MSG_WARNING);
 	}
 }
 
@@ -268,8 +237,6 @@ SceneCreateDialog::SceneCreateDialog() {
 		select_node_button = memnew(Button);
 		hb->add_child(select_node_button);
 		select_node_button->connect("pressed", callable_mp(this, &SceneCreateDialog::browse_types));
-
-		node_type_group->connect("pressed", callable_mp(this, &SceneCreateDialog::update_dialog).unbind(1));
 	}
 
 	{
@@ -282,7 +249,6 @@ SceneCreateDialog::SceneCreateDialog() {
 		scene_name_edit = memnew(LineEdit);
 		hb->add_child(scene_name_edit);
 		scene_name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-		scene_name_edit->connect("text_changed", callable_mp(this, &SceneCreateDialog::update_dialog).unbind(1));
 		scene_name_edit->connect("text_submitted", callable_mp(this, &SceneCreateDialog::accept_create).unbind(1));
 
 		List<String> extensions;
@@ -305,7 +271,6 @@ SceneCreateDialog::SceneCreateDialog() {
 		gc->add_child(root_name_edit);
 		root_name_edit->set_tooltip_text(TTR("When empty, the root node name is derived from the scene name based on the \"editor/naming/node_name_casing\" project setting."));
 		root_name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-		root_name_edit->connect("text_changed", callable_mp(this, &SceneCreateDialog::update_dialog).unbind(1));
 		root_name_edit->connect("text_submitted", callable_mp(this, &SceneCreateDialog::accept_create).unbind(1));
 	}
 
@@ -313,19 +278,16 @@ SceneCreateDialog::SceneCreateDialog() {
 	main_vb->add_child(spacing);
 	spacing->set_custom_minimum_size(Size2(0, 10 * EDSCALE));
 
-	status_panel = memnew(PanelContainer);
-	main_vb->add_child(status_panel);
-	status_panel->set_h_size_flags(Control::SIZE_FILL);
-	status_panel->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-
-	VBoxContainer *status_vb = memnew(VBoxContainer);
-	status_panel->add_child(status_vb);
-
-	file_error_label = memnew(Label);
-	status_vb->add_child(file_error_label);
+	validation_panel = memnew(EditorValidationPanel);
+	main_vb->add_child(validation_panel);
+	validation_panel->add_line(MSG_ID_PATH, TTR("Scene name is valid."));
+	validation_panel->add_line(MSG_ID_ROOT, TTR("Root node valid."));
+	validation_panel->set_update_callback(callable_mp(this, &SceneCreateDialog::update_dialog));
+	validation_panel->set_accept_button(get_ok_button());
 
-	node_error_label = memnew(Label);
-	status_vb->add_child(node_error_label);
+	node_type_group->connect("pressed", callable_mp(validation_panel, &EditorValidationPanel::update).unbind(1));
+	scene_name_edit->connect("text_changed", callable_mp(validation_panel, &EditorValidationPanel::update).unbind(1));
+	root_name_edit->connect("text_changed", callable_mp(validation_panel, &EditorValidationPanel::update).unbind(1));
 
 	set_title(TTR("Create New Scene"));
 	set_min_size(Size2i(400 * EDSCALE, 0));