]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
The "I want this in now" patch.
[lyx.git] / src / bufferlist.C
index a68a8a9adf09c7fa01441aa520b553549a0b4b53..cc2dcdcb0468647f3138613daa1cc4edffd391e5 100644 (file)
@@ -1,15 +1,11 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file bufferlist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Word Processor
+ * \author Lars Gullik Bjønnes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -38,7 +34,6 @@
 #include "support/LAssert.h"
 
 #include <boost/bind.hpp>
-#include "BoostFormat.h"
 
 #include <cassert>
 #include <algorithm>
@@ -65,55 +60,57 @@ bool BufferList::empty() const
 }
 
 
-bool BufferList::qwriteOne(Buffer * buf, string const & fname,
-                          string & unsaved_list)
+bool BufferList::quitWriteBuffer(Buffer * buf)
 {
-       bool reask = true;
-       while (reask) {
-               switch (Alert::askConfirmation(_("Changes in document:"),
-                                      fname,
-                                      _("Save document?"))) {
-               case 1: // Yes
-                       // FIXME: WriteAs can be asynch !
-                       if (buf->isUnnamed())
-                               reask = !WriteAs(current_view, buf);
-                       else {
-                               reask = !MenuWrite(current_view, buf);
-                       }
-                       break;
-               case 2: // No
-                       // if we crash after this we could
-                       // have no autosave file but I guess
-                       // this is really inprobable (Jug)
-                       if (buf->isUnnamed()) {
-                               removeAutosaveFile(buf->fileName());
-                       }
+       string file;
+       if (buf->isUnnamed())
+               file = OnlyFilename(buf->fileName());
+       else
+               file = MakeDisplayPath(buf->fileName(), 30);
+
+       string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+               "Do you want to save the document?"), file);
+       int const ret = Alert::prompt(_("Save changed document?"),
+               text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
+
+       if (ret == 0) {
+               // FIXME: WriteAs can be asynch !
+               // but not right now...maybe we should remove that
 
-                       unsaved_list += MakeDisplayPath(fname, 50) + "\n";
-                       return true;
-               case 3: // Cancel
+               bool succeeded;
+
+               if (buf->isUnnamed())
+                       succeeded = WriteAs(current_view, buf);
+               else
+                       succeeded = MenuWrite(current_view, buf);
+
+               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->fileName());
+
+       } else {
+               return false;
        }
+
        return true;
 }
 
 
-bool BufferList::qwriteAll()
+bool BufferList::quitWriteAll()
 {
-       string unsaved;
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
        for (; it != end; ++it) {
-               if (!(*it)->isClean()) {
-                       string fname;
-                       if ((*it)->isUnnamed())
-                               fname = OnlyFilename((*it)->fileName());
-                       else
-                               fname = MakeDisplayPath((*it)->fileName(), 50);
-                       if (!qwriteOne(*it, fname, unsaved)) // cancel the request!
-                               return false;
-               }
+               if ((*it)->isClean())
+                       continue;
+
+               if (!quitWriteBuffer(*it))
+                       return false;
        }
 
        return true;
@@ -145,7 +142,7 @@ Buffer * BufferList::newBuffer(string const & s, bool ronly)
        bstore.push_back(tmpbuf);
        return tmpbuf;
 }
+
 
 void BufferList::closeAll()
 {
@@ -154,46 +151,47 @@ void BufferList::closeAll()
        textcache.clear();
 
        while (!bstore.empty()) {
-               close(bstore.front());
+               close(bstore.front(), false);
        }
 }
 
 
-bool BufferList::close(Buffer * buf)
+bool BufferList::close(Buffer * buf, bool ask)
 {
        lyx::Assert(buf);
 
-       if (!buf->paragraphs.empty() && !buf->isClean() && !quitting) {
-               string fname;
-               if (buf->isUnnamed())
-                       fname = OnlyFilename(buf->fileName());
-               else
-                       fname = MakeDisplayPath(buf->fileName(), 50);
-               bool reask = true;
-               while (reask) {
-                       switch (Alert::askConfirmation(_("Changes in document:"),
-                                              fname,
-                                              _("Save document?"))) {
-                       case 1: // Yes
-                               if (buf->isUnnamed())
-                                       reask = !WriteAs(current_view, buf);
-                               else if (buf->save()) {
-                                       lastfiles->newFile(buf->fileName());
-                                       reask = false;
-                               } else {
-                                       return false;
-                               }
-                               break;
-                       case 2:
-                               if (buf->isUnnamed()) {
-                                       removeAutosaveFile(buf->fileName());
-                               }
-                               reask = false;
-                               break;
-                       case 3: // Cancel
+       // FIXME: is the quitting check still necessary ?
+       if (!ask || buf->isClean() || quitting || buf->paragraphs.empty()) {
+               release(buf);
+               return true;
+       }
+
+       string fname;
+       if (buf->isUnnamed())
+               fname = OnlyFilename(buf->fileName());
+       else
+               fname = MakeDisplayPath(buf->fileName(), 30);
+
+       string text = bformat(_("The document %1$s has unsaved changes.\n\n"
+               "Do you want to save the document?"), fname);
+       int const ret = Alert::prompt(_("Save changed document?"),
+               text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
+
+       if (ret == 0) {
+               if (buf->isUnnamed()) {
+                       if (!WriteAs(current_view, buf))
                                return false;
-                       }
+               } else if (buf->save()) {
+                       lastfiles->newFile(buf->fileName());
+               } else {
+                       return false;
                }
+       } else if (ret == 2) {
+               return false;
+       }
+
+       if (buf->isUnnamed()) {
+               removeAutosaveFile(buf->fileName());
        }
 
        release(buf);
@@ -226,7 +224,8 @@ Buffer * BufferList::getBuffer(unsigned int choice)
 }
 
 
-void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
+void BufferList::updateIncludedTeXfiles(string const & mastertmpdir,
+                                       LatexRunParams const & runparams)
 {
        BufferStorage::iterator it = bstore.begin();
        BufferStorage::iterator end = bstore.end();
@@ -236,7 +235,7 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
                        writefile += '/';
                        writefile += (*it)->getLatexName();
                        (*it)->makeLaTeXFile(writefile, mastertmpdir,
-                                            false, true);
+                                            runparams, true);
                        (*it)->markDepClean(mastertmpdir);
                }
        }
@@ -264,15 +263,9 @@ void BufferList::emergencyWrite(Buffer * buf)
        string const doc = buf->isUnnamed()
                ? OnlyFilename(buf->fileName()) : buf->fileName();
 
-#if USE_BOOST_FORMAT
-       lyxerr << boost::format(_("LyX: Attempting to save document %1$s"))
-               % doc
-              << endl;
-#else
-       lyxerr << _("LyX: Attempting to save document ") << doc << endl;
-#endif
-       // We try to save three places:
+       lyxerr << bformat(_("LyX: Attempting to save document %1$s"), doc) << endl;
 
+       // We try to save three places:
        // 1) Same place as document. Unless it is an unnamed doc.
        if (!buf->isUnnamed()) {
                string s = buf->fileName();
@@ -324,8 +317,10 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        FileInfo fileInfo2(s);
 
        if (!fileInfo2.exist()) {
-               Alert::alert(_("Error!"), _("Cannot open file"),
-                       MakeDisplayPath(s));
+               string const file = MakeDisplayPath(s, 50);
+               string text = bformat(_("The specified document\n%1$s"
+                       "\ncould not be read."),        file);
+               Alert::error(_("Could not read document"), text);
                return 0;
        }
 
@@ -340,17 +335,18 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        if (fileInfoE.exist() && fileInfo2.exist()) {
                if (fileInfoE.getModificationTime()
                    > fileInfo2.getModificationTime()) {
-                       if (Alert::askQuestion(_("An emergency save of this document exists!"),
-                                       MakeDisplayPath(s, 50),
-                                       _("Try to load that instead?"))) {
+                       string const file = MakeDisplayPath(s, 20);
+                       string text = bformat(_("An emergency save of the document %1$s exists.\n"
+                               "\nRecover emergency save?"), file);
+                       int const ret = Alert::prompt(_("Load emergency save?"),
+                               text, 0, 1, _("&Recover"), _("&Load Original"));
+
+                       if (ret == 0) {
                                ts = e;
                                // the file is not saved if we load the
                                // emergency file.
                                b->markDirty();
                                use_emergency = true;
-                       } else {
-                               // Here, we should delete the emergency save
-                               lyx::unlink(e);
                        }
                }
        }
@@ -364,9 +360,13 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
                if (fileInfoA.exist() && fileInfo2.exist()) {
                        if (fileInfoA.getModificationTime()
                            > fileInfo2.getModificationTime()) {
-                               if (Alert::askQuestion(_("Autosave file is newer."),
-                                               MakeDisplayPath(s, 50),
-                                               _("Load that one instead?"))) {
+                               string const file = MakeDisplayPath(s, 20);
+                               string text = bformat(_("The backup of the document %1$s is newer.\n\n" 
+                                       "Load the backup instead?"), file);
+                               int const ret = Alert::prompt(_("Load backup?"),
+                                       text, 0, 1, _("&Load backup"), _("Load &original"));
+
+                               if (ret == 0) {
                                        ts = a;
                                        // the file is not saved if we load the
                                        // autosave file.
@@ -436,14 +436,16 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
                        }
                }
                if (!templateok) {
-                       Alert::alert(_("Error!"), _("Unable to open template"),
-                                  MakeDisplayPath(tname));
+                       string const file = MakeDisplayPath(tname, 50);
+                       string text  = bformat(_("The specified document template\n%1$s\n"
+                               "could not be read."), file);
+                       Alert::error(_("Could not read template"), text);
                        // no template, start with empty buffer
-                       b->paragraphs.set(new Paragraph);
+                       b->paragraphs.push_back(new Paragraph);
                        b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
                }
        } else {  // start with empty buffer
-               b->paragraphs.set(new Paragraph);
+               b->paragraphs.push_back(new Paragraph);
                b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
        }
 
@@ -453,6 +455,7 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
        }
 
        b->setReadonly(false);
+       b->updateDocLang(b->params.language);
 
        return b;
 }
@@ -469,11 +472,15 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
 
        // file already open?
        if (exists(s)) {
-               if (Alert::askQuestion(_("Document is already open:"),
-                               MakeDisplayPath(s, 50),
-                               _("Do you want to reload that document?"))) {
-                       // Reload is accomplished by closing and then loading
-                       if (!close(getBuffer(s))) {
+               string const file = MakeDisplayPath(s, 20);
+               string text = bformat(_("The document %1$s is already loaded.\n\n"
+                       "Do you want to revert to the saved version?"), file);
+               int const ret = Alert::prompt(_("Revert to saved document?"),
+                       text, 0, 1,  _("&Revert"), _("&Switch to document"));
+
+               if (ret == 0) {
+                       // FIXME: should be LFUN_REVERT
+                       if (!close(getBuffer(s), false)) {
                                return 0;
                        }
                        // Fall through to new load. (Asger)
@@ -483,6 +490,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                        return getBuffer(s);
                }
        }
+
        Buffer * b = 0;
        bool ro = false;
        switch (IsFileWriteable(s)) {
@@ -495,12 +503,16 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                        b->lyxvc.file_found_hook(s);
                }
                break; //fine- it's r/w
-       case -1:
+       case -1: {
+               string const file = MakeDisplayPath(s, 20);
                // Here we probably should run
                if (LyXVC::file_not_found_hook(s)) {
-                       // Ask if the file should be checked out for
-                       // viewing/editing, if so: load it.
-                       if (Alert::askQuestion(_("Do you want to retrieve file under version control?"))) {
+                       string text = bformat(_("Do you want to retrieve the document"
+                               " %1$s from version control?"), file);
+                       int const ret = Alert::prompt(_("Retrieve from version control?"),
+                               text, 0, 1, _("&Retrieve"), _("&Cancel"));
+
+                       if (ret == 0) {
                                // How can we know _how_ to do the checkout?
                                // With the current VC support it has to be,
                                // a RCS file since CVS do not have special ,v files.
@@ -508,14 +520,17 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                                return loadLyXFile(filename, tolastfiles);
                        }
                }
-               if (Alert::askQuestion(_("Cannot open specified file:"),
-                               MakeDisplayPath(s, 50),
-                               _("Create new document with this name?")))
-                       {
-                               // Find a free buffer
-                               b = newFile(s, string(), true);
-                       }
+
+               string text = bformat(_("The document %1$s does not yet exist.\n\n"
+                       "Do you want to create a new document?"), file);
+               int const ret = Alert::prompt(_("Create new document?"),
+                       text, 0, 1, _("&Create"), _("Cancel"));
+
+               if (ret == 0)
+                       b = newFile(s, string(), true);
+
                break;
+               }
        }
 
        if (b && tolastfiles)