X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt%2FGuiToolbar.cpp;h=51699c98a8741a2f2e451464f3e501b9cda49a5a;hb=b41293352ea8d52890b7668f059fd07f09bd6bb6;hp=bc2613d1a4e8b70632ae3fa23422a08770849287;hpb=b59eed3846613d1ade80df12932f497d03db1c4d;p=features.git

diff --git a/src/frontends/qt/GuiToolbar.cpp b/src/frontends/qt/GuiToolbar.cpp
index bc2613d1a4..51699c98a8 100644
--- a/src/frontends/qt/GuiToolbar.cpp
+++ b/src/frontends/qt/GuiToolbar.cpp
@@ -142,17 +142,23 @@ void GuiToolbar::setVisibility(int visibility)
 }
 
 
-Action * GuiToolbar::addItem(ToolbarItem const & item)
+Action * GuiToolbar::addItem(ToolbarItem const & item, bool menu)
 {
 	QString text = toqstr(item.label);
+	QString tooltip = text;
 	// Get the keys bound to this action, but keep only the
 	// first one later
 	KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(*item.func);
-	if (!bindings.empty())
-		text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]";
+	if (!bindings.empty()) {
+		QString binding = toqstr(bindings.begin()->print(KeySequence::ForGui));
+		if (menu)
+			text += '\t' + binding;
+		else
+			tooltip += " [" + binding + "]";
+	}
 
 	Action * act = new Action(item.func, getIcon(*item.func, false), text,
-							  text, this);
+	                          tooltip, this);
 	if (item.type == ToolbarItem::BIDICOMMAND)
 		act->setRtlIcon(getIcon(*item.func, false, true));
 
@@ -277,7 +283,7 @@ void StaticMenuButton::initialize()
 	ToolbarInfo::item_iterator const end = tbinfo->items.end();
 	for (; it != end; ++it)
 		if (!getStatus(*it->func).unknown())
-			m->add(bar_->addItem(*it));
+			m->add(bar_->addItem(*it, true));
 	setMenu(m);
 }