#include <algorithm>
#include <functional>
-using lyx::support::addName;
-using lyx::support::bformat;
-using lyx::support::makeAbsPath;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::removeAutosaveFile;
-using lyx::support::package;
-using lyx::support::prefixIs;
+
+namespace lyx {
+
+using support::addName;
+using support::bformat;
+using support::FileName;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
using boost::bind;
using std::back_inserter;
using std::transform;
+namespace Alert = lyx::frontend::Alert;
+
BufferList::BufferList()
{}
}
+BufferList::iterator BufferList::begin()
+{
+ return bstore.begin();
+}
+
+
+BufferList::const_iterator BufferList::begin() const
+{
+ return bstore.begin();
+}
+
+
+BufferList::iterator BufferList::end()
+{
+ return bstore.end();
+}
+
+
+BufferList::const_iterator BufferList::end() const
+{
+ return bstore.end();
+}
+
+
bool BufferList::quitWriteBuffer(Buffer * buf)
{
BOOST_ASSERT(buf);
- string file;
+ docstring file;
if (buf->isUnnamed())
- file = onlyFilename(buf->fileName());
+ file = from_utf8(onlyFilename(buf->fileName()));
else
file = makeDisplayPath(buf->fileName(), 30);
- string const text =
+ docstring const text =
bformat(_("The document %1$s has unsaved changes.\n\n"
- "Do you want to save the document or discard the changes?"), file);
+ "Do you want to save the document or discard the changes?"),
+ file);
int const ret = Alert::prompt(_("Save changed document?"),
text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
if (!quitWriteBuffer(*it))
return false;
}
+ // now, all buffers have been written sucessfully
+ // save file names to .lyx/session
+ it = bstore.begin();
+ for (; it != end; ++it) {
+ // if master/slave are both open, do not save slave since it
+ // will be automatically loaded when the master is loaded
+ if ((*it)->getMasterBuffer() == (*it))
+ LyX::ref().session().lastOpened().add(FileName((*it)->fileName()));
+ }
return true;
}
{
auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
tmpbuf->params().useClassDefaults();
- lyxerr[Debug::INFO] << "Assigning to buffer "
+ LYXERR(Debug::INFO) << "Assigning to buffer "
<< bstore.size() << endl;
bstore.push_back(tmpbuf.get());
return tmpbuf.release();
{
BOOST_ASSERT(buf);
- // FIXME: is the quitting check still necessary ?
- if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) {
+ if (!ask || buf->isClean() || buf->paragraphs().empty()) {
release(buf);
return true;
}
- string fname;
+ docstring fname;
if (buf->isUnnamed())
- fname = onlyFilename(buf->fileName());
+ fname = from_utf8(onlyFilename(buf->fileName()));
else
fname = makeDisplayPath(buf->fileName(), 30);
- string const text =
+ docstring const text =
bformat(_("The document %1$s has unsaved changes.\n\n"
- "Do you want to save the document or discard the changes?"), fname);
+ "Do you want to save the document or discard the changes?"),
+ fname);
int const ret = Alert::prompt(_("Save changed document?"),
text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
if (buf->isUnnamed()) {
if (!writeAs(buf))
return false;
- } else if (buf->save()) {
- LyX::ref().session().addLastFile(buf->fileName());
- } else {
+ } else if (!menuWrite(buf))
return false;
- }
- } else if (ret == 2) {
+ else
+ return false;
+ } else if (ret == 2)
return false;
- }
if (buf->isUnnamed()) {
removeAutosaveFile(buf->fileName());
}
+Buffer * BufferList::last()
+{
+ if (bstore.empty())
+ return 0;
+ return bstore.back();
+}
+
+
Buffer * BufferList::getBuffer(unsigned int const choice)
{
if (choice >= bstore.size())
BufferStorage::iterator end = bstore.end();
for (; it != end; ++it) {
if (!(*it)->isDepClean(mastertmpdir)) {
- string writefile = mastertmpdir;
- writefile += '/';
- writefile += (*it)->getLatexName();
- (*it)->makeLaTeXFile(writefile, mastertmpdir,
+ string writefile = addName(mastertmpdir, (*it)->getLatexName());
+ (*it)->makeLaTeXFile(FileName(writefile), mastertmpdir,
runparams, false);
(*it)->markDepClean(mastertmpdir);
}
string const doc = buf->isUnnamed()
? onlyFilename(buf->fileName()) : buf->fileName();
- lyxerr << bformat(_("LyX: Attempting to save document %1$s"), doc) << endl;
+ lyxerr << to_utf8(
+ bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
+ << endl;
// We try to save three places:
// 1) Same place as document. Unless it is an unnamed doc.
string s = buf->fileName();
s += ".emergency";
lyxerr << " " << s << endl;
- if (buf->writeFile(s)) {
+ if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << _(" Save seems successful. Phew.") << endl;
+ lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
return;
} else {
- lyxerr << _(" Save failed! Trying...") << endl;
+ lyxerr << to_utf8(_(" Save failed! Trying...")) << endl;
}
}
string s = addName(package().home_dir(), buf->fileName());
s += ".emergency";
lyxerr << ' ' << s << endl;
- if (buf->writeFile(s)) {
+ if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << _(" Save seems successful. Phew.") << endl;
+ lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
return;
}
- lyxerr << _(" Save failed! Trying...") << endl;
+ lyxerr << to_utf8(_(" Save failed! Trying...")) << endl;
// 3) In "/tmp" directory.
// MakeAbsPath to prepend the current
s = addName(package().temp_dir(), buf->fileName());
s += ".emergency";
lyxerr << ' ' << s << endl;
- if (buf->writeFile(s)) {
+ if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << _(" Save seems successful. Phew.") << endl;
+ lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
return;
}
- lyxerr << _(" Save failed! Bummer. Document is lost.") << endl;
+ lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl;
}
}
-void BufferList::setCurrentAuthor(string const & name, string const & email)
+void BufferList::setCurrentAuthor(docstring const & name, docstring const & email)
{
BufferStorage::iterator it = bstore.begin();
BufferStorage::iterator end = bstore.end();
(*it)->params().authors().record(0, Author(name, email));
}
}
+
+
+} // namespace lyx