InsetInfo: tidy up error messages, fix an obvious bug in menus.cpp that breaks "info...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24327 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 74a43ebe2731eefbe04b68f43018932fb26b5256..d2d2fd57dc94f239c20dd0f31f4e4765732e7d57 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -202,7 +202,7 @@ public:
        /// set the description of the  submenu
        void submenuname(QString const & name) { submenuname_ = name; }
        ///
-       bool hasSubmenu() const { return submenu_.isEmpty(); }
+       bool hasSubmenu() const { return !submenu_.isEmpty(); }
        ///
        MenuDefinition const & submenu() const { return submenu_.at(0); }
        MenuDefinition & submenu() { return submenu_[0]; }

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 442928b7c469bfa69e6a5097a7043564a01cf867..9a86168862a433e03ee9ca35383f6b92bcbdf145 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -208,12 +208,13 @@ void InsetInfo::updateInfo()
                vector<docstring> names;
                FuncRequest func = lyxaction.lookupFunc(name_);
                if (func.action == LFUN_UNKNOWN_ACTION) {
-                       setText(_("No menu entry for "), bp.getFont(), false);
+                       setText(bformat(_("Unknown action %1$s"), from_utf8(name_)), bp.getFont(), false);
                        break;
                }
                // iterate through the menubackend to find it
                if (!theApp()->searchMenu(func, names)) {
-                       setText(_("No menu entry for "), bp.getFont(), false);
+                       setText(bformat(_("No menu entry for action %1$s"), from_utf8(name_)),
+                               bp.getFont(), false);
                        break;
                }
                // if find, return its path.