]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
Alfredo's second patch
[lyx.git] / src / bufferlist.C
index ecfcb4945aee23100197efc12214d222191c1b52..31f59ba57279c2346df8fb81c5afea631ba99f1b 100644 (file)
@@ -1,43 +1,45 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Word Processor
+/**
+ * \file bufferlist.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team. 
+ * \author Lars Gullik Bjønnes
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *
- * ====================================================== 
+ * Full author contact details are available in file CREDITS
  */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
-#include <algorithm>
-#include <functional>
-
 #include "bufferlist.h"
 #include "lyx_main.h"
-#include "support/FileInfo.h"
-#include "support/filetools.h"
-#include "support/lyxmanip.h"
-#include "support/lyxfunctional.h"
-#include "lyx_gui_misc.h"
 #include "lastfiles.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "lyx_cb.h"
 #include "bufferview_funcs.h"
+#include "BufferView.h"
 #include "gettext.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "vc-backend.h"
 #include "TextCache.h"
+#include "lyxlex.h"
+
+#include "frontends/Alert.h"
+
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/lyxmanip.h"
+#include "support/lyxfunctional.h"
+#include "support/LAssert.h"
+
+#include <boost/bind.hpp>
+#include "support/BoostFormat.h"
+
+#include <cassert>
+#include <algorithm>
+#include <functional>
+
 
 using std::vector;
 using std::find;
@@ -48,176 +50,163 @@ using std::mem_fun;
 
 extern BufferView * current_view;
 
-//
-// Class BufferStorage
-//
 
-void BufferStorage::release(Buffer * buf)
+BufferList::BufferList()
+{}
+
+
+bool BufferList::empty() const
+{
+       return bstore.empty();
+}
+
+
+bool BufferList::quitWriteBuffer(Buffer * buf)
+{
+       string file;
+       if (buf->isUnnamed())
+               file = OnlyFilename(buf->fileName());
+       else
+               file = MakeDisplayPath(buf->fileName(), 30);
+
+#if USE_BOOST_FORMAT
+       boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
+       fmt % file;
+       string text = fmt.str();
+#else
+       string text = _("The document ");
+       text += file + _(" has unsaved changes.\n\nWhat do you want to do with it?");
+#endif
+       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
+
+               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::quitWriteAll()
+{
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
+               if ((*it)->isClean())
+                       continue;
+
+               if (!quitWriteBuffer(*it))
+                       return false;
+       }
+
+       return true;
+}
+
+
+void BufferList::release(Buffer * buf)
 {
        lyx::Assert(buf);
-       Container::iterator it = find(container.begin(), container.end(), buf);
-       if (it != container.end()) {
+       BufferStorage::iterator it = find(bstore.begin(), bstore.end(), buf);
+       if (it != bstore.end()) {
                // Make sure that we don't store a LyXText in
                // the textcache that points to the buffer
                // we just deleted.
                Buffer * tmp = (*it);
-               container.erase(it);
+               bstore.erase(it);
                textcache.removeAllWithBuffer(tmp);
                delete tmp;
        }
 }
 
 
-Buffer * BufferStorage::newBuffer(string const & s, bool ronly)
+Buffer * BufferList::newBuffer(string const & s, bool ronly)
 {
        Buffer * tmpbuf = new Buffer(s, ronly);
        tmpbuf->params.useClassDefaults();
        lyxerr[Debug::INFO] << "Assigning to buffer "
-                           << container.size() << endl;
-       container.push_back(tmpbuf);
+                           << bstore.size() << endl;
+       bstore.push_back(tmpbuf);
        return tmpbuf;
 }
 
 
-//
-// Class BufferList
-//
-
-BufferList::BufferList()
-       : state_(BufferList::OK)
-{}
-
-
-bool BufferList::empty() const
-{
-       return bstore.empty();
-}
-
-
-bool BufferList::QwriteAll()
-{
-        bool askMoreConfirmation = false;
-        string unsaved;
-       for (BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
-               if (!(*it)->isLyxClean()) {
-                       string fname;
-                       if ((*it)->isUnnamed())
-                               fname = OnlyFilename((*it)->fileName());
-                       else
-                               fname = MakeDisplayPath((*it)->fileName(), 50);
-                       bool reask = true;
-                       while (reask) {
-                               switch (AskConfirmation(_("Changes in document:"),
-                                                      fname,
-                                                      _("Save document?"))) {
-                               case 1: // Yes
-                                       if ((*it)->isUnnamed())
-                                               reask = !WriteAs(current_view, (*it));
-                                       else {
-                                               reask = !MenuWrite(current_view, (*it));
-                                       }
-                                       break;
-                               case 2: // No
-                                       // if we crash after this we could
-                                       // have no autosave file but I guess
-                                       // this is really inprobable (Jug)
-                                       if ((*it)->isUnnamed()) {
-                                               removeAutosaveFile((*it)->fileName());
-                                       }
-                                       askMoreConfirmation = true;
-                                       unsaved += MakeDisplayPath(fname, 50);
-                                       unsaved += "\n";
-                                       reask = false;
-                                       break;
-                               case 3: // Cancel
-                                       return false;
-                               }
-                       }
-               }
-       }
-        if (askMoreConfirmation &&
-            lyxrc.exit_confirmation &&
-            !AskQuestion(_("Some documents were not saved:"),
-                         unsaved, _("Exit anyway?"))) {
-                return false;
-        }
-
-        return true;
-}
-
-
 void BufferList::closeAll()
 {
-       state_ = BufferList::CLOSING;
        // Since we are closing we can just as well delete all
        // in the textcache this will also speed the closing/quiting up a bit.
        textcache.clear();
-       
+
        while (!bstore.empty()) {
-               close(bstore.front());
+               close(bstore.front(), false);
        }
-       state_ = BufferList::OK;
 }
 
 
-void BufferList::resize()
+bool BufferList::close(Buffer * buf, bool ask)
 {
-       for_each(bstore.begin(), bstore.end(), mem_fun(&Buffer::resize));
-}
+       lyx::Assert(buf);
 
+       // FIXME: is the quitting check still necessary ?
+       if (!ask || buf->isClean() || quitting || buf->paragraphs.empty()) {
+               release(buf);
+               return true;
+       }
 
-bool BufferList::close(Buffer * buf)
-{
-       lyx::Assert(buf);
-       
-       // CHECK
-       // Trace back why we need to use buf->getUser here.
-       // Perhaps slight rewrite is in order? (Lgb)
-       
-        if (buf->getUser()) buf->getUser()->insetUnlock();
-       if (buf->paragraph && !buf->isLyxClean() && !quitting) {
-               if (buf->getUser())
-                       ProhibitInput(buf->getUser());
-               string fname;
-               if (buf->isUnnamed())
-                       fname = OnlyFilename(buf->fileName());
-               else
-                       fname = MakeDisplayPath(buf->fileName(), 50);
-               bool reask = true;
-               while (reask) {
-                       switch (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 {
-                                       if (buf->getUser())
-                                               AllowInput(buf->getUser());
-                                       return false;
-                               }
-                               break;
-                       case 2:
-                               if (buf->isUnnamed()) {
-                                       removeAutosaveFile(buf->fileName());
-                               }
-                               reask = false;
-                               break;
-                       case 3: // Cancel
-                               if (buf->getUser())
-                                       AllowInput(buf->getUser());
+       string fname;
+       if (buf->isUnnamed())
+               fname = OnlyFilename(buf->fileName());
+       else
+               fname = MakeDisplayPath(buf->fileName(), 30);
+#if USE_BOOST_FORMAT
+       boost::format fmt(_("The document %1$s has unsaved changes.\n\nDo you want to save the document?"));
+       fmt % fname;
+       string text = fmt.str();
+#else
+       string text = _("The document ");
+       text += fname + _(" has unsaved changes.\n\nWhat do you want to do with it?");
+#endif
+       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;
                }
-               if (buf->getUser())
-                       AllowInput(buf->getUser());
+       } else if (ret == 2) {
+               return false;
+       }
+
+       if (buf->isUnnamed()) {
+               removeAutosaveFile(buf->fileName());
        }
 
-       bstore.release(buf);
+       release(buf);
        return true;
 }
 
@@ -233,39 +222,25 @@ vector<string> const BufferList::getFileNames() const
 
 Buffer * BufferList::first()
 {
-       if (bstore.empty()) return 0;
+       if (bstore.empty())
+               return 0;
        return bstore.front();
 }
 
 
 Buffer * BufferList::getBuffer(unsigned int choice)
 {
-       if (choice >= bstore.size()) return 0;
+       if (choice >= bstore.size())
+               return 0;
        return bstore[choice];
 }
 
 
-int BufferList::unlockInset(UpdatableInset * inset)
-{
-       lyx::Assert(inset);
-       
-       //if (!inset) return 1;
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it) {
-               if ((*it)->getUser()
-                   && (*it)->getUser()->theLockingInset() == inset) {
-                       (*it)->getUser()->insetUnlock();
-                       return 0;
-               }
-       }
-       return 1;
-}
-
-
 void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 {
-       for (BufferStorage::iterator it = bstore.begin();
-            it != bstore.end(); ++it) {
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
                if (!(*it)->isDepClean(mastertmpdir)) {
                        string writefile = mastertmpdir;
                        writefile += '/';
@@ -281,24 +256,31 @@ void BufferList::updateIncludedTeXfiles(string const & mastertmpdir)
 void BufferList::emergencyWriteAll()
 {
        for_each(bstore.begin(), bstore.end(),
-                lyx::class_fun(*this, &BufferList::emergencyWrite));
+                boost::bind(&BufferList::emergencyWrite, this, _1));
 }
 
 
-void BufferList::emergencyWrite(Buffer * buf) 
+void BufferList::emergencyWrite(Buffer * buf)
 {
        // assert(buf) // this is not good since C assert takes an int
-                      // and a pointer is a long (JMarc)
+                      // and a pointer is a long (JMarc)
        assert(buf != 0); // use c assert to avoid a loop
 
-       
+
        // No need to save if the buffer has not changed.
-       if (buf->isLyxClean()) return;
-       
-       lyxerr << fmt(_("lyx: Attempting to save document %s as..."),
-                     buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str()
-                     : buf->fileName().c_str()) << endl;
-       
+       if (buf->isClean())
+               return;
+
+       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:
 
        // 1) Same place as document. Unless it is an unnamed doc.
@@ -306,35 +288,35 @@ void BufferList::emergencyWrite(Buffer * buf)
                string s = buf->fileName();
                s += ".emergency";
                lyxerr << "  " << s << endl;
-               if (buf->writeFile(s, true)) {
-                       buf->markLyxClean();
+               if (buf->writeFile(s)) {
+                       buf->markClean();
                        lyxerr << _("  Save seems successful. Phew.") << endl;
                        return;
                } else {
                        lyxerr << _("  Save failed! Trying...") << endl;
                }
        }
-       
+
        // 2) In HOME directory.
        string s = AddName(GetEnvPath("HOME"), buf->fileName());
        s += ".emergency";
-       lyxerr << " " << s << endl;
-       if (buf->writeFile(s, true)) {
-               buf->markLyxClean();
+       lyxerr << ' ' << s << endl;
+       if (buf->writeFile(s)) {
+               buf->markClean();
                lyxerr << _("  Save seems successful. Phew.") << endl;
                return;
        }
-       
+
        lyxerr << _("  Save failed! Trying...") << endl;
-       
+
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
        // drive letter on OS/2
        s = AddName(MakeAbsPath("/tmp/"), buf->fileName());
        s += ".emergency";
-       lyxerr << " " << s << endl;
-       if (buf->writeFile(s, true)) {
-               buf->markLyxClean();
+       lyxerr << ' ' << s << endl;
+       if (buf->writeFile(s)) {
+               buf->markClean();
                lyxerr << _("  Save seems successful. Phew.") << endl;
                return;
        }
@@ -345,14 +327,28 @@ void BufferList::emergencyWrite(Buffer * buf)
 
 Buffer * BufferList::readFile(string const & s, bool ronly)
 {
-       Buffer * b = bstore.newBuffer(s, ronly);
-
-       string ts = s;
+       string ts(s);
        string e = OnlyPath(s);
        string a = e;
        // File information about normal file
        FileInfo fileInfo2(s);
 
+       if (!fileInfo2.exist()) {
+               string const file = MakeDisplayPath(s, 50);
+#if USE_BOOST_FORMAT
+               boost::format fmt(_("The specified document\n%1$s\ncould not be read."));
+               fmt % file;
+               string text = fmt.str();
+#else
+               string text = _("The specified document\n");
+               text += file + _(" could not be read.");
+#endif
+               Alert::error(_("Could not read document"), text);
+               return 0;
+       }
+
+       Buffer * b = newBuffer(s, ronly);
+
        // Check if emergency save file exists and is newer.
        e += OnlyFilename(s) + ".emergency";
        FileInfo fileInfoE(e);
@@ -362,9 +358,19 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        if (fileInfoE.exist() && fileInfo2.exist()) {
                if (fileInfoE.getModificationTime()
                    > fileInfo2.getModificationTime()) {
-                       if (AskQuestion(_("An emergency save of this document exists!"),
-                                       MakeDisplayPath(s, 50),
-                                       _("Try to load that instead?"))) {
+                       string const file = MakeDisplayPath(s, 20);
+#if USE_BOOST_FORMAT
+                       boost::format fmt(_("An emergency save of the document %1$s exists.\n\nRecover emergency save?"));
+                       fmt % file;
+                       string text = fmt.str();
+#else
+                       string text = _("An emergency save of the document ");
+                       text += file + _(" exists.\n\nRecover emergency save?");
+#endif
+                       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.
@@ -386,9 +392,19 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
                if (fileInfoA.exist() && fileInfo2.exist()) {
                        if (fileInfoA.getModificationTime()
                            > fileInfo2.getModificationTime()) {
-                               if (AskQuestion(_("Autosave file is newer."),
-                                               MakeDisplayPath(s, 50),
-                                               _("Load that one instead?"))) {
+                               string const file = MakeDisplayPath(s, 20);
+#if USE_BOOST_FORMAT
+                               boost::format fmt(_("The backup of the document %1$s is newer.\n\nLoad the backup instead?"));
+                               fmt % file;
+                               string text = fmt.str();
+#else
+                               string text = _("The backup of the document ");
+                               text += file + _(" is newer.\n\nLoad the backup instead?");
+#endif
+                               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.
@@ -403,10 +419,10 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
        // not sure if this is the correct place to begin LyXLex
        LyXLex lex(0, 0);
        lex.setFile(ts);
-       if (b->readFile(lex))
+       if (b->readFile(lex, ts))
                return b;
        else {
-               bstore.release(b);
+               release(b);
                return 0;
        }
 }
@@ -423,7 +439,7 @@ bool BufferList::exists(string const & s) const
 bool BufferList::isLoaded(Buffer const * b) const
 {
        lyx::Assert(b);
-       
+
        BufferStorage::const_iterator cit =
                find(bstore.begin(), bstore.end(), b);
        return cit != bstore.end();
@@ -442,37 +458,48 @@ Buffer * BufferList::getBuffer(string const & s)
 Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
 {
        // get a free buffer
-       Buffer * b = bstore.newBuffer(name);
+       Buffer * b = newBuffer(name);
 
        // use defaults.lyx as a default template if it exists.
        if (tname.empty()) {
                tname = LibFileSearch("templates", "defaults.lyx");
        }
-       if (!tname.empty() && IsLyXFilename(tname)) {
+       if (!tname.empty()) {
                bool templateok = false;
                LyXLex lex(0, 0);
                lex.setFile(tname);
-               if (lex.IsOK()) {
-                       if (b->readFile(lex)) {
+               if (lex.isOK()) {
+                       if (b->readFile(lex, tname)) {
                                templateok = true;
                        }
                }
                if (!templateok) {
-                       WriteAlert(_("Error!"), _("Unable to open template"), 
-                                  MakeDisplayPath(tname));
+                       string const file = MakeDisplayPath(tname, 50);
+#if USE_BOOST_FORMAT
+                       boost::format fmt(_("The specified document template\n%1$s\ncould not be read."));
+                       fmt % file;
+                       string text = fmt.str();
+#else
+                       string text = _("The specified document template\n");
+                       text += file + _(" could not be read.");
+#endif
+                       Alert::error(_("Could not read template"), text);
                        // no template, start with empty buffer
-                       b->paragraph = new LyXParagraph;
+                       b->paragraphs.set(new Paragraph);
+                       b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
                }
        } else {  // start with empty buffer
-               b->paragraph = new LyXParagraph;
+               b->paragraphs.set(new Paragraph);
+               b->paragraphs.begin()->layout(b->params.getLyXTextClass().defaultLayout());
        }
 
-       if (!lyxrc.new_ask_filename && !isNamed) {
+       if (!isNamed) {
                b->setUnnamed();
                b->setFileName(name);
        }
 
        b->setReadonly(false);
+       b->updateDocLang(b->params.language);
        
        return b;
 }
@@ -480,25 +507,40 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
 
 Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
 {
-       // make sure our path is absolute
-       string const s = MakeAbsPath(filename);
+       // get absolute path of file and add ".lyx" to the filename if
+       // necessary
+       string s = FileSearch(string(), filename, "lyx");
+       if (s.empty()) {
+               s = filename;
+       }
 
        // file already open?
        if (exists(s)) {
-               if (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);
+#if USE_BOOST_FORMAT
+               boost::format fmt(_("The document %1$s is already loaded.\n\nDo you want to revert to the saved version?"));
+               fmt % file;
+               string text = fmt.str();
+#else
+               string text = _("The document ");
+               text += file + _(" is already loaded.\n\nDo you want to revert to the saved version?");
+#endif
+               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)
                } else {
-                       // Here, we pretend that we just loaded the 
+                       // Here, we pretend that we just loaded the
                        // open document
                        return getBuffer(s);
                }
        }
+
        Buffer * b = 0;
        bool ro = false;
        switch (IsFileWriteable(s)) {
@@ -511,27 +553,46 @@ 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 (AskQuestion(_("Do you want to retrieve file under version control?"))) {
+#if USE_BOOST_FORMAT
+                       boost::format fmt(_("Do you want to retrieve the document %1$s from version control?"));
+                       fmt % file;
+                       string text = fmt.str();
+#else
+                       string text = _("Do you want to retrieve the document ");
+                       text += file + _(" from version control?");
+#endif
+                       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.
-                               RCS::retrive(s);
+                               RCS::retrieve(s);
                                return loadLyXFile(filename, tolastfiles);
                        }
                }
-               if (AskQuestion(_("Cannot open specified file:"), 
-                               MakeDisplayPath(s, 50),
-                               _("Create new document with this name?")))
-                       {
-                               // Find a free buffer
-                               b = newFile(s, string(), true);
-                       }
+
+#if USE_BOOST_FORMAT
+               boost::format fmt(_("The document %1$s does not yet exist.\n\nDo you want to create a new document?"));
+               fmt % file;
+               string text = fmt.str();
+#else
+               string text = _("The document ");
+               text += file + _(" does not yet exist.\n\nDo you want to create a new document?");
+#endif
+               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)
@@ -539,3 +600,13 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
 
        return b;
 }
+
+
+void BufferList::setCurrentAuthor(string const & name, string const & email)
+{
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != end; ++it) {
+               (*it)->authors().record(0, Author(name, email));
+       }
+}