anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hide OptSubmenus (#9717) (for real this time)

Browse Source 
Amend 6cc69343 and d449e7e6. See the latter for the rationale behind this
change.
This commit is contained in:
Guillaume Munch 2015-12-17 22:26:50 +00:00
parent 6cc6934378
commit 54a28ca2dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/Menus.cpp
View File

@ -419,7 +419,7 @@ void MenuDefinition::addWithStatusCheck(MenuItem const & i)
if ((cit->kind() == MenuItem::Command
|| cit->kind() == MenuItem::Submenu
|| cit->kind() == MenuItem::Help)
&& (!i.optional() || cit->status().enabled())) {
&& cit->status().enabled()) {
enabled = true;
break;
}
@ -1771,7 +1771,7 @@ void Menu::Impl::populate(QMenu & qMenu, MenuDefinition const & menu)
else if (m->kind() == MenuItem::Submenu) {
QMenu * subMenu = qMenu.addMenu(label(*m));
populate(*subMenu, m->submenu());
subMenu->setEnabled(m->status().enabled());
subMenu->setEnabled(!subMenu->isEmpty());
} else {
// we have a MenuItem::Command
qMenu.addAction(new Action(QIcon(), label(*m),