diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 5ec1ac280..255d61d99 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -622,9 +622,9 @@ void EditorNode::_notification(int p_what) { PopupMenu *p = help_menu->get_popup(); p->set_item_icon(p->get_item_index(HELP_SEARCH), gui_base->get_icon("HelpSearch", "EditorIcons")); - p->set_item_icon(p->get_item_index(HELP_PANDEMONIUM_DOCS), gui_base->get_icon("Instance", "EditorIcons")); - p->set_item_icon(p->get_item_index(HELP_GODOT_DOCS), gui_base->get_icon("Instance", "EditorIcons")); - p->set_item_icon(p->get_item_index(HELP_REPORT_A_BUG), gui_base->get_icon("Instance", "EditorIcons")); + p->set_item_icon(p->get_item_index(HELP_PANDEMONIUM_DOCS), gui_base->get_icon("ExternalLink", "EditorIcons")); + p->set_item_icon(p->get_item_index(HELP_GODOT_DOCS), gui_base->get_icon("ExternalLink", "EditorIcons")); + p->set_item_icon(p->get_item_index(HELP_REPORT_A_BUG), gui_base->get_icon("ExternalLink", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_ABOUT), gui_base->get_icon("Pandemonium", "EditorIcons")); p->set_item_icon(p->get_item_index(HELP_SUPPORT_PANDEMONIUM_DEVELOPMENT), gui_base->get_icon("Heart", "EditorIcons")); @@ -6355,9 +6355,9 @@ EditorNode::EditorNode() { p->add_icon_shortcut(gui_base->get_icon("HelpSearch", "EditorIcons"), ED_SHORTCUT("editor/editor_help", TTR("Search Help"), KEY_F1), HELP_SEARCH); #endif p->add_separator(); - p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/online_docs", TTR("Online Documentation")), HELP_PANDEMONIUM_DOCS); - p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/pandemonium_online_docs", TTR("Pandemonium Online Documentation")), HELP_GODOT_DOCS); - p->add_icon_shortcut(gui_base->get_icon("Instance", "EditorIcons"), ED_SHORTCUT("editor/report_a_bug", TTR("Report a Bug")), HELP_REPORT_A_BUG); + p->add_icon_shortcut(gui_base->get_icon("ExternalLink", "EditorIcons"), ED_SHORTCUT("editor/online_docs", TTR("Online Documentation")), HELP_PANDEMONIUM_DOCS); + p->add_icon_shortcut(gui_base->get_icon("ExternalLink", "EditorIcons"), ED_SHORTCUT("editor/pandemonium_online_docs", TTR("Pandemonium Online Documentation")), HELP_GODOT_DOCS); + p->add_icon_shortcut(gui_base->get_icon("ExternalLink", "EditorIcons"), ED_SHORTCUT("editor/report_a_bug", TTR("Report a Bug")), HELP_REPORT_A_BUG); p->add_separator(); p->add_icon_shortcut(gui_base->get_icon("Pandemonium", "EditorIcons"), ED_SHORTCUT("editor/about", TTR("About Pandemonium")), HELP_ABOUT); p->add_icon_shortcut(gui_base->get_icon("Heart", "EditorIcons"), ED_SHORTCUT("editor/support_development", TTR("Support Pandemonium Development")), HELP_SUPPORT_PANDEMONIUM_DEVELOPMENT); diff --git a/editor/icons/icon_external_link.svg b/editor/icons/icon_external_link.svg new file mode 100644 index 000000000..7fd78ae00 --- /dev/null +++ b/editor/icons/icon_external_link.svg @@ -0,0 +1 @@ + diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index c71a170aa..1bc142c5c 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -30,29 +30,28 @@ #include "shader_editor_plugin.h" -#include "core/io/resource_loader.h" -#include "core/io/resource_saver.h" -#include "core/os/keyboard.h" -#include "core/os/os.h" -#include "core/version_generated.gen.h" -#include "editor/editor_node.h" -#include "editor/editor_scale.h" -#include "editor/editor_settings.h" -#include "servers/visual/shader_types.h" #include "core/array.h" #include "core/class_db.h" #include "core/color.h" #include "core/error_list.h" #include "core/error_macros.h" +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" #include "core/map.h" #include "core/math/transform_2d.h" #include "core/os/file_access.h" #include "core/os/input_event.h" +#include "core/os/keyboard.h" #include "core/os/main_loop.h" #include "core/os/memory.h" +#include "core/os/os.h" #include "core/string_name.h" #include "core/variant.h" #include "core/vector.h" +#include "core/version_generated.gen.h" +#include "editor/editor_node.h" +#include "editor/editor_scale.h" +#include "editor/editor_settings.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/control.h" @@ -63,6 +62,7 @@ #include "scene/gui/text_edit.h" #include "scene/gui/tool_button.h" #include "servers/visual/shader_language.h" +#include "servers/visual/shader_types.h" #include "servers/visual_server.h" struct ScriptCodeCompletionOption; @@ -690,7 +690,7 @@ ShaderEditor::ShaderEditor(EditorNode *p_node) { help_menu = memnew(MenuButton); help_menu->set_text(TTR("Help")); help_menu->set_switch_on_hover(true); - help_menu->get_popup()->add_icon_item(p_node->get_gui_base()->get_icon("Instance", "EditorIcons"), TTR("Online Docs"), HELP_DOCS); + help_menu->get_popup()->add_icon_item(p_node->get_gui_base()->get_icon("ExternalLink", "EditorIcons"), TTR("Online Docs"), HELP_DOCS); help_menu->get_popup()->connect("id_pressed", this, "_menu_option"); add_child(main_container); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 44a1a29cb..6fe108670 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -30,34 +30,12 @@ #include "script_editor_debugger.h" -#include "core/io/marshalls.h" -#include "core/os/os.h" -#include "core/ustring.h" -#include "core/version.h" -#include "editor/plugins/canvas_item_editor_plugin.h" -#include "editor/plugins/spatial_editor_plugin.h" -#include "editor_log.h" -#include "editor_network_profiler.h" -#include "editor_node.h" -#include "editor_profiler.h" -#include "editor_scale.h" -#include "editor_settings.h" -#include "main/performance.h" -#include "scene/debugger/script_debugger_remote.h" -#include "scene/gui/dialogs.h" -#include "scene/gui/label.h" -#include "scene/gui/line_edit.h" -#include "scene/gui/margin_container.h" -#include "scene/gui/separator.h" -#include "scene/gui/split_container.h" -#include "scene/gui/tab_container.h" -#include "scene/gui/tree.h" -#include "scene/resources/packed_scene.h" #include "core/class_db.h" #include "core/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" +#include "core/io/marshalls.h" #include "core/io/multiplayer_api.h" #include "core/io/packet_peer.h" #include "core/io/resource_loader.h" @@ -71,24 +49,46 @@ #include "core/math/transform_2d.h" #include "core/os/file_access.h" #include "core/os/memory.h" +#include "core/os/os.h" #include "core/print_string.h" #include "core/ref_ptr.h" #include "core/script_language.h" #include "core/typedefs.h" #include "core/undo_redo.h" +#include "core/ustring.h" +#include "core/version.h" #include "editor/editor_data.h" #include "editor/editor_file_dialog.h" #include "editor/editor_inspector.h" +#include "editor/plugins/canvas_item_editor_plugin.h" +#include "editor/plugins/spatial_editor_plugin.h" #include "editor/scene_tree_dock.h" +#include "editor_log.h" +#include "editor_network_profiler.h" +#include "editor_node.h" +#include "editor_profiler.h" +#include "editor_scale.h" +#include "editor_settings.h" +#include "main/performance.h" #include "scene/3d/camera.h" +#include "scene/debugger/script_debugger_remote.h" #include "scene/gui/box_container.h" #include "scene/gui/button.h" #include "scene/gui/control.h" +#include "scene/gui/dialogs.h" #include "scene/gui/grid_container.h" +#include "scene/gui/label.h" +#include "scene/gui/line_edit.h" +#include "scene/gui/margin_container.h" #include "scene/gui/popup_menu.h" +#include "scene/gui/separator.h" +#include "scene/gui/split_container.h" +#include "scene/gui/tab_container.h" #include "scene/gui/tool_button.h" +#include "scene/gui/tree.h" #include "scene/main/node.h" #include "scene/resources/font.h" +#include "scene/resources/packed_scene.h" #include "scene/resources/style_box.h" #include "scene/resources/texture.h" @@ -2243,7 +2243,7 @@ void ScriptEditorDebugger::_error_tree_item_rmb_selected(const Vector2 &p_pos) { if (error_tree->is_anything_selected()) { item_menu->add_icon_item(get_icon("ActionCopy", "EditorIcons"), TTR("Copy Error"), ITEM_MENU_COPY_ERROR); - item_menu->add_icon_item(get_icon("Instance", "EditorIcons"), TTR("Open C++ Source on GitHub"), ITEM_MENU_OPEN_SOURCE); + item_menu->add_icon_item(get_icon("ExternalLink", "EditorIcons"), TTR("Open C++ Source on GitHub"), ITEM_MENU_OPEN_SOURCE); } if (item_menu->get_item_count() > 0) {