From 6f1c72bdc64b72d4a59ced98caa71907da777c51 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Fri, 9 Jan 2009 07:33:51 +0000 Subject: [PATCH] Backport 5648 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28044 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiKeySymbol.cpp | 1 + status.16x | 1 + 2 files changed, 2 insertions(+) diff --git a/src/frontends/qt4/GuiKeySymbol.cpp b/src/frontends/qt4/GuiKeySymbol.cpp index 314c7d6731..082a184721 100644 --- a/src/frontends/qt4/GuiKeySymbol.cpp +++ b/src/frontends/qt4/GuiKeySymbol.cpp @@ -402,6 +402,7 @@ static std::string const qkey_to_string(int lkey) case Qt::Key_Y: return "y"; case Qt::Key_Z: return "z"; + case Qt::Key_Return: return "Return"; case Qt::Key_Escape: return "Escape"; case Qt::Key_Tab: return "Tab"; case Qt::Key_Backspace: return "BackSpace"; diff --git a/status.16x b/status.16x index 9a8e2152bd..33f9a821ed 100644 --- a/status.16x +++ b/status.16x @@ -110,6 +110,7 @@ What's new - Allow pasting of text from applications that set the clipboard mimetype to both graphics and text (bug 5560). +- Fix setting shortcuts with a Return key in the shortcuts dialog (bug 5648). * DOCUMENTATION AND LOCALIZATION