#include "frontends/alert.h"
+#include "support/ExceptionMessage.h"
#include "support/debug.h"
+#include "support/FileName.h"
+#include "support/FileNameList.h"
#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Package.h"
+#include "support/lassert.h"
#include <boost/bind.hpp>
#include <algorithm>
void BufferList::release(Buffer * buf)
{
- BOOST_ASSERT(buf);
+ LASSERT(buf, /**/);
BufferStorage::iterator const it =
find(bstore.begin(), bstore.end(), buf);
if (it != bstore.end()) {
Buffer * tmp = (*it);
- BOOST_ASSERT(tmp);
+ LASSERT(tmp, /**/);
bstore.erase(it);
delete tmp;
}
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());
bstore.push_back(tmpbuf.get());
}
-vector<string> const BufferList::getFileNames() const
+FileNameList const & BufferList::fileNames() const
{
- vector<string> nvec;
+ static FileNameList nvec;
+ nvec.clear();
transform(bstore.begin(), bstore.end(),
back_inserter(nvec),
- boost::bind(&Buffer::absFileName, _1));
+ boost::bind(&Buffer::fileName, _1));
return nvec;
}
Buffer * BufferList::next(Buffer const * buf) const
{
- BOOST_ASSERT(buf);
+ LASSERT(buf, /**/);
if (bstore.empty())
return 0;
BufferStorage::const_iterator it = find(bstore.begin(),
bstore.end(), buf);
- BOOST_ASSERT(it != bstore.end());
+ LASSERT(it != bstore.end(), /**/);
++it;
if (it == bstore.end())
return bstore.front();
Buffer * BufferList::previous(Buffer const * buf) const
{
- BOOST_ASSERT(buf);
+ LASSERT(buf, /**/);
if (bstore.empty())
return 0;
BufferStorage::const_iterator it = find(bstore.begin(),
bstore.end(), buf);
- BOOST_ASSERT(it != bstore.end());
+ LASSERT(it != bstore.end(), /**/);
if (it == bstore.begin())
return bstore.back();
else
}
-void BufferList::emergencyWrite(Buffer * buf)
+docstring BufferList::emergencyWrite(Buffer * buf)
{
// Use ::assert to avoid a loop, BOOST_ASSERT ends up calling ::assert
// compare with 0 to avoid pointer/interger comparison
// ::assert(buf != 0);
if (!buf)
- return;
+ return _("No file open!");
// No need to save if the buffer has not changed.
if (buf->isClean())
- return;
+ return docstring();
string const doc = buf->isUnnamed()
? onlyFilename(buf->absFileName()) : buf->absFileName();
- lyxerr << to_utf8(
- bformat(_("LyX: Attempting to save document %1$s"), from_utf8(doc)))
- << endl;
+ docstring user_message = bformat(
+ _("LyX: Attempting to save document %1$s\n"), from_utf8(doc));
// We try to save three places:
// 1) Same place as document. Unless it is an unnamed doc.
lyxerr << " " << s << endl;
if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
- return;
+ user_message += _(" Save seems successful. Phew.\n");
+ return user_message;
} else {
- lyxerr << to_utf8(_(" Save failed! Trying...")) << endl;
+ user_message += _(" Save failed! Trying...\n");
}
}
lyxerr << ' ' << s << endl;
if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
- return;
+ user_message += _(" Save seems successful. Phew.\n");
+ return user_message;
}
- lyxerr << to_utf8(_(" Save failed! Trying...")) << endl;
+ user_message += _(" Save failed! Trying...\n");
// 3) In "/tmp" directory.
// MakeAbsPath to prepend the current
lyxerr << ' ' << s << endl;
if (buf->writeFile(FileName(s))) {
buf->markClean();
- lyxerr << to_utf8(_(" Save seems successful. Phew.")) << endl;
- return;
+ user_message += _(" Save seems successful. Phew.\n");
+ return user_message;
}
- lyxerr << to_utf8(_(" Save failed! Bummer. Document is lost.")) << endl;
+
+ user_message += _(" Save failed! Bummer. Document is lost.");
+ return user_message;
}
-bool BufferList::exists(string const & s) const
+bool BufferList::exists(FileName const & fname) const
{
- return find_if(bstore.begin(), bstore.end(),
- bind(equal_to<string>(),
- bind(&Buffer::absFileName, _1),
- s))
- != bstore.end();
+ return getBuffer(fname) != 0;
}
bool BufferList::isLoaded(Buffer const * b) const
{
- BOOST_ASSERT(b);
+ LASSERT(b, /**/);
BufferStorage::const_iterator cit =
find(bstore.begin(), bstore.end(), b);
return cit != bstore.end();
}
-Buffer * BufferList::getBuffer(string const & s)
+Buffer * BufferList::getBuffer(support::FileName const & fname) const
{
- BufferStorage::iterator it =
- find_if(bstore.begin(), bstore.end(),
- bind(equal_to<string>(),
- bind(&Buffer::absFileName, _1),
- s));
-
+ BufferStorage::const_iterator it = find_if(bstore.begin(), bstore.end(),
+ bind(equal_to<FileName>(), bind(&Buffer::fileName, _1), fname));
return it != bstore.end() ? (*it) : 0;
}
}
-int BufferList::bufferNum(std::string const & name) const
+int BufferList::bufferNum(FileName const & fname) const
{
- vector<string> buffers = getFileNames();
- vector<string>::const_iterator cit =
- std::find(buffers.begin(), buffers.end(), name);
+ FileNameList const & buffers = fileNames();
+ FileNameList::const_iterator cit =
+ find(buffers.begin(), buffers.end(), fname);
if (cit == buffers.end())
return 0;
return int(cit - buffers.begin());
}
+bool BufferList::releaseChild(Buffer * parent, Buffer * child)
+{
+ LASSERT(parent, return false);
+ LASSERT(child, return false);
+ LASSERT(parent->isChild(child), return false);
+
+ // Child document has a different parent, don't close it.
+ if (child->parent() != parent)
+ return false;
+
+ BufferStorage::iterator it = bstore.begin();
+ BufferStorage::iterator end = bstore.end();
+ for (; it != end; ++it) {
+ Buffer * buf = *it;
+ if (buf != parent && buf->isChild(child)) {
+ child->setParent(0);
+ return false;
+ }
+ }
+ release(child);
+ return true;
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff