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

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24327 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2008-04-18 16:26:24 +00:00
parent 491f30920e
commit b56a40d7eb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ public:
/// set the description of the submenu /// set the description of the submenu
void submenuname(QString const & name) { submenuname_ = name; } 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 const & submenu() const { return submenu_.at(0); }
MenuDefinition & submenu() { return submenu_[0]; } MenuDefinition & submenu() { return submenu_[0]; }

5
src/insets/InsetInfo.cpp
View File

@ -208,12 +208,13 @@ void InsetInfo::updateInfo()
vector<docstring> names; vector<docstring> names;
FuncRequest func = lyxaction.lookupFunc(name_); FuncRequest func = lyxaction.lookupFunc(name_);
if (func.action == LFUN_UNKNOWN_ACTION) { 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; break;
} }
// iterate through the menubackend to find it // iterate through the menubackend to find it
if (!theApp()->searchMenu(func, names)) { 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; break;
} }
// if find, return its path. // if find, return its path.