#include "kbmap.h"
#include "lyxrow.h"
#include "bufferlist.h"
+#include "buffer.h"
#include "BufferView.h"
#include "lyxserver.h"
#include "intl.h"
#include "ParagraphParameters.h"
#include "insets/insetcommand.h"
+#include "insets/insetexternal.h"
#include "insets/insettabular.h"
#include "mathed/formulamacro.h"
#include "support/FileInfo.h"
#include "support/forkedcontr.h"
#include "support/lstrings.h"
+#include "support/tostr.h"
#include "support/path.h"
#include "support/lyxfunctional.h"
-#include "support/BoostFormat.h"
-
#include <ctime>
#include <clocale>
#include <cstdlib>
view()->toggleToggle();
}
view()->update(TEXT(flag), BufferView::SELECT);
- view()->showCursor();
view()->switchKeyMap();
}
case LFUN_INSET_SETTINGS: {
disable = true;
UpdatableInset * inset = view()->theLockingInset();
-
+
if (!inset)
break;
// jump back to owner if an InsetText, so
// we get back to the InsetTabular or whatever
if (inset->lyxCode() == Inset::TEXT_CODE)
- inset = static_cast<UpdatableInset*>(inset->owner());
+ inset = inset->owner();
Inset::Code code = inset->lyxCode();
switch (code) {
case LFUN_TOC_INSERT:
code = Inset::TOC_CODE;
break;
- case LFUN_PARENTINSERT:
- code = Inset::PARENT_CODE;
- break;
case LFUN_HTMLURL:
case LFUN_URL:
code = Inset::URL_CODE;
case LFUN_END_OF_SENTENCE:
code = Inset::SPECIALCHAR_CODE;
break;
- case LFUN_PROTECTEDSPACE:
+ case LFUN_SPACE_INSERT:
// slight hack: we know this is allowed in math mode
if (!mathcursor)
- code = Inset::SPECIALCHAR_CODE;
+ code = Inset::SPACE_CODE;
break;
default:
break;
int const action = lyxaction.LookupFunc(s);
if (action == LFUN_UNKNOWN_ACTION) {
-#if USE_BOOST_FORMAT
-boost::format fmt(_("Unknown function (%1$s)"));
-fmt % s;
-owner->message(fmt.str());
-#else
- string const msg = string(_("Unknown function ("))
- + s + ')';
- owner->message(msg);
-#endif
+ owner->message(bformat(_("Unknown function (%1$s)"), s));
return;
}
selection_possible = false;
- if (view()->available())
- view()->hideCursor();
-
string argument = ev.argument;
kb_action action = ev.action;
goto exit_with_message;
}
+ if (view()->available())
+ view()->hideCursor();
+
if (view()->available() && view()->theLockingInset()) {
Inset::RESULT result;
if ((action > 1) || ((action == LFUN_UNKNOWN_ACTION) &&
&& argument.empty()) {
argument = encoded_last_key;
}
+
+ // the insets can't try to handle this,
+ // a table cell in the dummy position will
+ // lock its insettext, the insettext will
+ // pass it the bufferview, and succeed,
+ // so it will stay not locked. Not good
+ // if we've just done LFUN_ESCAPE (which
+ // injects an LFUN_PARAGRAPH_UPDATE)
+ if (action == LFUN_PARAGRAPH_UPDATE) {
+ view()->dispatch(ev);
+ goto exit_with_message;
+ }
+
// Undo/Redo is a bit tricky for insets.
if (action == LFUN_UNDO) {
view()->undo();
if (!searched_string.empty()) {
lyxfind::LyXFind(view(), searched_string, fw);
}
-// view()->showCursor();
}
break;
case LFUN_MENUWRITE:
if (!owner->buffer()->isUnnamed()) {
- ostringstream s1;
-#if USE_BOOST_FORMAT
- s1 << boost::format(_("Saving document %1$s..."))
- % MakeDisplayPath(owner->buffer()->fileName());
-#else
- s1 << _("Saving document ")
- << MakeDisplayPath(owner->buffer()->fileName())
- << _("...");
-#endif
- owner->message(STRCONV(s1.str()));
- MenuWrite(view(), owner->buffer());
- s1 << _(" done.");
- owner->message(STRCONV(s1.str()));
+ string const str = bformat(_("Saving document %1$s..."),
+ MakeDisplayPath(owner->buffer()->fileName()));
+ owner->message(str);
+ MenuWrite(owner->buffer());
+ owner->message(str + _(" done."));
} else
- WriteAs(view(), owner->buffer());
+ WriteAs(owner->buffer());
break;
case LFUN_WRITEAS:
- WriteAs(view(), owner->buffer(), argument);
+ WriteAs(owner->buffer(), argument);
break;
case LFUN_MENURELOAD: {
string const file = MakeDisplayPath(view()->buffer()->fileName(), 20);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Any changes will be lost. Are you sure you want to revert to the saved version of the document %1$s?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("Any changes will be lost. Are you sure you want to revert to the saved version of the document");
- text += file + _("?");
-#endif
+ 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);
int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 1, _("&Revert"), _("&Cancel"));
+ text, 0, 1, _("&Revert"), _("&Cancel"));
if (ret == 0)
view()->reload();
owner->getDialogs().showSearch();
break;
- case LFUN_REMOVEERRORS:
- if (view()->removeAutoInsets()) {
-#warning repaint() or update() or nothing ?
- view()->repaint();
- view()->fitCursor();
- }
- break;
-
case LFUN_DEPTH_MIN:
changeDepth(view(), TEXT(false), DEC_DEPTH, false);
owner->view_state_changed();
<< arg << "'. Bad installation?" << endl;
break;
}
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Opening help file %1$s..."))
- % MakeDisplayPath(fname);
-#else
- str << _("Opening help file ")
- << MakeDisplayPath(fname) << _("...");
-#endif
- owner->message(STRCONV(str.str()));
+ owner->message(bformat(_("Opening help file %1$s..."),
+ MakeDisplayPath(fname)));
view()->buffer(bufferlist.loadLyXFile(fname, false));
break;
}
int id;
istr >> id;
- Paragraph * par = owner->buffer()->getParFromID(id);
- if (par == 0) {
+ ParIterator par = owner->buffer()->getParFromID(id);
+ if (par == owner->buffer()->par_iterator_end()) {
lyxerr[Debug::INFO] << "No matching paragraph found! ["
<< id << ']' << endl;
break;
} else {
- lyxerr[Debug::INFO] << "Paragraph " << par->id()
+ lyxerr[Debug::INFO] << "Paragraph " << (*par)->id()
<< " found." << endl;
}
if (view()->theLockingInset())
view()->unlockInset(view()->theLockingInset());
- if (par->inInset()) {
- par->inInset()->edit(view());
+ if ((*par)->inInset()) {
+ FuncRequest cmd(view(), LFUN_INSET_EDIT, "left");
+ (*par)->inInset()->localDispatch(cmd);
}
// Set the cursor
- view()->getLyXText()->setCursor(par, 0);
+ view()->getLyXText()->setCursor(*par, 0);
view()->switchKeyMap();
owner->view_state_changed();
x11_name != lcolor.getX11Name(LColor::graphicsbg));
if (!lcolor.setColor(lyx_name, x11_name)) {
-#if USE_BOOST_FORMAT
setErrorMessage(
- boost::io::str(
- boost::format(
- _("Set-color \"%1$s\" failed "
+ bformat(_("Set-color \"%1$s\" failed "
"- color is undefined or "
- "may not be redefined"))
- % lyx_name));
-#else
- setErrorMessage(_("Set-color ") + lyx_name
- + _(" failed - color is undefined"
- " or may not be redefined"));
-#endif
-
+ "may not be redefined"), lyx_name));
break;
}
owner->getDialogs().toggleTooltips();
break;
+ case LFUN_EXTERNAL_EDIT: {
+ InsetExternal()
+ .localDispatch(FuncRequest(view(), action, argument));
+ break;
+ }
+
default:
// Then if it was none of the above
// Trying the BufferView::pimpl dispatch:
return;
}
- ostringstream str;
-#if USE_BOOST_FORMAT
- str << boost::format(_("Opening document %1$s...")) % disp_fn;
-#else
- str << _("Opening document ") << disp_fn << _("...");
-#endif
-
- owner->message(STRCONV(str.str()));
+ owner->message(bformat(_("Opening document %1$s..."), disp_fn));
Buffer * openbuf = bufferlist.loadLyXFile(filename);
- ostringstream str2;
+ string str2;
if (openbuf) {
view()->buffer(openbuf);
-#if USE_BOOST_FORMAT
- str2 << boost::format(_("Document %1$s opened.")) % disp_fn;
-#else
- str2 << _("Document ") << disp_fn << _(" opened.");
-#endif
+ str2 = bformat(_("Document %1$s opened."), disp_fn);
} else {
-#if USE_BOOST_FORMAT
- str2 << boost::format(_("Could not open document %1$s"))
- % disp_fn;
-#else
- str2 << _("Could not open document ") << disp_fn;
-#endif
+ str2 = bformat(_("Could not open document %1$s"), disp_fn);
}
- owner->message(STRCONV(str2.str()));
+ owner->message(str2);
}
initpath = trypath;
}
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Select %1$s file to import"));
- fmt % formats.prettyName(format);
- string const text = fmt.str();
-#else
- string const text = _("Select ") + formats.prettyName(format)
- + _(" file to import");;
-#endif
+ string const text = bformat(_("Select %1$s file to import"),
+ formats.prettyName(format));
FileDialog fileDlg(text,
LFUN_IMPORT,
if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
string const file = MakeDisplayPath(lyxfile, 30);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s already exists.\n\nDo you want to over-write that document?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" already exists.\n\nDo you want to over-write that document?");
-#endif
+ string 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, 1, _("&Over-write"), _("&Cancel"));
+ text, 0, 1, _("&Over-write"), _("&Cancel"));
if (ret == 1) {
owner->message(_("Canceled."));
projects / lyx.git / blobdiff