Toolbar tb;
tb.name = lex.getString();
lex.next(true);
- if (!lex.isOK()) {
+ tb.gui_name = lex.getString();
+ if (!lex) {
lyxerr << "ToolbarBackend::read: Malformed toolbar "
"description " << lex.getString() << endl;
return;
}
- tb.gui_name = lex.getString();
bool quit = false;
switch (lex.lex()) {
case TO_ADD:
if (lex.next(true)) {
- docstring const tooltip = _(lex.getString());
+ docstring const tooltip = translateIfPossible(lex.getDocString());
lex.next(true);
string const func_arg = lex.getString();
- lyxerr[Debug::PARSER]
+ LYXERR(Debug::PARSER)
<< "ToolbarBackend::read TO_ADD func: `"
<< func_arg << '\'' << endl;
if (!f.argument().empty())
xpm_name = subst(name + ' ' + to_utf8(f.argument()), ' ', '_');
- fullname = libFileSearch("images", xpm_name, "xpm");
+ fullname = libFileSearch("images", xpm_name, "xpm").absFilename();
if (fullname.empty()) {
// try without the argument
- fullname = libFileSearch("images", name, "xpm");
+ fullname = libFileSearch("images", name, "xpm").absFilename();
}
}
if (!fullname.empty()) {
- lyxerr[Debug::GUI] << "Full icon name is `"
+ LYXERR(Debug::GUI) << "Full icon name is `"
<< fullname << '\'' << endl;
return fullname;
}
- lyxerr[Debug::GUI] << "Cannot find icon for command \""
+ LYXERR(Debug::GUI) << "Cannot find icon for command \""
<< lyxaction.getActionName(f.action)
<< '(' << to_utf8(f.argument()) << ")\"" << endl;
- return libFileSearch("images", "unknown", "xpm");
+ return libFileSearch("images", "unknown", "xpm").absFilename();
}