using lyx::support::makeAbsPath;
using lyx::support::makeDisplayPath;
using lyx::support::package;
-using lyx::support::Path;
using lyx::support::quoteName;
using lyx::support::rtrim;
using lyx::support::split;
// num_bytes == 0? (Lgb)
if (keyseq.length() > 1) {
- owner->message(keyseq.print());
+ owner->message(lyx::from_utf8(keyseq.print()));
}
buf = owner->buffer();
if (cmd.action == LFUN_NOACTION) {
- flag.message(N_("Nothing to do"));
+ flag.message(lyx::from_utf8(N_("Nothing to do")));
flag.enabled(false);
return flag;
}
}
if (flag.unknown()) {
- flag.message(N_("Unknown action"));
+ flag.message(lyx::from_utf8(N_("Unknown action")));
return flag;
}
if (!flag.enabled()) {
if (flag.message().empty())
- flag.message(N_("Command disabled"));
+ flag.message(lyx::from_utf8(N_("Command disabled")));
return flag;
}
// Check whether we need a buffer
if (!lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer) && !buf) {
// no, exit directly
- flag.message(N_("Command not allowed with"
- "out any document open"));
+ flag.message(lyx::from_utf8(N_("Command not allowed with"
+ "out any document open")));
flag.enabled(false);
return flag;
}
case LFUN_SERVER_GET_NAME:
case LFUN_SERVER_NOTIFY:
case LFUN_SERVER_GOTO_FILE_ROW:
- case LFUN_DIALOG_SHOW_NEXT_INSET:
case LFUN_DIALOG_HIDE:
case LFUN_DIALOG_DISCONNECT_INSET:
case LFUN_BUFFER_CHILD_OPEN:
if (buf && buf->isReadonly()
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
- flag.message(N_("Document is read-only"));
+ flag.message(lyx::from_utf8(N_("Document is read-only")));
flag.enabled(false);
}
&& lookupChangeType(cur, true) == Change::DELETED
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
&& !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
- flag.message(N_("This portion of the document is deleted."));
+ flag.message(lyx::from_utf8(N_("This portion of the document is deleted.")));
flag.enabled(false);
}
// the default error message if we disable the command
if (!flag.enabled() && flag.message().empty())
- flag.message(N_("Command disabled"));
+ flag.message(lyx::from_utf8(N_("Command disabled")));
return flag;
}
if (buf.isClean())
return true;
- string const file = makeDisplayPath(buf.fileName(), 30);
- string text = bformat(_("The document %1$s has unsaved "
- "changes.\n\nDo you want to save "
- "the document?"), file);
+ docstring const file = makeDisplayPath(buf.fileName(), 30);
+ docstring text = bformat(_("The document %1$s has unsaved "
+ "changes.\n\nDo you want to save "
+ "the document?"), file);
int const ret = Alert::prompt(_("Save changed document?"),
text, 0, 1, _("&Save"),
_("&Cancel"));
void showPrintError(string const & name)
{
- string str = bformat(_("Could not print the document %1$s.\n"
- "Check that your printer is set up correctly."),
+ docstring str = bformat(_("Could not print the document %1$s.\n"
+ "Check that your printer is set up correctly."),
makeDisplayPath(name, 50));
Alert::error(_("Print document failed"), str);
}
lyx::textclass_type const tc = tc_pair.second;
if (!textclasslist[tc].load()) {
- string s = bformat(_("The document could not be converted\n"
- "into the document class %1$s."),
- textclasslist[tc].name());
+ docstring s = bformat(_("The document could not be converted\n"
+ "into the document class %1$s."),
+ lyx::from_utf8(textclasslist[tc].name()));
Alert::error(_("Could not change class"), s);
}
}
}
case LFUN_COMMAND_PREFIX:
- owner->message(keyseq.printOptions());
+ owner->message(lyx::from_utf8(keyseq.printOptions()));
break;
case LFUN_COMMAND_EXECUTE:
case LFUN_CANCEL:
keyseq.reset();
meta_fake_bit = key_modifier::none;
- if (view()->available())
+ if (view()->buffer())
// cancel any selection
dispatch(FuncRequest(LFUN_MARK_OFF));
- setMessage(N_("Cancel"));
+ setMessage(_("Cancel"));
break;
case LFUN_META_PREFIX:
meta_fake_bit = key_modifier::alt;
- setMessage(keyseq.print());
+ setMessage(lyx::from_utf8(keyseq.print()));
break;
case LFUN_BUFFER_TOGGLE_READ_ONLY:
case LFUN_BUFFER_WRITE:
if (!owner->buffer()->isUnnamed()) {
- string const str = bformat(_("Saving document %1$s..."),
+ docstring const str = bformat(_("Saving document %1$s..."),
makeDisplayPath(owner->buffer()->fileName()));
owner->message(str);
menuWrite(owner->buffer());
break;
case LFUN_BUFFER_RELOAD: {
- string const file = makeDisplayPath(view()->buffer()->fileName(), 20);
- string text = bformat(_("Any changes will be lost. Are you sure "
- "you want to revert to the saved version of the document %1$s?"), file);
+ docstring const file = makeDisplayPath(view()->buffer()->fileName(), 20);
+ docstring text = bformat(_("Any changes will be lost. Are you sure "
+ "you want to revert to the saved version of the document %1$s?"), file);
int const ret = Alert::prompt(_("Revert to saved document?"),
text, 0, 1, _("&Revert"), _("&Cancel"));
// Push directory path.
string const path = buffer->temppath();
- Path p(path);
+ lyx::support::Path p(path);
// there are three cases here:
// 1. we print to a file
break;
case LFUN_LYX_QUIT:
- if (view()->available()) {
+ if (view()->buffer()) {
// save cursor Position for opened files to .lyx/session
LyX::ref().session().saveFilePosition(owner->buffer()->fileName(),
boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
case LFUN_HELP_OPEN: {
string const arg = argument;
if (arg.empty()) {
- setErrorMessage(N_("Missing argument"));
+ setErrorMessage(_("Missing argument"));
break;
}
string const fname = i18nLibFileSearch("doc", arg, "lyx");
break;
case LFUN_MENU_OPEN:
- owner->getMenubar().openByName(argument);
+ owner->getMenubar().openByName(lyx::from_utf8(argument));
break;
// --- lyxserver commands ----------------------------
case LFUN_SERVER_GET_NAME:
- setMessage(owner->buffer()->fileName());
+ setMessage(lyx::from_utf8(owner->buffer()->fileName()));
lyxerr[Debug::INFO] << "FNAME["
<< owner->buffer()->fileName()
<< "] " << endl;
break;
case LFUN_SERVER_NOTIFY:
- dispatch_buffer = keyseq.print();
- lyxserver->notifyClient(dispatch_buffer);
+ dispatch_buffer = lyx::from_utf8(keyseq.print());
+ lyxserver->notifyClient(lyx::to_utf8(dispatch_buffer));
break;
case LFUN_SERVER_GOTO_FILE_ROW: {
view()->setCursorFromRow(row);
view()->center();
- // see BufferView_pimpl::center()
+ // see BufferView::center()
break;
}
break;
}
- case LFUN_DIALOG_SHOW_NEXT_INSET:
- break;
-
case LFUN_DIALOG_UPDATE: {
string const & name = argument;
// Can only update a dialog connected to an existing inset
case LFUN_BUFFER_CHILD_OPEN: {
string const filename =
makeAbsPath(argument, owner->buffer()->filePath());
- setMessage(N_("Opening child document ") +
- makeDisplayPath(filename) + "...");
+ // FIXME Should use bformat
+ setMessage(_("Opening child document ") +
+ makeDisplayPath(filename) + lyx::from_ascii("..."));
view()->savePosition(0);
string const parentfilename = owner->buffer()->fileName();
if (bufferlist.exists(filename))
}
case LFUN_PREFERENCES_SAVE: {
- Path p(package().user_support());
+ lyx::support::Path p(package().user_support());
lyxrc.write("preferences", false);
break;
}
string lyx_name;
string const x11_name = split(argument, lyx_name, ' ');
if (lyx_name.empty() || x11_name.empty()) {
- setErrorMessage(N_("Syntax: set-color <lyx_name>"
+ setErrorMessage(_("Syntax: set-color <lyx_name>"
" <x11_name>"));
break;
}
if (!lcolor.setColor(lyx_name, x11_name)) {
setErrorMessage(
- bformat(_("Set-color \"%1$s\" failed "
- "- color is undefined or "
- "may not be redefined"), lyx_name));
+ bformat(_("Set-color \"%1$s\" failed "
+ "- color is undefined or "
+ "may not be redefined"),
+ lyx::from_utf8(lyx_name)));
break;
}
}
case LFUN_MESSAGE:
- owner->message(argument);
+ owner->message(lyx::from_utf8(argument));
break;
case LFUN_TOOLTIPS_TOGGLE:
}
if (defaults.writeFile(defaults.fileName()))
+ // FIXME Should use bformat
setMessage(_("Document defaults saved in ")
+ makeDisplayPath(fname));
else
}
}
- if (view()->available()) {
+ if (view()->buffer()) {
// Redraw screen unless explicitly told otherwise.
// This also initializes the position cache for all insets
// in (at least partially) visible top-level paragraphs.
}
}
if (!quitting)
- sendDispatchMessage(_(getMessage()), cmd);
+ // FIXME UNICODE: _() does not support anything but ascii.
+ // Do we need a lyx::to_ascii() method?
+ sendDispatchMessage(getMessage(), cmd);
}
-void LyXFunc::sendDispatchMessage(string const & msg, FuncRequest const & cmd)
+void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd)
{
/* When an action did not originate from the UI/kbd, it makes
* sense to avoid updating the GUI. It turns out that this
|| cmd.origin == FuncRequest::COMMANDBUFFER);
if (cmd.action == LFUN_SELF_INSERT || !verbose) {
- lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl;
+ lyxerr[Debug::ACTION] << "dispatch msg is " << lyx::to_utf8(msg) << endl;
if (!msg.empty())
owner->message(msg);
return;
}
- string dispatch_msg = msg;
+ docstring dispatch_msg = msg;
if (!dispatch_msg.empty())
dispatch_msg += ' ';
if (!comname.empty()) {
comname = rtrim(comname);
- dispatch_msg += '(' + rtrim(comname) + ')';
+ dispatch_msg += lyx::from_utf8('(' + rtrim(comname) + ')');
}
- lyxerr[Debug::ACTION] << "verbose dispatch msg " << dispatch_msg << endl;
+ lyxerr[Debug::ACTION] << "verbose dispatch msg "
+ << lyx::to_utf8(dispatch_msg) << endl;
if (!dispatch_msg.empty())
owner->message(dispatch_msg);
}
string initpath = lyxrc.document_path;
string filename(name);
- if (view()->available()) {
+ if (view()->buffer()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (isDirWriteable(trypath))
// The template stuff
string templname;
if (fromTemplate) {
- FileDialog fileDlg(_("Select template file"),
+ FileDialog fileDlg(lyx::to_utf8(_("Select template file")),
LFUN_SELECT_FILE_SYNC,
- make_pair(string(_("Documents|#o#O")),
+ make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
string(lyxrc.document_path)),
- make_pair(string(_("Templates|#T#t")),
+ make_pair(string(lyx::to_utf8(_("Templates|#T#t"))),
string(lyxrc.template_path)));
FileDialog::Result result =
fileDlg.open(lyxrc.template_path,
- FileFilterList(_("LyX Documents (*.lyx)")),
+ FileFilterList(lyx::to_utf8(_("LyX Documents (*.lyx)"))),
string());
if (result.first == FileDialog::Later)
{
string initpath = lyxrc.document_path;
- if (view()->available()) {
+ if (view()->buffer()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (isDirWriteable(trypath))
string filename;
if (fname.empty()) {
- FileDialog fileDlg(_("Select document to open"),
+ FileDialog fileDlg(lyx::to_utf8(_("Select document to open")),
LFUN_FILE_OPEN,
- make_pair(string(_("Documents|#o#O")),
+ make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
string(lyxrc.document_path)),
- make_pair(string(_("Examples|#E#e")),
+ make_pair(string(lyx::to_utf8(_("Examples|#E#e"))),
string(addPath(package().system_support(), "examples"))));
FileDialog::Result result =
fileDlg.open(initpath,
- FileFilterList(_("LyX Documents (*.lyx)")),
+ FileFilterList(lyx::to_utf8(_("LyX Documents (*.lyx)"))),
string());
if (result.first == FileDialog::Later)
filename = fullpath;
}
- string const disp_fn(makeDisplayPath(filename));
+ docstring const disp_fn = makeDisplayPath(filename);
// if the file doesn't exist, let the user create one
if (!fs::exists(filename)) {
owner->message(bformat(_("Opening document %1$s..."), disp_fn));
- string str2;
+ docstring str2;
if (owner->loadLyXFile(filename)) {
str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
if (filename.empty()) {
string initpath = lyxrc.document_path;
- if (view()->available()) {
+ if (view()->buffer()) {
string const trypath = owner->buffer()->filePath();
// If directory is writeable, use this as default.
if (isDirWriteable(trypath))
initpath = trypath;
}
- string const text = bformat(_("Select %1$s file to import"),
+ docstring const text = bformat(_("Select %1$s file to import"),
formats.prettyName(format));
- FileDialog fileDlg(text,
+ FileDialog fileDlg(lyx::to_utf8(text),
LFUN_BUFFER_IMPORT,
- make_pair(string(_("Documents|#o#O")),
+ make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
string(lyxrc.document_path)),
- make_pair(string(_("Examples|#E#e")),
+ make_pair(string(lyx::to_utf8(_("Examples|#E#e"))),
string(addPath(package().system_support(), "examples"))));
- string const filter = formats.prettyName(format)
+ string const filter = lyx::to_utf8(formats.prettyName(format))
+ " (*." + formats.extension(format) + ')';
FileDialog::Result result =
// if the file exists already, and we didn't do
// -i lyx thefile.lyx, warn
if (fs::exists(lyxfile) && filename != lyxfile) {
- string const file = makeDisplayPath(lyxfile, 30);
+ docstring const file = makeDisplayPath(lyxfile, 30);
- string text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to over-write that document?"), file);
+ docstring text = bformat(_("The document %1$s already exists.\n\n"
+ "Do you want to over-write that document?"), file);
int const ret = Alert::prompt(_("Over-write document?"),
text, 0, 1, _("&Over-write"), _("&Cancel"));
// This function is bit problematic when it comes to NLS, to make the
// lyx servers client be language indepenent we must not translate
// strings sent to this func.
-void LyXFunc::setErrorMessage(string const & m) const
+void LyXFunc::setErrorMessage(docstring const & m) const
{
dispatch_buffer = m;
errorstat = true;
}
-void LyXFunc::setMessage(string const & m) const
+void LyXFunc::setMessage(docstring const & m) const
{
dispatch_buffer = m;
}
if (keyseq.length() > 0 && !keyseq.deleted())
return keyseq.printOptions();
- if (!view()->available())
- return _("Welcome to LyX!");
+ if (!view()->buffer())
+ return lyx::to_utf8(_("Welcome to LyX!"));
return view()->cursor().currentState();
}
projects / lyx.git / blobdiff