Fix part of http://bugzilla.lyx.org/show_bug.cgi?id=5421

Make InsetInfo shortcuts use Portable representation of KeySequence.

	* KeyMap.cpp (printBindings): add format parameter

	* LyXFunc.cpp (sendDispatchMessage):
	* insets/InsetInfo.cpp (updateInfo): adapt.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27208 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index c6d355c237ce31a8f19d0c6586c71a79ed1d1b57..f6b52a13ec7c0fe76a67b6fc7603b274427f74bc 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -397,7 +397,8 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r)
 }
 
 
-docstring KeyMap::printBindings(FuncRequest const & func) const
+docstring KeyMap::printBindings(FuncRequest const & func,
+                               KeySequence::outputFormat format) const
 {
        Bindings bindings = findBindings(func);
        if (bindings.empty())
@@ -406,11 +407,11 @@ docstring KeyMap::printBindings(FuncRequest const & func) const
        odocstringstream res;
        Bindings::const_iterator cit = bindings.begin();
        Bindings::const_iterator cit_end = bindings.end();
-       // prin the first item
-       res << cit->print(KeySequence::ForGui);
+       // print the first item
+       res << cit->print(format);
        // more than one shortcuts?
        for (++cit; cit != cit_end; ++cit)
-               res << ", " << cit->print(KeySequence::ForGui);
+               res << ", " << cit->print(format);
        return res.str();
 }
 

diff --git a/src/KeyMap.h b/src/KeyMap.h
index cc7c15595915cf3ec9ea94e65125f8e4d964536c..f76fa85f2adf63a0018ce82d42b56dd34ed78965 100644 (file)
--- a/src/KeyMap.h
+++ b/src/KeyMap.h
@@ -106,7 +106,8 @@ public:
        Bindings findBindings(FuncRequest const & func) const;
 
        /// Given an action, print the keybindings.
-       docstring printBindings(FuncRequest const & func) const;
+       docstring printBindings(FuncRequest const & func,
+                               KeySequence::outputFormat format) const;
 
        struct Binding {
                Binding(FuncRequest const & r, KeySequence const & s, ItemType t)

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index d9a8be61c21785dcf6de71727b73441bcff18890..4c035bf71159f14e7c54a8545a48ce73b71fed9d 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1706,7 +1706,7 @@ void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd
                }
        }
 
-       docstring const shortcuts = theTopLevelKeymap().printBindings(cmd);
+       docstring const shortcuts = theTopLevelKeymap().printBindings(cmd, KeySequence::ForGui);
 
        if (!shortcuts.empty())
                comname += ": " + shortcuts;

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index c87df0acd1f8025e4f678c65c978898a55c6be51..57f63a9947f98fd8b4a6d2466003fcd367267621 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -288,7 +288,7 @@ void InsetInfo::updateInfo()
                        setText(bindings.rbegin()->print(KeySequence::Portable),
                                Font(getLayout().font()), false);
                else
-                       setText(theTopLevelKeymap().printBindings(func), 
+                       setText(theTopLevelKeymap().printBindings(func, KeySequence::Portable), 
                                Font(getLayout().font()), false);
                break;
        }