X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferList.cpp;h=1bee03276b0cbdcc92230e6eb622e8a2825fff28;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=24bb2424f094c92ae52e05999c021c92448c61c7;hpb=09b7e6e60aea3644c568212b7dd1f90c85020d2e;p=lyx.git

diff --git a/src/BufferList.cpp b/src/BufferList.cpp
index 24bb2424f0..1bee03276b 100644
--- a/src/BufferList.cpp
+++ b/src/BufferList.cpp
@@ -15,8 +15,6 @@
 #include "Author.h"
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
-#include "gettext.h"
 #include "Session.h"
 #include "LyX.h"
 #include "output_latex.h"
@@ -24,7 +22,11 @@
 
 #include "frontends/alert.h"
 
+#include "support/ExceptionMessage.h"
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Package.h"
 
 #include <boost/bind.hpp>
@@ -34,29 +36,11 @@
 
 using boost::bind;
 
-using std::auto_ptr;
-using std::endl;
-using std::equal_to;
-using std::find;
-using std::find_if;
-using std::for_each;
-using std::string;
-using std::vector;
-using std::back_inserter;
-using std::transform;
-
+using namespace std;
+using namespace lyx::support;
 
 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;
-
 namespace Alert = lyx::frontend::Alert;
 
 
@@ -94,78 +78,6 @@ BufferList::const_iterator BufferList::end() const
 }
 
 
-bool BufferList::quitWriteBuffer(Buffer * buf)
-{
-	BOOST_ASSERT(buf);
-
-	docstring file;
-
-	// FIXME: Unicode?
-	if (buf->isUnnamed())
-		file = from_utf8(buf->fileName().onlyFileName());
-	else
-		file = buf->fileName().displayName(30);
-
-	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);
-	int const ret = Alert::prompt(_("Save changed document?"),
-		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
-
-	if (ret == 0) {
-		// FIXME: WriteAs can be asynch !
-		// but not right now...maybe we should remove that
-
-		bool succeeded;
-
-		if (buf->isUnnamed())
-			succeeded = buf->writeAs();
-		else
-			succeeded = buf->menuWrite();
-
-		if (!succeeded)
-			return false;
-	} else if (ret == 1) {
-		// if we crash after this we could
-		// have no autosave file but I guess
-		// this is really inprobable (Jug)
-		if (buf->isUnnamed())
-			removeAutosaveFile(buf->absFileName());
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-
-bool BufferList::quitWriteAll()
-{
-	BufferStorage::iterator it = bstore.begin();
-	BufferStorage::iterator end = bstore.end();
-	for (; it != end; ++it) {
-		if ((*it)->isClean())
-			continue;
-
-		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)->masterBuffer() == (*it))
-			LyX::ref().session().lastOpened().add(FileName((*it)->absFileName()));
-	}
-
-	return true;
-}
-
-
 void BufferList::release(Buffer * buf)
 {
 	BOOST_ASSERT(buf);
@@ -182,10 +94,19 @@ void BufferList::release(Buffer * buf)
 
 Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 {
-	auto_ptr<Buffer> tmpbuf(new Buffer(s, ronly));
+	auto_ptr<Buffer> tmpbuf;
+	try { tmpbuf.reset(new Buffer(s, ronly));
+	} catch (ExceptionMessage const & message) {
+		if (message.type_ == ErrorException) {
+			Alert::error(message.title_, message.details_);
+			exit(1);
+		} else if (message.type_ == WarningException) {
+			Alert::warning(message.title_, message.details_);
+			return 0;
+		}
+	}
 	tmpbuf->params().useClassDefaults();
-	LYXERR(Debug::INFO) << "Assigning to buffer "
-			    << bstore.size() << endl;
+	LYXERR(Debug::INFO, "Assigning to buffer " << bstore.size());
 	bstore.push_back(tmpbuf.get());
 	return tmpbuf.release();
 }
@@ -193,47 +114,8 @@ Buffer * BufferList::newBuffer(string const & s, bool const ronly)
 
 void BufferList::closeAll()
 {
-	while (!bstore.empty()) {
-		close(bstore.front(), false);
-	}
-}
-
-
-bool BufferList::close(Buffer * buf, bool const ask)
-{
-	BOOST_ASSERT(buf);
-
-	if (!ask || buf->isClean() || buf->paragraphs().empty()) {
-		release(buf);
-		return true;
-	}
-
-	docstring fname;
-	if (buf->isUnnamed())
-		fname = from_utf8(onlyFilename(buf->absFileName()));
-	else
-		fname = makeDisplayPath(buf->absFileName(), 30);
-
-	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);
-	int const ret = Alert::prompt(_("Save changed document?"),
-		text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
-
-	if (ret == 0) {
-		if (buf->isUnnamed()) {
-			if (!buf->writeAs())
-				return false;
-		} else if (!buf->menuWrite())
-			return false;
-	} else if (ret == 2)
-		return false;
-		
-	removeAutosaveFile(buf->absFileName());
-
-	release(buf);
-	return true;
+	while (!bstore.empty())
+		release(bstore.front());
 }
 
 
@@ -439,11 +321,11 @@ void BufferList::setCurrentAuthor(docstring const & name, docstring const & emai
 }
 
 
-int BufferList::bufferNum(std::string const & name) const
+int BufferList::bufferNum(string const & name) const
 {
 	vector<string> buffers = getFileNames();
 	vector<string>::const_iterator cit =
-		std::find(buffers.begin(), buffers.end(), name);
+		find(buffers.begin(), buffers.end(), name);
 	if (cit == buffers.end())
 		return 0;
 	return int(cit - buffers.begin());