lyxerr << BOOST_CURRENT_FUNCTION
<< " Key [action="
<< func.action << "]["
- << keyseq->print() << ']'
+ << to_utf8(keyseq->print()) << ']'
<< endl;
}
// num_bytes == 0? (Lgb)
if (keyseq->length() > 1) {
- lyx_view_->message(from_utf8(keyseq->print()));
+ lyx_view_->message(keyseq->print());
}
case LFUN_COMMAND_PREFIX:
BOOST_ASSERT(lyx_view_);
- lyx_view_->message(from_utf8(keyseq->printOptions()));
+ lyx_view_->message(keyseq->printOptions());
break;
case LFUN_COMMAND_EXECUTE:
case LFUN_META_PREFIX:
meta_fake_bit = key_modifier::alt;
- setMessage(from_utf8(keyseq->print()));
+ setMessage(keyseq->print());
break;
case LFUN_BUFFER_TOGGLE_READ_ONLY:
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = from_utf8(keyseq->print());
+ dispatch_buffer = keyseq->print();
theLyXServer().notifyClient(to_utf8(dispatch_buffer));
break;
InsetCommandParams p(name);
data = InsetCommandMailer::params2string(name, p);
} else if (name == "include") {
+ // data is the include type: one of "include",
+ // "input", "verbatiminput" or "verbatiminput*"
+ if (data.empty())
+ // default type is requested
+ data = "include";
InsetCommandParams p(data);
data = InsetIncludeMailer::params2string(p);
} else if (name == "box") {
}
}
- string const shortcuts = theTopLevelKeymap().printbindings(cmd);
+ string const shortcuts = to_utf8(theTopLevelKeymap().printbindings(cmd));
if (!shortcuts.empty())
comname += ": " + shortcuts;
{
// When meta-fake key is pressed, show the key sequence so far + "M-".
if (wasMetaKey())
- return keyseq->print() + "M-";
+ return to_utf8(keyseq->print() + "M-");
// Else, when a non-complete key sequence is pressed,
// show the available options.
if (keyseq->length() > 0 && !keyseq->deleted())
- return keyseq->printOptions();
+ return to_utf8(keyseq->printOptions());
if (!view()->buffer())
return to_utf8(_("Welcome to LyX!"));