X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferlist.C;h=fe6516fa4be836f54552ca53e9110a4d4d340f9b;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=2ae3df66871419a7450d8f7a8e690c61e7c547fc;hpb=b5589bf6cf82439dc8dcc6c9465ce3b32dc0f389;p=lyx.git

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 2ae3df6687..fe6516fa4b 100644
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -17,12 +17,12 @@
 #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"
 
@@ -34,14 +34,17 @@
 #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::makeAbsPath;
+using support::makeDisplayPath;
+using support::onlyFilename;
+using support::removeAutosaveFile;
+using support::package;
+using support::prefixIs;
 
 using boost::bind;
 
@@ -56,6 +59,8 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
+namespace Alert = lyx::frontend::Alert;
+
 
 BufferList::BufferList()
 {}
@@ -71,15 +76,16 @@ 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"));
 
@@ -90,9 +96,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
 		bool succeeded;
 
 		if (buf->isUnnamed())
-			succeeded = WriteAs(buf);
+			succeeded = writeAs(buf);
 		else
-			succeeded = MenuWrite(buf);
+			succeeded = menuWrite(buf);
 
 		if (!succeeded)
 			return false;
@@ -122,6 +128,15 @@ bool BufferList::quitWriteAll()
 		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((*it)->fileName());
+	}
 
 	return true;
 }
@@ -164,36 +179,34 @@ bool BufferList::close(Buffer * buf, bool const ask)
 {
 	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());
@@ -299,9 +312,11 @@ void BufferList::emergencyWrite(Buffer * buf)
 		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.
@@ -311,37 +326,37 @@ void BufferList::emergencyWrite(Buffer * buf)
 		lyxerr << "  " << s << endl;
 		if (buf->writeFile(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)) {
 		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(MakeAbsPath("/tmp/"), buf->fileName());
+	s = addName(package().temp_dir(), buf->fileName());
 	s += ".emergency";
 	lyxerr << ' ' << s << endl;
 	if (buf->writeFile(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;
 }
 
 
@@ -395,3 +410,6 @@ void BufferList::setCurrentAuthor(string const & name, string const & email)
 		(*it)->params().authors().record(0, Author(name, email));
 	}
 }
+
+
+} // namespace lyx