Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-29 12:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10750 from Rubonnek/fix-duplicate-script-changed-signal

Browse source 
Renamed 'script_changed' signal in the script editor plugin to 'edited_script_changed'
This commit is contained in:
Rémi Verschelde 2017-08-30 12:46:01 +02:00 • committed by GitHub
commit fd7ad7d80a
4 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/script_editor_plugin.cpp
View file

@ -47,7 +47,7 @@
void ScriptEditorBase::_bind_methods() { void ScriptEditorBase::_bind_methods() {
ADD_SIGNAL(MethodInfo("name_changed")); ADD_SIGNAL(MethodInfo("name_changed"));
ADD_SIGNAL(MethodInfo("script_changed")); ADD_SIGNAL(MethodInfo("edited_script_changed"));
ADD_SIGNAL(MethodInfo("request_help_search", PropertyInfo(Variant::STRING, "topic"))); ADD_SIGNAL(MethodInfo("request_help_search", PropertyInfo(Variant::STRING, "topic")));
ADD_SIGNAL(MethodInfo("request_help_index")); ADD_SIGNAL(MethodInfo("request_help_index"));
ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line"))); ADD_SIGNAL(MethodInfo("request_open_script_at_line", PropertyInfo(Variant::OBJECT, "script"), PropertyInfo(Variant::INT, "line")));
@ -1622,7 +1622,7 @@ bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool
_update_script_names(); _update_script_names();
_save_layout(); _save_layout();
se->connect("name_changed", this, "_update_script_names"); se->connect("name_changed", this, "_update_script_names");
se->connect("script_changed", this, "_script_changed"); se->connect("edited_script_changed", this, "_script_changed");
se->connect("request_help_search", this, "_help_search"); se->connect("request_help_search", this, "_help_search");
se->connect("request_open_script_at_line", this, "_goto_script_line"); se->connect("request_open_script_at_line", this, "_goto_script_line");
se->connect("go_to_help", this, "_help_class_goto"); se->connect("go_to_help", this, "_help_class_goto");

2
editor/plugins/script_text_editor.cpp
View file

@ -529,7 +529,7 @@ void ScriptTextEditor::_validate_script() {
} }
emit_signal("name_changed"); emit_signal("name_changed");
emit_signal("script_changed"); emit_signal("edited_script_changed");
} }
static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) { static Node *_find_node_for_script(Node *p_base, Node *p_current, const Ref<Script> &p_script) {

2
editor/plugins/shader_editor_plugin.cpp
View file

@ -197,8 +197,6 @@ void ShaderTextEditor::_validate_script() {
} }
void ShaderTextEditor::_bind_methods() { void ShaderTextEditor::_bind_methods() {
//ADD_SIGNAL( MethodInfo("script_changed") );
} }
ShaderTextEditor::ShaderTextEditor() { ShaderTextEditor::ShaderTextEditor() {

24
modules/visual_script/visual_script_editor.cpp
View file

@ -886,8 +886,8 @@ void VisualScriptEditor::_member_edited() {
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "_update_graph"); undo_redo->add_do_method(this, "_update_graph");
undo_redo->add_undo_method(this, "_update_graph"); undo_redo->add_undo_method(this, "_update_graph");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
// _update_graph(); // _update_graph();
@ -903,8 +903,8 @@ void VisualScriptEditor::_member_edited() {
undo_redo->add_undo_method(script.ptr(), "rename_variable", new_name, name); undo_redo->add_undo_method(script.ptr(), "rename_variable", new_name, name);
undo_redo->add_do_method(this, "_update_members"); undo_redo->add_do_method(this, "_update_members");
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
return; //or crash because it will become invalid return; //or crash because it will become invalid
@ -918,8 +918,8 @@ void VisualScriptEditor::_member_edited() {
undo_redo->add_undo_method(script.ptr(), "rename_custom_signal", new_name, name); undo_redo->add_undo_method(script.ptr(), "rename_custom_signal", new_name, name);
undo_redo->add_do_method(this, "_update_members"); undo_redo->add_do_method(this, "_update_members");
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
return; //or crash because it will become invalid return; //or crash because it will become invalid
@ -1057,8 +1057,8 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "_update_graph"); undo_redo->add_do_method(this, "_update_graph");
undo_redo->add_undo_method(this, "_update_graph"); undo_redo->add_undo_method(this, "_update_graph");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
_update_graph(); _update_graph();
@ -1077,8 +1077,8 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
undo_redo->add_undo_method(script.ptr(), "remove_variable", name); undo_redo->add_undo_method(script.ptr(), "remove_variable", name);
undo_redo->add_do_method(this, "_update_members"); undo_redo->add_do_method(this, "_update_members");
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
return; //or crash because it will become invalid return; //or crash because it will become invalid
} }
@ -1093,8 +1093,8 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt
undo_redo->add_undo_method(script.ptr(), "remove_custom_signal", name); undo_redo->add_undo_method(script.ptr(), "remove_custom_signal", name);
undo_redo->add_do_method(this, "_update_members"); undo_redo->add_do_method(this, "_update_members");
undo_redo->add_undo_method(this, "_update_members"); undo_redo->add_undo_method(this, "_update_members");
undo_redo->add_do_method(this, "emit_signal", "script_changed"); undo_redo->add_do_method(this, "emit_signal", "edited_script_changed");
undo_redo->add_undo_method(this, "emit_signal", "script_changed"); undo_redo->add_undo_method(this, "emit_signal", "edited_script_changed");
undo_redo->commit_action(); undo_redo->commit_action();
return; //or crash because it will become invalid return; //or crash because it will become invalid
} }