diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml index e18e72702..bc20e8f09 100644 --- a/doc/classes/EditorInterface.xml +++ b/doc/classes/EditorInterface.xml @@ -4,7 +4,7 @@ Godot editor's interface. - EditorInterface gives you control over Godot editor's window. It allows customizing the window, saving and (re-)loading scenes, rendering mesh previews, inspecting and editing resources and objects, and provides access to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], [ScriptEditor], the editor viewport, and information about scenes. + EditorInterface gives you control over Godot editor's window. It allows customizing the window, saving and (re-)loading scenes, rendering mesh previews, inspecting and editing resources and objects, and provides access to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], [EditorScriptEditor], the editor viewport, and information about scenes. [b]Note:[/b] This class shouldn't be instantiated directly. Instead, access the singleton using [method EditorPlugin.get_editor_interface]. @@ -113,9 +113,9 @@ - + - Returns the editor's [ScriptEditor] instance. + Returns the editor's [EditorScriptEditor] instance. [b]Warning:[/b] Removing and freeing this node will render a part of the editor useless and may cause a crash. diff --git a/doc/classes/ScriptEditor.xml b/doc/classes/ScriptEditor.xml index 667cd65df..7e53f3333 100644 --- a/doc/classes/ScriptEditor.xml +++ b/doc/classes/ScriptEditor.xml @@ -1,5 +1,5 @@ - + Godot editor's script editor. diff --git a/doc/translations/classes.pot b/doc/translations/classes.pot index 0a56b4340..5e3adb9b9 100644 --- a/doc/translations/classes.pot +++ b/doc/translations/classes.pot @@ -1521,7 +1521,7 @@ msgid "The [TranslationServer] singleton." msgstr "" #: doc/classes/@GlobalScope.xml -msgid "The [VisualScriptEditor] singleton." +msgid "The [VisualEditorScriptEditor] singleton." msgstr "" #: doc/classes/@GlobalScope.xml @@ -20929,7 +20929,7 @@ msgid "" "customizing the window, saving and (re-)loading scenes, rendering mesh " "previews, inspecting and editing resources and objects, and provides access " "to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], " -"[ScriptEditor], the editor viewport, and information about scenes.\n" +"[EditorScriptEditor], the editor viewport, and information about scenes.\n" "[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access " "the singleton using [method EditorPlugin.get_editor_interface]." msgstr "" @@ -21027,7 +21027,7 @@ msgstr "" #: doc/classes/EditorInterface.xml msgid "" -"Returns the editor's [ScriptEditor] instance.\n" +"Returns the editor's [EditorScriptEditor] instance.\n" "[b]Warning:[/b] Removing and freeing this node will render a part of the " "editor useless and may cause a crash." msgstr "" @@ -54821,50 +54821,50 @@ msgstr "" msgid "Emitted when the user clicks the OK button." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Godot editor's script editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access " "the singleton using [method EditorInterface.get_script_editor]." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Returns a [Script] that is currently active in editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Returns an array with all [Script] objects which are currently open in " "editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Goes to the specified line in the current script." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Opens the script create dialog. The script will extend [code]base_name[/" "code]. The file extension can be omitted from [code]base_path[/code]. It " "will be added based on the selected scripting language." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Reload all currently opened scripts from disk in case the file contents are " "newer." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Emitted when user changed active script. Argument is a freshly activated " "[Script]." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Emitted when editor is about to close the active script. Argument is a " "[Script] that is going to be closed." @@ -68182,19 +68182,19 @@ msgstr "" msgid "The type to deconstruct." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "" "Add a custom Visual Script node to the editor. It'll be placed under " "\"Custom Nodes\" with the [code]category[/code] as the parameter." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "" "Remove a custom Visual Script node from the editor. Custom nodes already " "placed on scripts won't be removed." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "Emitted when a custom Visual Script node is added or removed." msgstr "" diff --git a/doc/translations/hu.po b/doc/translations/hu.po index e99babd54..d7273a09d 100644 --- a/doc/translations/hu.po +++ b/doc/translations/hu.po @@ -1557,7 +1557,7 @@ msgid "The [TranslationServer] singleton." msgstr "" #: doc/classes/@GlobalScope.xml -msgid "The [VisualScriptEditor] singleton." +msgid "The [VisualEditorScriptEditor] singleton." msgstr "" #: doc/classes/@GlobalScope.xml @@ -21001,7 +21001,7 @@ msgid "" "customizing the window, saving and (re-)loading scenes, rendering mesh " "previews, inspecting and editing resources and objects, and provides access " "to [EditorSettings], [EditorFileSystem], [EditorResourcePreview], " -"[ScriptEditor], the editor viewport, and information about scenes.\n" +"[EditorScriptEditor], the editor viewport, and information about scenes.\n" "[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access " "the singleton using [method EditorPlugin.get_editor_interface]." msgstr "" @@ -21099,7 +21099,7 @@ msgstr "" #: doc/classes/EditorInterface.xml msgid "" -"Returns the editor's [ScriptEditor] instance.\n" +"Returns the editor's [EditorScriptEditor] instance.\n" "[b]Warning:[/b] Removing and freeing this node will render a part of the " "editor useless and may cause a crash." msgstr "" @@ -54947,50 +54947,50 @@ msgstr "" msgid "Emitted when the user clicks the OK button." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Godot editor's script editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access " "the singleton using [method EditorInterface.get_script_editor]." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Returns a [Script] that is currently active in editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Returns an array with all [Script] objects which are currently open in " "editor." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "Goes to the specified line in the current script." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Opens the script create dialog. The script will extend [code]base_name[/" "code]. The file extension can be omitted from [code]base_path[/code]. It " "will be added based on the selected scripting language." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Reload all currently opened scripts from disk in case the file contents are " "newer." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Emitted when user changed active script. Argument is a freshly activated " "[Script]." msgstr "" -#: doc/classes/ScriptEditor.xml +#: doc/classes/EditorScriptEditor.xml msgid "" "Emitted when editor is about to close the active script. Argument is a " "[Script] that is going to be closed." @@ -68338,19 +68338,19 @@ msgstr "" msgid "The type to deconstruct." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "" "Add a custom Visual Script node to the editor. It'll be placed under " "\"Custom Nodes\" with the [code]category[/code] as the parameter." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "" "Remove a custom Visual Script node from the editor. Custom nodes already " "placed on scripts won't be removed." msgstr "" -#: modules/visual_script/doc_classes/VisualScriptEditor.xml +#: modules/visual_script/doc_classes/VisualEditorScriptEditor.xml msgid "Emitted when a custom Visual Script node is added or removed." msgstr "" diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index c921c21a0..be68b2511 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -817,7 +817,7 @@ void ConnectionsDock::_go_to_script(TreeItem &item) { } #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - if (script.is_valid() && ScriptEditor::get_singleton()->script_goto_method(script, c.method)) { + if (script.is_valid() && EditorScriptEditor::get_singleton()->script_goto_method(script, c.method)) { editor->call("_editor_select", EditorNode::EDITOR_SCRIPT); } #endif diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 5b0e67772..5275bdc7b 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -559,7 +559,7 @@ void EditorData::remove_scene(int p_idx) { #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED if (edited_scene[p_idx].path != String()) { - ScriptEditor::get_singleton()->close_builtin_scripts_from_scene(edited_scene[p_idx].path); + EditorScriptEditor::get_singleton()->close_builtin_scripts_from_scene(edited_scene[p_idx].path); } #endif diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 22a00fe93..61c9d4601 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -342,7 +342,7 @@ void EditorExportPlatform::gen_debug_flags(Vector &r_flags, int p_flags) r_flags.push_back(host + ":" + String::num(remote_port)); List breakpoints; - ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); + EditorScriptEditor::get_singleton()->get_breakpoints(&breakpoints); if (breakpoints.size()) { r_flags.push_back("--breakpoints"); @@ -1269,7 +1269,7 @@ void EditorExportPlatform::gen_export_flags(Vector &r_flags, int p_flags r_flags.push_back(host + ":" + String::num(remote_port)); List breakpoints; - ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); + EditorScriptEditor::get_singleton()->get_breakpoints(&breakpoints); if (breakpoints.size()) { r_flags.push_back("--breakpoints"); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index d088dd052..bb84c0514 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1704,7 +1704,7 @@ EditorHelp::~EditorHelp() { void EditorHelpBit::_go_to_help(String p_what) { EditorNode::get_singleton()->set_visible_editor(EditorNode::EDITOR_SCRIPT); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - ScriptEditor::get_singleton()->goto_help(p_what); + EditorScriptEditor::get_singleton()->goto_help(p_what); #endif emit_signal("request_hide"); } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 074bc6e4a..203810566 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -590,7 +590,7 @@ void EditorNode::_notification(int p_what) { #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED // debugger area - if (ScriptEditor::get_singleton()->get_debugger()->is_visible()) { + if (EditorScriptEditor::get_singleton()->get_debugger()->is_visible()) { bottom_panel->add_theme_style_override("panel", gui_base->get_theme_stylebox("BottomPanelDebuggerOverride", "EditorStyles")); } #endif @@ -2054,7 +2054,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) { inspector_dock->update(current_node); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED if (!inspector_only) { - inspector_only = stay_in_script_editor_on_node_selected && ScriptEditor::get_singleton()->is_visible_in_tree(); + inspector_only = stay_in_script_editor_on_node_selected && EditorScriptEditor::get_singleton()->is_visible_in_tree(); } #endif } else { @@ -2073,7 +2073,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) { } else { Node *selected_node = nullptr; - if (current_obj->is_class("ScriptEditorDebuggerInspectedObject")) { + if (current_obj->is_class("EditorScriptEditorDebuggerInspectedObject")) { editable_warning = TTR("This is a remote object, so changes to it won't be kept.\nPlease read the documentation relevant to debugging to better understand this workflow."); disable_folding = true; } else if (current_obj->is_class("MultiNodeEdit")) { @@ -2135,7 +2135,7 @@ void EditorNode::_edit_current(bool p_skip_foreign) { main_plugin->edit(current_obj); } #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - } else if (main_plugin != editor_plugin_screen && (!ScriptEditor::get_singleton() || !ScriptEditor::get_singleton()->is_visible_in_tree() || ScriptEditor::get_singleton()->can_take_away_focus())) { + } else if (main_plugin != editor_plugin_screen && (!EditorScriptEditor::get_singleton() || !EditorScriptEditor::get_singleton()->is_visible_in_tree() || EditorScriptEditor::get_singleton()->can_take_away_focus())) { // update screen main_plugin _editor_select(plugin_index); main_plugin->edit(current_obj); @@ -2241,7 +2241,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) { args = ProjectSettings::get_singleton()->get("editor/main_run_args"); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - skip_breakpoints = ScriptEditor::get_singleton()->get_debugger()->is_skip_breakpoints(); + skip_breakpoints = EditorScriptEditor::get_singleton()->get_debugger()->is_skip_breakpoints(); #endif emit_signal("play_pressed"); @@ -2412,7 +2412,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED // Pressing Ctrl + S saves the current script if a scene is currently open, but it won't if the scene has no root node. // Work around this by explicitly saving the script in this case (similar to pressing Ctrl + Alt + S). - ScriptEditor::get_singleton()->save_current_script(); + EditorScriptEditor::get_singleton()->save_current_script(); #endif } @@ -2731,7 +2731,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_LIVE_DEBUG), !ischecked); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - ScriptEditor::get_singleton()->get_debugger()->set_live_debugging(!ischecked); + EditorScriptEditor::get_singleton()->get_debugger()->set_live_debugging(!ischecked); #endif EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_live_debug", !ischecked); @@ -2771,7 +2771,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { debug_menu->get_popup()->set_item_checked(debug_menu->get_popup()->get_item_index(RUN_RELOAD_SCRIPTS), !ischecked); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - ScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked); + EditorScriptEditor::get_singleton()->set_live_auto_reload_running_scripts(!ischecked); #endif EditorSettings::get_singleton()->set_project_metadata("debug_options", "run_reload_scripts", !ischecked); @@ -3465,8 +3465,8 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) { //this should only happen at the very end #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root(); - ScriptEditor::get_singleton()->set_scene_root_script(editor_data.get_scene_root_script(editor_data.get_edited_scene())); + EditorScriptEditor::get_singleton()->get_debugger()->update_live_edit_root(); + EditorScriptEditor::get_singleton()->set_scene_root_script(editor_data.get_scene_root_script(editor_data.get_edited_scene())); #endif editor_data.notify_edited_scene_changed(); } @@ -3699,7 +3699,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b scene_tree_dock->set_selected(new_scene); #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root(); + EditorScriptEditor::get_singleton()->get_debugger()->update_live_edit_root(); #endif push_item(new_scene); @@ -5130,7 +5130,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) { } #ifdef MODULE_EDITOR_CODE_EDITOR_ENABLED - if (ScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel which uses tabs, so the top section should be smaller + if (EditorScriptEditor::get_singleton()->get_debugger() == bottom_panel_items[p_idx].control) { // this is the debug panel which uses tabs, so the top section should be smaller bottom_panel->add_theme_style_override("panel", gui_base->get_theme_stylebox("BottomPanelDebuggerOverride", "EditorStyles")); } else { bottom_panel->add_theme_style_override("panel", gui_base->get_theme_stylebox("panel", "TabContainer")); diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 80649cc16..a2eaebf5d 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -152,7 +152,7 @@ void EditorPath::update_path() { if (name == "") { name = r->get_class(); } - } else if (obj->is_class("ScriptEditorDebuggerInspectedObject")) { + } else if (obj->is_class("EditorScriptEditorDebuggerInspectedObject")) { name = obj->call("get_title"); } else if (Object::cast_to(obj)) { name = Object::cast_to(obj)->get_name(); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 83a0362e3..c6e3f6c55 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -212,7 +212,7 @@ void EditorInterface::edit_node(Node *p_node) { void EditorInterface::edit_script(const Ref