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

Amend 6cc69343 and d449e7e6. See the latter for the rationale behind this
change.

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 10761446d28f4d11bb561c9d39c8cfbc703ceb99..ea32aace5b7af5f28f3e480ff5eba460437534e4 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -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),