#include "bufferparams.h"
#include "debug.h"
#include "gettext.h"
-#include "lastfiles.h"
+#include "session.h"
#include "lyx_cb.h"
#include "lyx_main.h"
#include "output_latex.h"
#include "paragraph.h"
-#include "ParagraphList_fwd.h"
+#include "ParagraphList.h"
#include "frontends/Alert.h"
#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);
+ 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"));
bool succeeded;
if (buf->isUnnamed())
- succeeded = WriteAs(buf);
+ succeeded = writeAs(buf);
else
- succeeded = MenuWrite(buf);
+ succeeded = menuWrite(buf);
if (!succeeded)
return false;
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;
}
{
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);
+ 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 (ret == 0) {
if (buf->isUnnamed()) {
- if (!WriteAs(buf))
+ if (!writeAs(buf))
return false;
- } else if (buf->save()) {
- LyX::ref().lastfiles().newFile(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())
string writefile = mastertmpdir;
writefile += '/';
writefile += (*it)->getLatexName();
- (*it)->makeLaTeXFile(writefile, mastertmpdir,
+ (*it)->makeLaTeXFile(FileName(writefile), mastertmpdir,
runparams, false);
(*it)->markDepClean(mastertmpdir);
}
return;
string const doc = buf->isUnnamed()
- ? OnlyFilename(buf->fileName()) : buf->fileName();
+ ? 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;
}
}
// 2) In HOME directory.
- string s = AddName(package().home_dir(), buf->fileName());
+ 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
// drive letter on OS/2
- s = AddName(package().temp_dir(), buf->fileName());
+ 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