godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59602 from Calinou/editor-improve-add-metadata-dialog

This commit is contained in:
Rémi Verschelde 2022-09-01 23:47:49 +02:00
parent 5263fd5343 8611b712dc
commit 4fc86b2ce5
2 changed files with 24 additions and 10 deletions
Show Stats 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();
}
void EditorInspector::_check_meta_name(String name) {
void EditorInspector::_check_meta_name(const String &p_name) {
String error;
if (name == "") {
error = TTR("Metadata can't be empty.");
} else if (!name.is_valid_identifier()) {
error = TTR("Invalid metadata identifier.");
} else if (object->has_meta(name)) {
error = TTR("Metadata already exists.");
} else if (name[0] == '_') {
if (p_name == "") {
error = TTR("Metadata name can't be empty.");
} else if (!p_name.is_valid_identifier()) {
error = TTR("Metadata name must be a valid identifier.");
} else if (object->has_meta(p_name)) {
Node *node = Object::cast_to<Node>(object);
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.");
}
@ -3976,7 +3982,15 @@ void EditorInspector::_check_meta_name(String name) {
void EditorInspector::_show_add_meta_dialog() {
if (!add_meta_dialog) {
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);
add_meta_dialog->add_child(vbc);
HBoxContainer *hbc = memnew(HBoxContainer);

2
editor/editor_inspector.h
View File

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