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

Rename the Clear Script editor action to Detach Script 

This makes it more obvious that the script won't be modified
in any way.

See comments in #27813.

(cherry picked from commit 7fc0e38e92)
This commit is contained in:
Hugo Locurcio 2020-05-09 18:59:19 +02:00 committed by Rémi Verschelde
parent d7f1a43d1a
commit b1455c68eb
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
editor/scene_tree_dock.cpp
View File

@ -99,8 +99,8 @@ void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) {
_tool_selected(TOOL_DUPLICATE); _tool_selected(TOOL_DUPLICATE);
} else if (ED_IS_SHORTCUT("scene_tree/attach_script", p_event)) { } else if (ED_IS_SHORTCUT("scene_tree/attach_script", p_event)) {
_tool_selected(TOOL_ATTACH_SCRIPT); _tool_selected(TOOL_ATTACH_SCRIPT);
} else if (ED_IS_SHORTCUT("scene_tree/clear_script", p_event)) { } else if (ED_IS_SHORTCUT("scene_tree/detach_script", p_event)) {
_tool_selected(TOOL_CLEAR_SCRIPT); _tool_selected(TOOL_DETACH_SCRIPT);
} else if (ED_IS_SHORTCUT("scene_tree/move_up", p_event)) { } else if (ED_IS_SHORTCUT("scene_tree/move_up", p_event)) {
_tool_selected(TOOL_MOVE_UP); _tool_selected(TOOL_MOVE_UP);
} else if (ED_IS_SHORTCUT("scene_tree/move_down", p_event)) { } else if (ED_IS_SHORTCUT("scene_tree/move_down", p_event)) {
@ -428,7 +428,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
case TOOL_ATTACH_SCRIPT: { case TOOL_ATTACH_SCRIPT: {
attach_script_to_selected(false); attach_script_to_selected(false);
} break; } break;
case TOOL_CLEAR_SCRIPT: { case TOOL_DETACH_SCRIPT: {
if (!profile_allow_script_editing) { if (!profile_allow_script_editing) {
break; break;
@ -439,7 +439,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (selection.empty()) if (selection.empty())
return; return;
editor_data->get_undo_redo().create_action(TTR("Clear Script")); editor_data->get_undo_redo().create_action(TTR("Detach Script"));
editor_data->get_undo_redo().add_do_method(editor, "push_item", (Script *)NULL); editor_data->get_undo_redo().add_do_method(editor, "push_item", (Script *)NULL);
for (int i = 0; i < selection.size(); i++) { for (int i = 0; i < selection.size(); i++) {
@ -1065,7 +1065,7 @@ void SceneTreeDock::_notification(int p_what) {
button_add->set_icon(get_icon("Add", "EditorIcons")); button_add->set_icon(get_icon("Add", "EditorIcons"));
button_instance->set_icon(get_icon("Instance", "EditorIcons")); button_instance->set_icon(get_icon("Instance", "EditorIcons"));
button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons")); button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons"));
button_clear_script->set_icon(get_icon("ScriptRemove", "EditorIcons")); button_detach_script->set_icon(get_icon("ScriptRemove", "EditorIcons"));
filter->set_right_icon(get_icon("Search", "EditorIcons")); filter->set_right_icon(get_icon("Search", "EditorIcons"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
@ -1141,7 +1141,7 @@ void SceneTreeDock::_notification(int p_what) {
button_add->set_icon(get_icon("Add", "EditorIcons")); button_add->set_icon(get_icon("Add", "EditorIcons"));
button_instance->set_icon(get_icon("Instance", "EditorIcons")); button_instance->set_icon(get_icon("Instance", "EditorIcons"));
button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons")); button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons"));
button_clear_script->set_icon(get_icon("ScriptRemove", "EditorIcons")); button_detach_script->set_icon(get_icon("ScriptRemove", "EditorIcons"));
filter->set_right_icon(get_icon("Search", "EditorIcons")); filter->set_right_icon(get_icon("Search", "EditorIcons"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
@ -1876,18 +1876,18 @@ void SceneTreeDock::_update_script_button() {
if (!profile_allow_script_editing) { if (!profile_allow_script_editing) {
button_create_script->hide(); button_create_script->hide();
button_clear_script->hide(); button_detach_script->hide();
} else if (EditorNode::get_singleton()->get_editor_selection()->get_selection().size() == 0) { } else if (EditorNode::get_singleton()->get_editor_selection()->get_selection().size() == 0) {
button_create_script->hide(); button_create_script->hide();
button_clear_script->hide(); button_detach_script->hide();
} else if (EditorNode::get_singleton()->get_editor_selection()->get_selection().size() == 1) { } else if (EditorNode::get_singleton()->get_editor_selection()->get_selection().size() == 1) {
Node *n = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()[0]; Node *n = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()[0];
if (n->get_script().is_null()) { if (n->get_script().is_null()) {
button_create_script->show(); button_create_script->show();
button_clear_script->hide(); button_detach_script->hide();
} else { } else {
button_create_script->hide(); button_create_script->hide();
button_clear_script->show(); button_detach_script->show();
} }
} else { } else {
button_create_script->hide(); button_create_script->hide();
@ -1895,11 +1895,11 @@ void SceneTreeDock::_update_script_button() {
for (int i = 0; i < selection.size(); i++) { for (int i = 0; i < selection.size(); i++) {
Node *n = Object::cast_to<Node>(selection[i]); Node *n = Object::cast_to<Node>(selection[i]);
if (!n->get_script().is_null()) { if (!n->get_script().is_null()) {
button_clear_script->show(); button_detach_script->show();
return; return;
} }
} }
button_clear_script->hide(); button_detach_script->hide();
} }
} }
@ -2451,7 +2451,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
} }
if (existing_script.is_valid() && exisiting_script_removable) { if (existing_script.is_valid() && exisiting_script_removable) {
add_separator = true; add_separator = true;
menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/clear_script"), TOOL_CLEAR_SCRIPT); menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/detach_script"), TOOL_DETACH_SCRIPT);
} else if (full_selection.size() > 1) { } else if (full_selection.size() > 1) {
bool script_exists = false; bool script_exists = false;
for (List<Node *>::Element *E = full_selection.front(); E; E = E->next()) { for (List<Node *>::Element *E = full_selection.front(); E; E = E->next()) {
@ -2463,7 +2463,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
if (script_exists) { if (script_exists) {
add_separator = true; add_separator = true;
menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/clear_script"), TOOL_CLEAR_SCRIPT); menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/detach_script"), TOOL_DETACH_SCRIPT);
} }
} }
@ -2839,7 +2839,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
ED_SHORTCUT("scene_tree/change_node_type", TTR("Change Type")); ED_SHORTCUT("scene_tree/change_node_type", TTR("Change Type"));
ED_SHORTCUT("scene_tree/attach_script", TTR("Attach Script")); ED_SHORTCUT("scene_tree/attach_script", TTR("Attach Script"));
ED_SHORTCUT("scene_tree/extend_script", TTR("Extend Script")); ED_SHORTCUT("scene_tree/extend_script", TTR("Extend Script"));
ED_SHORTCUT("scene_tree/clear_script", TTR("Clear Script")); ED_SHORTCUT("scene_tree/detach_script", TTR("Detach Script"));
ED_SHORTCUT("scene_tree/move_up", TTR("Move Up"), KEY_MASK_CMD | KEY_UP); ED_SHORTCUT("scene_tree/move_up", TTR("Move Up"), KEY_MASK_CMD | KEY_UP);
ED_SHORTCUT("scene_tree/move_down", TTR("Move Down"), KEY_MASK_CMD | KEY_DOWN); ED_SHORTCUT("scene_tree/move_down", TTR("Move Down"), KEY_MASK_CMD | KEY_DOWN);
ED_SHORTCUT("scene_tree/duplicate", TTR("Duplicate"), KEY_MASK_CMD | KEY_D); ED_SHORTCUT("scene_tree/duplicate", TTR("Duplicate"), KEY_MASK_CMD | KEY_D);
@ -2874,17 +2874,17 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
button_create_script = memnew(ToolButton); button_create_script = memnew(ToolButton);
button_create_script->connect("pressed", this, "_tool_selected", make_binds(TOOL_ATTACH_SCRIPT, false)); button_create_script->connect("pressed", this, "_tool_selected", make_binds(TOOL_ATTACH_SCRIPT, false));
button_create_script->set_tooltip(TTR("Attach a new or existing script for the selected node.")); button_create_script->set_tooltip(TTR("Attach a new or existing script to the selected node."));
button_create_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/attach_script")); button_create_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/attach_script"));
filter_hbc->add_child(button_create_script); filter_hbc->add_child(button_create_script);
button_create_script->hide(); button_create_script->hide();
button_clear_script = memnew(ToolButton); button_detach_script = memnew(ToolButton);
button_clear_script->connect("pressed", this, "_tool_selected", make_binds(TOOL_CLEAR_SCRIPT, false)); button_detach_script->connect("pressed", this, "_tool_selected", make_binds(TOOL_DETACH_SCRIPT, false));
button_clear_script->set_tooltip(TTR("Clear a script for the selected node.")); button_detach_script->set_tooltip(TTR("Detach the script from the selected node."));
button_clear_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/clear_script")); button_detach_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/detach_script"));
filter_hbc->add_child(button_clear_script); filter_hbc->add_child(button_detach_script);
button_clear_script->hide(); button_detach_script->hide();
button_hb = memnew(HBoxContainer); button_hb = memnew(HBoxContainer);
vbc->add_child(button_hb); vbc->add_child(button_hb);

4
editor/scene_tree_dock.h
View File

@ -66,7 +66,7 @@ class SceneTreeDock : public VBoxContainer {
TOOL_REPLACE, TOOL_REPLACE,
TOOL_EXTEND_SCRIPT, TOOL_EXTEND_SCRIPT,
TOOL_ATTACH_SCRIPT, TOOL_ATTACH_SCRIPT,
TOOL_CLEAR_SCRIPT, TOOL_DETACH_SCRIPT,
TOOL_MOVE_UP, TOOL_MOVE_UP,
TOOL_MOVE_DOWN, TOOL_MOVE_DOWN,
TOOL_DUPLICATE, TOOL_DUPLICATE,
@ -110,7 +110,7 @@ class SceneTreeDock : public VBoxContainer {
ToolButton *button_add; ToolButton *button_add;
ToolButton *button_instance; ToolButton *button_instance;
ToolButton *button_create_script; ToolButton *button_create_script;
ToolButton *button_clear_script; ToolButton *button_detach_script;
Button *button_3d; Button *button_3d;