asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #66689 from MewPurPur/property-editor-renames

Browse source 
Rename Copy/Paste Property –> Copy/Paste Value
This commit is contained in:
Rémi Verschelde 2022-10-03 09:22:47 +02:00
commit 56918f25c8
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editor/editor_inspector.cpp
View file

@ -716,11 +716,11 @@ void EditorProperty::shortcut_input(const Ref<InputEvent> &p_event) {
const Ref<InputEventKey> k = p_event; const Ref<InputEventKey> k = p_event;
if (k.is_valid() && k->is_pressed()) { if (k.is_valid() && k->is_pressed()) {
if (ED_IS_SHORTCUT("property_editor/copy_property", p_event)) { if (ED_IS_SHORTCUT("property_editor/copy_value", p_event)) {
menu_option(MENU_COPY_PROPERTY); menu_option(MENU_COPY_VALUE);
accept_event(); accept_event();
} else if (ED_IS_SHORTCUT("property_editor/paste_property", p_event) && !is_read_only()) { } else if (ED_IS_SHORTCUT("property_editor/paste_value", p_event) && !is_read_only()) {
menu_option(MENU_PASTE_PROPERTY); menu_option(MENU_PASTE_VALUE);
accept_event(); accept_event();
} else if (ED_IS_SHORTCUT("property_editor/copy_property_path", p_event)) { } else if (ED_IS_SHORTCUT("property_editor/copy_property_path", p_event)) {
menu_option(MENU_COPY_PROPERTY_PATH); menu_option(MENU_COPY_PROPERTY_PATH);
@ -915,10 +915,10 @@ Control *EditorProperty::make_custom_tooltip(const String &p_text) const {
void EditorProperty::menu_option(int p_option) { void EditorProperty::menu_option(int p_option) {
switch (p_option) { switch (p_option) {
case MENU_COPY_PROPERTY: { case MENU_COPY_VALUE: {
InspectorDock::get_inspector_singleton()->set_property_clipboard(object->get(property)); InspectorDock::get_inspector_singleton()->set_property_clipboard(object->get(property));
} break; } break;
case MENU_PASTE_PROPERTY: { case MENU_PASTE_VALUE: {
emit_changed(property, InspectorDock::get_inspector_singleton()->get_property_clipboard()); emit_changed(property, InspectorDock::get_inspector_singleton()->get_property_clipboard());
} break; } break;
case MENU_COPY_PROPERTY_PATH: { case MENU_COPY_PROPERTY_PATH: {
@ -1013,10 +1013,10 @@ void EditorProperty::_update_popup() {
add_child(menu); add_child(menu);
menu->connect("id_pressed", callable_mp(this, &EditorProperty::menu_option)); menu->connect("id_pressed", callable_mp(this, &EditorProperty::menu_option));
} }
menu->add_icon_shortcut(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/copy_property"), MENU_COPY_PROPERTY); menu->add_icon_shortcut(get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/copy_value"), MENU_COPY_VALUE);
menu->add_icon_shortcut(get_theme_icon(SNAME("ActionPaste"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/paste_property"), MENU_PASTE_PROPERTY); menu->add_icon_shortcut(get_theme_icon(SNAME("ActionPaste"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/paste_value"), MENU_PASTE_VALUE);
menu->add_icon_shortcut(get_theme_icon(SNAME("CopyNodePath"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/copy_property_path"), MENU_COPY_PROPERTY_PATH); menu->add_icon_shortcut(get_theme_icon(SNAME("CopyNodePath"), SNAME("EditorIcons")), ED_GET_SHORTCUT("property_editor/copy_property_path"), MENU_COPY_PROPERTY_PATH);
menu->set_item_disabled(MENU_PASTE_PROPERTY, is_read_only()); menu->set_item_disabled(MENU_PASTE_VALUE, is_read_only());
if (!pin_hidden) { if (!pin_hidden) {
menu->add_separator(); menu->add_separator();
if (can_pin) { if (can_pin) {
@ -4101,7 +4101,7 @@ EditorInspector::EditorInspector() {
refresh_countdown = 0.33; refresh_countdown = 0.33;
} }
ED_SHORTCUT("property_editor/copy_property", TTR("Copy Property"), KeyModifierMask::CMD_OR_CTRL | Key::C); ED_SHORTCUT("property_editor/copy_value", TTR("Copy Value"), KeyModifierMask::CMD_OR_CTRL | Key::C);
ED_SHORTCUT("property_editor/paste_property", TTR("Paste Property"), KeyModifierMask::CMD_OR_CTRL | Key::V); ED_SHORTCUT("property_editor/paste_value", TTR("Paste Value"), KeyModifierMask::CMD_OR_CTRL | Key::V);
ED_SHORTCUT("property_editor/copy_property_path", TTR("Copy Property Path"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::C); ED_SHORTCUT("property_editor/copy_property_path", TTR("Copy Property Path"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::C);
} }

4
editor/editor_inspector.h
View file

@ -58,8 +58,8 @@ class EditorProperty : public Container {
public: public:
enum MenuItems { enum MenuItems {
MENU_COPY_PROPERTY, MENU_COPY_VALUE,
MENU_PASTE_PROPERTY, MENU_PASTE_VALUE,
MENU_COPY_PROPERTY_PATH, MENU_COPY_PROPERTY_PATH,
MENU_PIN_VALUE, MENU_PIN_VALUE,
MENU_OPEN_DOCUMENTATION, MENU_OPEN_DOCUMENTATION,