#include "support/LAssert.h"
#include <boost/bind.hpp>
-#include "support/BoostFormat.h"
#include <cassert>
#include <algorithm>
else
file = MakeDisplayPath(buf->fileName(), 30);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" has unsaved changes.\n\nWhat do you want to do with it?");
-#endif
+ string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+ "Do you want to save the document?"), file);
int const ret = Alert::prompt(_("Save changed document?"),
- text, 0, _("&Save"), _("&Discard"), _("&Cancel"));
+ text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
if (ret == 0) {
// FIXME: WriteAs can be asynch !
fname = OnlyFilename(buf->fileName());
else
fname = MakeDisplayPath(buf->fileName(), 30);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
- fmt % fname;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += fname + _(" has unsaved changes.\n\nWhat do you want to do with it?");
-#endif
+
+ string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+ "Do you want to save the document?"), fname);
int const ret = Alert::prompt(_("Save changed document?"),
- text, 0, _("&Save"), _("&Discard"), _("&Cancel"));
+ text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
if (ret == 0) {
if (buf->isUnnamed()) {
} else if (ret == 2) {
return false;
}
-
+
if (buf->isUnnamed()) {
removeAutosaveFile(buf->fileName());
}
}
-void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
+void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
+ LatexRunParams const & runparams)
{
BufferStorage::iterator it = bstore.begin();
BufferStorage::iterator end = bstore.end();
writefile += '/';
writefile += (*it)->getLatexName();
(*it)->makeLaTeXFile(writefile, mastertmpdir,
- false, true);
+ runparams, true);
(*it)->markDepClean(mastertmpdir);
}
}
string const doc = buf->isUnnamed()
? OnlyFilename(buf->fileName()) : buf->fileName();
-#if USE_BOOST_FORMAT
- lyxerr << boost::format(_("LyX: Attempting to save document %1$s"))
- % doc
- << endl;
-#else
- lyxerr << _("LyX: Attempting to save document ") << doc << endl;
-#endif
- // We try to save three places:
+ lyxerr << bformat(_("LyX: Attempting to save document %1$s"), doc) << endl;
+ // We try to save three places:
// 1) Same place as document. Unless it is an unnamed doc.
if (!buf->isUnnamed()) {
string s = buf->fileName();
if (!fileInfo2.exist()) {
string const file = MakeDisplayPath(s, 50);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The specified document\n%1$s\ncould not be read."));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The specified document\n");
- text += file + _(" could not be read.");
-#endif
+ string text = bformat(_("The specified document\n%1$s"
+ "\ncould not be read."), file);
Alert::error(_("Could not read document"), text);
return 0;
}
if (fileInfoE.getModificationTime()
> fileInfo2.getModificationTime()) {
string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("An emergency save of the document %1$s exists.\n\nRecover emergency save?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("An emergency save of the document ");
- text += file + _(" exists.\n\nRecover emergency save?");
-#endif
+ string text = bformat(_("An emergency save of the document %1$s exists.\n"
+ "\nRecover emergency save?"), file);
int const ret = Alert::prompt(_("Load emergency save?"),
- text, 0, _("&Recover"), _("&Load Original"));
+ text, 0, 1, _("&Recover"), _("&Load Original"));
if (ret == 0) {
ts = e;
// emergency file.
b->markDirty();
use_emergency = true;
- } else {
- // Here, we should delete the emergency save
- lyx::unlink(e);
}
}
}
if (fileInfoA.getModificationTime()
> fileInfo2.getModificationTime()) {
string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The backup of the document %1$s is newer.\n\nLoad the backup instead?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The backup of the document ");
- text += file + _(" is newer.\n\nLoad the backup instead?");
-#endif
+ string text = bformat(_("The backup of the document %1$s is newer.\n\n"
+ "Load the backup instead?"), file);
int const ret = Alert::prompt(_("Load backup?"),
- text, 0, _("&Load backup"), _("Load &original"));
+ text, 0, 1, _("&Load backup"), _("Load &original"));
if (ret == 0) {
ts = a;
}
if (!templateok) {
string const file = MakeDisplayPath(tname, 50);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The specified document template\n%1$s\ncould not be read."));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The specified document template\n");
- text += file + _(" could not be read.");
-#endif
+ string text = bformat(_("The specified document template\n%1$s\n"
+ "could not be read."), file);
Alert::error(_("Could not read template"), text);
// no template, start with empty buffer
- b->paragraphs.set(new Paragraph);
+ b->paragraphs.push_back(new Paragraph);
b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
}
} else { // start with empty buffer
- b->paragraphs.set(new Paragraph);
+ b->paragraphs.push_back(new Paragraph);
b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
}
}
b->setReadonly(false);
+ b->updateDocLang(b->params.language);
return b;
}
// file already open?
if (exists(s)) {
string const file = MakeDisplayPath(s, 20);
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s is already loaded.\n\nDo you want to revert to the saved version?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" is already loaded.\n\nDo you want to revert to the saved version?");
-#endif
+ string text = bformat(_("The document %1$s is already loaded.\n\n"
+ "Do you want to revert to the saved version?"), file);
int const ret = Alert::prompt(_("Revert to saved document?"),
- text, 1, _("&Revert"), _("&Switch to document"));
+ text, 0, 1, _("&Revert"), _("&Switch to document"));
if (ret == 0) {
// FIXME: should be LFUN_REVERT
string const file = MakeDisplayPath(s, 20);
// Here we probably should run
if (LyXVC::file_not_found_hook(s)) {
-#if USE_BOOST_FORMAT
- boost::format fmt(_("Do you want to retrieve the document %1$s from version control?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("Do you want to retrieve the document ");
- text += file + _(" from version control?");
-#endif
+ string text = bformat(_("Do you want to retrieve the document"
+ " %1$s from version control?"), file);
int const ret = Alert::prompt(_("Retrieve from version control?"),
- text, 0, _("&Retrieve"), _("&Cancel"));
+ text, 0, 1, _("&Retrieve"), _("&Cancel"));
if (ret == 0) {
// How can we know _how_ to do the checkout?
}
}
-#if USE_BOOST_FORMAT
- boost::format fmt(_("The document %1$s does not yet exist.\n\nDo you want to create a new document?"));
- fmt % file;
- string text = fmt.str();
-#else
- string text = _("The document ");
- text += file + _(" does not yet exist.\n\nDo you want to create a new document?");
-#endif
+ string text = bformat(_("The document %1$s does not yet exist.\n\n"
+ "Do you want to create a new document?"), file);
int const ret = Alert::prompt(_("Create new document?"),
- text, 0, _("&Create"), _("Cancel"));
+ text, 0, 1, _("&Create"), _("Cancel"));
if (ret == 0)
b = newFile(s, string(), true);
projects / lyx.git / blobdiff