minimal effort implementation of:

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index d5a5e0252f6fd25c4c77fa4e144bb2cd630b2f09..861bb6fb43bab197ca981a2d719775cadd28f3f5 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -17,29 +17,30 @@
 #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 "support/filetools.h"
-#include "support/os.h"
+#include "support/package.h"
 
 #include <boost/bind.hpp>
 
 #include <algorithm>
 #include <functional>
 
-using lyx::support::AddName;
+using lyx::support::addName;
 using lyx::support::bformat;
-using lyx::support::MakeAbsPath;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
+using lyx::support::makeAbsPath;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
 using lyx::support::removeAutosaveFile;
+using lyx::support::package;
 using lyx::support::prefixIs;
 
 using boost::bind;
@@ -55,7 +56,6 @@ using std::vector;
 using std::back_inserter;
 using std::transform;
 
-namespace os = lyx::support::os;
 
 BufferList::BufferList()
 {}
@@ -73,9 +73,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
 
        string file;
        if (buf->isUnnamed())
-               file = OnlyFilename(buf->fileName());
+               file = onlyFilename(buf->fileName());
        else
-               file = MakeDisplayPath(buf->fileName(), 30);
+               file = makeDisplayPath(buf->fileName(), 30);
 
        string const text =
                bformat(_("The document %1$s has unsaved changes.\n\n"
@@ -90,9 +90,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 +122,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,17 +173,16 @@ 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;
        if (buf->isUnnamed())
-               fname = OnlyFilename(buf->fileName());
+               fname = onlyFilename(buf->fileName());
        else
-               fname = MakeDisplayPath(buf->fileName(), 30);
+               fname = makeDisplayPath(buf->fileName(), 30);
 
        string const text =
                bformat(_("The document %1$s has unsaved changes.\n\n"
@@ -184,16 +192,14 @@ bool BufferList::close(Buffer * buf, bool const ask)
 
        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,7 +305,7 @@ 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;
 
@@ -319,7 +325,7 @@ void BufferList::emergencyWrite(Buffer * buf)
        }
 
        // 2) In HOME directory.
-       string s = AddName(os::homepath(), buf->fileName());
+       string s = addName(package().home_dir(), buf->fileName());
        s += ".emergency";
        lyxerr << ' ' << s << endl;
        if (buf->writeFile(s)) {
@@ -333,7 +339,7 @@ void BufferList::emergencyWrite(Buffer * buf)
        // 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)) {