anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of bindings for StaticMenuButton

Browse Source 
This requires to add a parameter to GuiToolbar::addItem so that it is
possble to make a difference between toolbar buttons and menu items.

The long-term solution is to rely on the menu backend for such things.

Fixes bug #12004.
This commit is contained in:
Jean-Marc Lasgouttes 2022-07-19 18:39:04 +02:00
parent 23a27e90ba
commit 7823d3b01b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontends/qt/GuiToolbar.cpp
View File

@ -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 text = toqstr(item.label);
QString tooltip = text;
// Get the keys bound to this action, but keep only the // Get the keys bound to this action, but keep only the
// first one later // first one later
KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(*item.func); KeyMap::Bindings bindings = theTopLevelKeymap().findBindings(*item.func);
if (!bindings.empty()) if (!bindings.empty()) {
text += " [" + toqstr(bindings.begin()->print(KeySequence::ForGui)) + "]"; 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, Action * act = new Action(item.func, getIcon(*item.func, false), text,
text, this); tooltip, this);
if (item.type == ToolbarItem::BIDICOMMAND) if (item.type == ToolbarItem::BIDICOMMAND)
act->setRtlIcon(getIcon(*item.func, false, true)); act->setRtlIcon(getIcon(*item.func, false, true));
@ -277,7 +283,7 @@ void StaticMenuButton::initialize()
ToolbarInfo::item_iterator const end = tbinfo->items.end(); ToolbarInfo::item_iterator const end = tbinfo->items.end();
for (; it != end; ++it) for (; it != end; ++it)
if (!getStatus(*it->func).unknown()) if (!getStatus(*it->func).unknown())
m->add(bar_->addItem(*it)); m->add(bar_->addItem(*it, true));
setMenu(m); setMenu(m);
} }

5
src/frontends/qt/GuiToolbar.h
View File

@ -169,8 +169,9 @@ public:
/// ///
GuiCommandBuffer * commandBuffer() { return command_buffer_; } GuiCommandBuffer * commandBuffer() { return command_buffer_; }
/// /// add item to toolbar.
Action * addItem(ToolbarItem const & item); /// \param menu : when true, the item is for a menu entry, not a button.
Action * addItem(ToolbarItem const & item, bool menu = false);
/// ///
GuiView const & owner() { return owner_; } GuiView const & owner() { return owner_; }