anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 21:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dissolve some shortcut conflicts in the wake of f3a4602c4c

Browse Source 
(cherry picked from commit 728175f9ac)
This commit is contained in:
Juergen Spitzmueller 2024-04-03 08:28:00 +02:00
parent c92d14e8c9
commit 3b4d9f8606
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ui/stdcontext.inc
View File

@ -237,7 +237,7 @@ Menuset
Item "Greyed Out|y" "inset-modify note Note Greyedout"
Separator
Item "Open All Notes|A" "inset-forall Note inset-toggle open"
Item "Close All Notes|o" "inset-forall Note inset-toggle close"
Item "Close All Notes|l" "inset-forall Note inset-toggle close"
End
#
@ -378,7 +378,7 @@ Menuset
Item "Paste" "paste"
Submenu "Paste Recent|e" "edit_pasterecent"
Separator
OptItem "Split Inset|t" "inset-split"
OptItem "Split Inset|i" "inset-split"
Separator
Item "Jump Back to Saved Bookmark|B" "bookmark-goto 0"
OptItem "Forward Search|F" "forward-search"
@ -399,7 +399,7 @@ Menuset
OptItem "Reject Change|j" "change-reject"
Separator
Submenu "Text Properties|x" "edit_textprops"
OptSubmenu "Custom Text Styles|S" "edit_textstyles"
OptSubmenu "Custom Text Styles|y" "edit_textstyles"
Item "Paragraph Settings...|P" "layout-paragraph"
OptItem "Unify Graphics Groups|U" "graphics-unify"
LanguageSelector
@ -648,9 +648,9 @@ Menuset
End
Menu "context-edit-index"
OptItem "Insert Subentry|b" "indexmacro-insert subentry"
OptItem "Insert Subentry|n" "indexmacro-insert subentry"
OptItem "Insert Sortkey|k" "indexmacro-insert sortkey"
OptItem "Insert See Reference|e" "indexmacro-insert see"
OptItem "Insert See Reference|c" "indexmacro-insert see"
OptItem "Insert See also Reference|a" "indexmacro-insert seealso"
End

4
src/frontends/qt/Menus.cpp
View File

@ -888,9 +888,9 @@ void MenuDefinition::expandSpellingSuggestions(BufferView const * bv)
docstring const arg = wl.word() + " " + from_ascii(wl.lang()->lang());
add(MenuItem(MenuItem::Command, qt_("Add to personal dictionary|r"),
FuncRequest(LFUN_SPELLING_ADD, arg)));
add(MenuItem(MenuItem::Command, qt_("Ignore this occurrence|g"),
add(MenuItem(MenuItem::Command, qt_("Ignore this occurrence|o"),
FuncRequest(LFUN_FONT_NO_SPELLCHECK, arg)));
add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|l"),
add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|t"),
FuncRequest(LFUN_SPELLING_IGNORE, arg)));
add(MenuItem(MenuItem::Command, qt_("Ignore all in this document|u"),
FuncRequest(LFUN_SPELLING_ADD_LOCAL, arg)));