Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve the editor's Add Metadata dialog

Browse source 
- Mention the node name in the dialog title.
- Improve error messages to be more descriptive.
This commit is contained in:
Hugo Locurcio 2022-03-27 23:38:00 +02:00
parent f02134a8c0
commit 8611b712dc
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
editor/editor_inspector.cpp
View file

@ -3949,16 +3949,22 @@ void EditorInspector::_add_meta_confirm() {
undo_redo->commit_action(); undo_redo->commit_action();
} }
void EditorInspector::_check_meta_name(String name) { void EditorInspector::_check_meta_name(const String &p_name) {
String error; String error;
if (name == "") { if (p_name == "") {
error = TTR("Metadata can't be empty."); error = TTR("Metadata name can't be empty.");
} else if (!name.is_valid_identifier()) { } else if (!p_name.is_valid_identifier()) {
error = TTR("Invalid metadata identifier."); error = TTR("Metadata name must be a valid identifier.");
} else if (object->has_meta(name)) { } else if (object->has_meta(p_name)) {
error = TTR("Metadata already exists."); Node *node = Object::cast_to<Node>(object);
} else if (name[0] == '_') { if (node) {
error = vformat(TTR("Metadata with name \"%s\" already exists on \"%s\"."), p_name, node->get_name());
} else {
// This should normally never be reached, but the error is set just in case.
error = vformat(TTR("Metadata with name \"%s\" already exists."), p_name, node->get_name());
}
} else if (p_name[0] == '_') {
error = TTR("Names starting with _ are reserved for editor-only metadata."); error = TTR("Names starting with _ are reserved for editor-only metadata.");
} }
@ -3976,7 +3982,15 @@ void EditorInspector::_check_meta_name(String name) {
void EditorInspector::_show_add_meta_dialog() { void EditorInspector::_show_add_meta_dialog() {
if (!add_meta_dialog) { if (!add_meta_dialog) {
add_meta_dialog = memnew(ConfirmationDialog); add_meta_dialog = memnew(ConfirmationDialog);
add_meta_dialog->set_title(TTR("Add Metadata Property"));
Node *node = Object::cast_to<Node>(object);
if (node) {
add_meta_dialog->set_title(vformat(TTR("Add Metadata Property for \"%s\""), node->get_name()));
} else {
// This should normally never be reached, but the title is set just in case.
add_meta_dialog->set_title(vformat(TTR("Add Metadata Property"), node->get_name()));
}
VBoxContainer *vbc = memnew(VBoxContainer); VBoxContainer *vbc = memnew(VBoxContainer);
add_meta_dialog->add_child(vbc); add_meta_dialog->add_child(vbc);
HBoxContainer *hbc = memnew(HBoxContainer); HBoxContainer *hbc = memnew(HBoxContainer);

2
editor/editor_inspector.h
View file

@ -538,7 +538,7 @@ class EditorInspector : public ScrollContainer {
void _add_meta_confirm(); void _add_meta_confirm();
void _show_add_meta_dialog(); void _show_add_meta_dialog();
void _check_meta_name(String name); void _check_meta_name(const String &p_name);
protected: protected:
static void _bind_methods(); static void _bind_methods();