From adf48d1f515b59bcc2a79003d5b5120694f48392 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 31 Oct 2008 11:19:16 +0000
Subject: [PATCH] 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
---
 src/KeyMap.cpp           | 9 +++++----
 src/KeyMap.h             | 3 ++-
 src/LyXFunc.cpp          | 2 +-
 src/insets/InsetInfo.cpp | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index c6d355c237..f6b52a13ec 100644
--- 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 cc7c155959..f76fa85f2a 100644
--- 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 d9a8be61c2..4c035bf711 100644
--- 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 c87df0acd1..57f63a9947 100644
--- 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;
 	}
-- 
2.39.2