cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 5b9826471b992ec587f255cac4599cf8c7f91795..ed749a031284e62eb2d6d8e9d5427ab4c3ed870e 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -34,6 +34,7 @@
 #include <algorithm>
 #include <functional>
 
+using lyx::docstring;
 using lyx::support::addName;
 using lyx::support::bformat;
 using lyx::support::makeAbsPath;
@@ -71,15 +72,16 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
 {
        BOOST_ASSERT(buf);
 
-       string file;
+       docstring file;
        if (buf->isUnnamed())
-               file = onlyFilename(buf->fileName());
+               file = lyx::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"));
 
@@ -90,9 +92,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 +124,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().addLastOpenedFile((*it)->fileName());
+       }
 
        return true;
 }
@@ -164,36 +175,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 = lyx::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 (ret == 0) {
                if (buf->isUnnamed()) {
-                       if (!WriteAs(buf))
+                       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());
@@ -301,7 +310,9 @@ void BufferList::emergencyWrite(Buffer * buf)
        string const doc = buf->isUnnamed()
                ? onlyFilename(buf->fileName()) : buf->fileName();
 
-       lyxerr << bformat(_("LyX: Attempting to save document %1$s"), doc) << endl;
+       lyxerr << lyx::to_utf8(
+               bformat(_("LyX: Attempting to save document %1$s"), lyx::from_utf8(doc)))
+               << endl;
 
        // We try to save three places:
        // 1) Same place as document. Unless it is an unnamed doc.
@@ -311,10 +322,10 @@ void BufferList::emergencyWrite(Buffer * buf)
                lyxerr << "  " << s << endl;
                if (buf->writeFile(s)) {
                        buf->markClean();
-                       lyxerr << _("  Save seems successful. Phew.") << endl;
+                       lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
                        return;
                } else {
-                       lyxerr << _("  Save failed! Trying...") << endl;
+                       lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
                }
        }
 
@@ -324,11 +335,11 @@ void BufferList::emergencyWrite(Buffer * buf)
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(s)) {
                buf->markClean();
-               lyxerr << _("  Save seems successful. Phew.") << endl;
+               lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
        }
 
-       lyxerr << _("  Save failed! Trying...") << endl;
+       lyxerr << lyx::to_utf8(_("  Save failed! Trying...")) << endl;
 
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
@@ -338,10 +349,10 @@ void BufferList::emergencyWrite(Buffer * buf)
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(s)) {
                buf->markClean();
-               lyxerr << _("  Save seems successful. Phew.") << endl;
+               lyxerr << lyx::to_utf8(_("  Save seems successful. Phew.")) << endl;
                return;
        }
-       lyxerr << _("  Save failed! Bummer. Document is lost.") << endl;
+       lyxerr << lyx::to_utf8(_("  Save failed! Bummer. Document is lost.")) << endl;
 }