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

Merge pull request #18289 from sersoong/master-contextmenu 

Fixed context menu TTR bugs
This commit is contained in:
Rémi Verschelde 2018-04-19 10:52:38 +02:00 committed by GitHub
parent 9ce8d8ddda a1cfc89108
commit f433826621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/gui/line_edit.cpp
View File

@ -1505,15 +1505,15 @@ LineEdit::LineEdit() {
context_menu_enabled = true; context_menu_enabled = true;
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
menu->add_item(TTR("Cut"), MENU_CUT, KEY_MASK_CMD | KEY_X); menu->add_item(RTR("Cut"), MENU_CUT, KEY_MASK_CMD | KEY_X);
menu->add_item(TTR("Copy"), MENU_COPY, KEY_MASK_CMD | KEY_C); menu->add_item(RTR("Copy"), MENU_COPY, KEY_MASK_CMD | KEY_C);
menu->add_item(TTR("Paste"), MENU_PASTE, KEY_MASK_CMD | KEY_V); menu->add_item(RTR("Paste"), MENU_PASTE, KEY_MASK_CMD | KEY_V);
menu->add_separator(); menu->add_separator();
menu->add_item(TTR("Select All"), MENU_SELECT_ALL, KEY_MASK_CMD | KEY_A); menu->add_item(RTR("Select All"), MENU_SELECT_ALL, KEY_MASK_CMD | KEY_A);
menu->add_item(TTR("Clear"), MENU_CLEAR); menu->add_item(RTR("Clear"), MENU_CLEAR);
menu->add_separator(); menu->add_separator();
menu->add_item(TTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z); menu->add_item(RTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z);
menu->add_item(TTR("Redo"), MENU_REDO, KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Z); menu->add_item(RTR("Redo"), MENU_REDO, KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Z);
menu->connect("id_pressed", this, "menu_option"); menu->connect("id_pressed", this, "menu_option");
expand_to_text_length = false; expand_to_text_length = false;
} }

12
scene/gui/text_edit.cpp
View File

@ -5779,14 +5779,14 @@ TextEdit::TextEdit() {
context_menu_enabled = true; context_menu_enabled = true;
menu = memnew(PopupMenu); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
menu->add_item(TTR("Cut"), MENU_CUT, KEY_MASK_CMD | KEY_X); menu->add_item(RTR("Cut"), MENU_CUT, KEY_MASK_CMD | KEY_X);
menu->add_item(TTR("Copy"), MENU_COPY, KEY_MASK_CMD | KEY_C); menu->add_item(RTR("Copy"), MENU_COPY, KEY_MASK_CMD | KEY_C);
menu->add_item(TTR("Paste"), MENU_PASTE, KEY_MASK_CMD | KEY_V); menu->add_item(RTR("Paste"), MENU_PASTE, KEY_MASK_CMD | KEY_V);
menu->add_separator(); menu->add_separator();
menu->add_item(TTR("Select All"), MENU_SELECT_ALL, KEY_MASK_CMD | KEY_A); menu->add_item(RTR("Select All"), MENU_SELECT_ALL, KEY_MASK_CMD | KEY_A);
menu->add_item(TTR("Clear"), MENU_CLEAR); menu->add_item(RTR("Clear"), MENU_CLEAR);
menu->add_separator(); menu->add_separator();
menu->add_item(TTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z); menu->add_item(RTR("Undo"), MENU_UNDO, KEY_MASK_CMD | KEY_Z);
menu->connect("id_pressed", this, "menu_option"); menu->connect("id_pressed", this, "menu_option");
} }