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

Merge pull request #70920 from KoBeWi/exhibit_inside_catalogmap 

Add Show in FileSystem option in the inspector
This commit is contained in:
Rémi Verschelde 2023-01-09 08:33:58 +01:00
parent e7905f4f48 6d65d886f2
commit 9c7723b717
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/inspector_dock.cpp
View File

@ -35,6 +35,7 @@
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/editor_undo_redo_manager.h" #include "editor/editor_undo_redo_manager.h"
#include "editor/filesystem_dock.h"
#include "editor/plugins/script_editor_plugin.h" #include "editor/plugins/script_editor_plugin.h"
InspectorDock *InspectorDock::singleton = nullptr; InspectorDock *InspectorDock::singleton = nullptr;
@ -86,6 +87,11 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) {
case RESOURCE_EDIT_CLIPBOARD: { case RESOURCE_EDIT_CLIPBOARD: {
_paste_resource(); _paste_resource();
} break; } break;
case RESOURCE_SHOW_IN_FILESYSTEM: {
Ref<Resource> current_res = _get_current_resource();
ERR_FAIL_COND(current_res.is_null());
FileSystemDock::get_singleton()->navigate_to_path(current_res->get_path());
} break;
case OBJECT_REQUEST_HELP: { case OBJECT_REQUEST_HELP: {
if (current) { if (current) {
@ -291,6 +297,10 @@ void InspectorDock::_prepare_resource_extra_popup() {
Ref<Resource> r = EditorSettings::get_singleton()->get_resource_clipboard(); Ref<Resource> r = EditorSettings::get_singleton()->get_resource_clipboard();
PopupMenu *popup = resource_extra_button->get_popup(); PopupMenu *popup = resource_extra_button->get_popup();
popup->set_item_disabled(popup->get_item_index(RESOURCE_EDIT_CLIPBOARD), r.is_null()); popup->set_item_disabled(popup->get_item_index(RESOURCE_EDIT_CLIPBOARD), r.is_null());
Ref<Resource> current_res = _get_current_resource();
ERR_FAIL_COND(current_res.is_null());
popup->set_item_disabled(popup->get_item_index(RESOURCE_SHOW_IN_FILESYSTEM), current_res->is_built_in());
} }
Ref<Resource> InspectorDock::_get_current_resource() const { Ref<Resource> InspectorDock::_get_current_resource() const {
@ -655,6 +665,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
resource_extra_button->get_popup()->add_icon_shortcut(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")), ED_SHORTCUT("property_editor/copy_resource", TTR("Copy Resource")), RESOURCE_COPY); resource_extra_button->get_popup()->add_icon_shortcut(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")), ED_SHORTCUT("property_editor/copy_resource", TTR("Copy Resource")), RESOURCE_COPY);
resource_extra_button->get_popup()->set_item_disabled(1, true); resource_extra_button->get_popup()->set_item_disabled(1, true);
resource_extra_button->get_popup()->add_separator(); resource_extra_button->get_popup()->add_separator();
resource_extra_button->get_popup()->add_shortcut(ED_SHORTCUT("property_editor/show_in_filesystem", TTR("Show in FileSystem")), RESOURCE_SHOW_IN_FILESYSTEM);
resource_extra_button->get_popup()->add_shortcut(ED_SHORTCUT("property_editor/unref_resource", TTR("Make Resource Built-In")), RESOURCE_MAKE_BUILT_IN); resource_extra_button->get_popup()->add_shortcut(ED_SHORTCUT("property_editor/unref_resource", TTR("Make Resource Built-In")), RESOURCE_MAKE_BUILT_IN);
resource_extra_button->get_popup()->set_item_disabled(3, true); resource_extra_button->get_popup()->set_item_disabled(3, true);
resource_extra_button->get_popup()->connect("id_pressed", callable_mp(this, &InspectorDock::_menu_option)); resource_extra_button->get_popup()->connect("id_pressed", callable_mp(this, &InspectorDock::_menu_option));

1
editor/inspector_dock.h
View File

@ -51,6 +51,7 @@ class InspectorDock : public VBoxContainer {
RESOURCE_LOAD, RESOURCE_LOAD,
RESOURCE_SAVE, RESOURCE_SAVE,
RESOURCE_SAVE_AS, RESOURCE_SAVE_AS,
RESOURCE_SHOW_IN_FILESYSTEM,
RESOURCE_MAKE_BUILT_IN, RESOURCE_MAKE_BUILT_IN,
RESOURCE_COPY, RESOURCE_COPY,
RESOURCE_EDIT_CLIPBOARD, RESOURCE_EDIT_CLIPBOARD,