namespace lyx {
-using support::compare_no_case;
using support::compare_ascii_no_case;
using support::contains;
using support::makeDisplayPath;
using support::token;
-using support::uppercase;
using boost::bind;
if (bindings.size()) {
return bindings.begin()->print(forgui);
} else {
- lyxerr[Debug::KBMAP]
+ LYXERR(Debug::KBMAP)
<< "No binding for "
<< lyxaction.getActionName(func_.action)
<< '(' << to_utf8(func_.argument()) << ')' << endl;
<< "\" does not contain shortcut `"
<< to_utf8(shortcut) << "'." << endl;
for (const_iterator it2 = begin(); it2 != it1 ; ++it2) {
- if (!compare_no_case(it2->shortcut(), shortcut)) {
+ if (!compare_ascii_no_case(it2->shortcut(), shortcut)) {
lyxerr << "Menu warning: menu entries "
<< '"' << to_utf8(it1->fulllabel())
<< "\" and \"" << to_utf8(it2->fulllabel())
switch (kind) {
case MenuItem::ImportFormats:
+ // FIXME: This is a hack, we should rather solve
+ // FIXME: bug 2488 instead.
if ((*fit)->name() == "text")
- label = _("Plain Text as Lines");
+ label = _("Plain Text");
else if ((*fit)->name() == "textparagraph")
- label = _("Plain Text as Paragraphs");
+ label = _("Plain Text, Join Lines");
label += "...";
break;
case MenuItem::ViewFormats:
// and
// review (auto)
// in the case of auto.
- if (cit->flags & ToolbarBackend::AUTO)
+ if (cit->flags & ToolbarInfo::AUTO)
label += _(" (auto)");
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, cit->name)));