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

Merge pull request #51734 from timothyqiu/resource-menu-item-3x 

[3.x] Disable "Edit Resource from Clipboard" when nothing in clipboard
This commit is contained in:
Rémi Verschelde 2021-08-16 18:32:34 +02:00 committed by GitHub
parent 5ac3a85af3 1a9604f605
commit fb0dcdf808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/inspector_dock.cpp
View File

@ -209,6 +209,12 @@ void InspectorDock::_paste_resource() const {
}
}
void InspectorDock::_prepare_resource_extra_popup() {
RES r = EditorSettings::get_singleton()->get_resource_clipboard();
PopupMenu *popup = resource_extra_button->get_popup();
popup->set_item_disabled(popup->get_item_index(RESOURCE_EDIT_CLIPBOARD), r.is_null());
}
void InspectorDock::_prepare_history() {
EditorHistory *editor_history = EditorNode::get_singleton()->get_editor_history();
@ -367,6 +373,7 @@ void InspectorDock::_bind_methods() {
ClassDB::bind_method("_unref_resource", &InspectorDock::_unref_resource);
ClassDB::bind_method("_paste_resource", &InspectorDock::_paste_resource);
ClassDB::bind_method("_copy_resource", &InspectorDock::_copy_resource);
ClassDB::bind_method("_prepare_resource_extra_popup", &InspectorDock::_prepare_resource_extra_popup);
ClassDB::bind_method("_select_history", &InspectorDock::_select_history);
ClassDB::bind_method("_prepare_history", &InspectorDock::_prepare_history);
@ -528,6 +535,7 @@ InspectorDock::InspectorDock(EditorNode *p_editor, EditorData &p_editor_data) {
resource_extra_button->set_icon(get_icon("GuiTabMenuHl", "EditorIcons"));
resource_extra_button->set_tooltip(TTR("Extra resource options."));
general_options_hb->add_child(resource_extra_button);
resource_extra_button->connect("about_to_show", this, "_prepare_resource_extra_popup");
resource_extra_button->get_popup()->add_icon_shortcut(get_icon("ActionPaste", "EditorIcons"), ED_SHORTCUT("property_editor/paste_resource", TTR("Edit Resource from Clipboard")), RESOURCE_EDIT_CLIPBOARD);
resource_extra_button->get_popup()->add_icon_shortcut(get_icon("ActionCopy", "EditorIcons"), ED_SHORTCUT("property_editor/copy_resource", TTR("Copy Resource")), RESOURCE_COPY);
resource_extra_button->get_popup()->set_item_disabled(1, true);

1
editor/inspector_dock.h
View File

@ -103,6 +103,7 @@ class InspectorDock : public VBoxContainer {
void _unref_resource() const;
void _copy_resource() const;
void _paste_resource() const;
void _prepare_resource_extra_popup();
void _warning_pressed();
void _resource_created() const;