[LyX/master] Dissolve some shortcut conflicts in the wake of f3a4602c4c1ec

Juergen Spitzmueller spitz at lyx.org
Wed Apr 3 06:29:02 UTC 2024


commit 728175f9acdd8b67249d5403d99319557201f80c
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Wed Apr 3 08:28:00 2024 +0200

    Dissolve some shortcut conflicts in the wake of f3a4602c4c1ec
---
 lib/ui/stdcontext.inc      | 10 +++++-----
 src/frontends/qt/Menus.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 90a4cda1aa..dc49f44c77 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -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
 
diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp
index 6c4b08cf48..4a09a1b4a7 100644
--- a/src/frontends/qt/Menus.cpp
+++ b/src/frontends/qt/Menus.cpp
@@ -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)));


More information about the lyx-cvs mailing list