]> git.lyx.org Git - lyx.git/blobdiff - src/bufferlist.C
to much stuff for my liking...
[lyx.git] / src / bufferlist.C
index 57f704e1cdc41c01323727a5dc0ae547dd09c9c6..060e6269fca6bfee6e6a6a887b6a2efc59bfc684 100644 (file)
  * ====================================================== 
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
-#include <assert.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 "vc-backend.h"
 #include "TextCache.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 <cassert>
+#include <algorithm>
+#include <functional>
+
+
 using std::vector;
 using std::find;
 using std::endl;
@@ -96,56 +101,63 @@ bool BufferList::empty() const
 }
 
 
+bool BufferList::qwriteOne(Buffer * buf, string const & fname,
+                          string & unsaved_list)
+{
+       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());
+                       }
+                       unsaved_list += MakeDisplayPath(fname, 50) + "\n";
+                       return true;
+               case 3: // Cancel
+                       return false;
+               }
+       }
+       return true;
+}
+
 bool BufferList::qwriteAll()
 {
-        bool askMoreConfirmation = false;
-        string unsaved;
-       for (BufferStorage::iterator it = bstore.begin();
-           it != bstore.end(); ++it) {
+       string unsaved;
+       BufferStorage::iterator it = bstore.begin();
+       BufferStorage::iterator end = bstore.end();
+       for (; it != 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 (!qwriteOne(*it, fname, unsaved)) // cancel the request!
+                               return false;
                }
        }
-        if (askMoreConfirmation &&
-            lyxrc.exit_confirmation &&
-            !AskQuestion(_("Some documents were not saved:"),
-                         unsaved, _("Exit anyway?"))) {
-                return false;
-        }
-
-        return true;
+       if (!unsaved.empty() && lyxrc.exit_confirmation) {
+               return Alert::askQuestion(_("Some documents were not saved:"),
+                                         unsaved, _("Exit anyway?"));
+       }
+
+       return true;
 }
 
 
@@ -171,7 +183,9 @@ bool BufferList::close(Buffer * buf)
        // 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->getUser())
+               buf->getUser()->insetUnlock();
+       
        if (buf->paragraph && !buf->isLyxClean() && !quitting) {
                if (buf->getUser())
                        buf->getUser()->owner()->prohibitInput();
@@ -182,9 +196,9 @@ bool BufferList::close(Buffer * buf)
                        fname = MakeDisplayPath(buf->fileName(), 50);
                bool reask = true;
                while (reask) {
-                       switch (AskConfirmation(_("Changes in document:"),
+                       switch (Alert::askConfirmation(_("Changes in document:"),
                                               fname,
-                                              _("Save document?"))){
+                                              _("Save document?"))) {
                        case 1: // Yes
                                if (buf->isUnnamed())
                                        reask = !WriteAs(current_view, buf);
@@ -245,9 +259,9 @@ int BufferList::unlockInset(UpdatableInset * inset)
 {
        lyx::Assert(inset);
        
-       //if (!inset) return 1;
-       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)->getUser()
                    && (*it)->getUser()->theLockingInset() == inset) {
                        (*it)->getUser()->insetUnlock();
@@ -260,8 +274,9 @@ int BufferList::unlockInset(UpdatableInset * inset)
 
 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 += '/';
@@ -289,7 +304,8 @@ void BufferList::emergencyWrite(Buffer * buf)
 
        
        // No need to save if the buffer has not changed.
-       if (buf->isLyxClean()) return;
+       if (buf->isLyxClean())
+               return;
        
        lyxerr << fmt(_("lyx: Attempting to save document %s as..."),
                      buf->isUnnamed() ? OnlyFilename(buf->fileName()).c_str()
@@ -341,14 +357,20 @@ 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()) {
+               Alert::alert(_("Error!"), _("Cannot open file"), 
+                       MakeDisplayPath(s));
+               return 0;
+       }
+       Buffer * b = bstore.newBuffer(s, ronly);
+
        // Check if emergency save file exists and is newer.
        e += OnlyFilename(s) + ".emergency";
        FileInfo fileInfoE(e);
@@ -358,7 +380,7 @@ 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!"),
+                       if (Alert::askQuestion(_("An emergency save of this document exists!"),
                                        MakeDisplayPath(s, 50),
                                        _("Try to load that instead?"))) {
                                ts = e;
@@ -382,7 +404,7 @@ Buffer * BufferList::readFile(string const & s, bool ronly)
                if (fileInfoA.exist() && fileInfo2.exist()) {
                        if (fileInfoA.getModificationTime()
                            > fileInfo2.getModificationTime()) {
-                               if (AskQuestion(_("Autosave file is newer."),
+                               if (Alert::askQuestion(_("Autosave file is newer."),
                                                MakeDisplayPath(s, 50),
                                                _("Load that one instead?"))) {
                                        ts = a;
@@ -448,13 +470,13 @@ Buffer * BufferList::newFile(string const & name, string tname, bool isNamed)
                bool templateok = false;
                LyXLex lex(0, 0);
                lex.setFile(tname);
-               if (lex.IsOK()) {
+               if (lex.isOK()) {
                        if (b->readFile(lex)) {
                                templateok = true;
                        }
                }
                if (!templateok) {
-                       WriteAlert(_("Error!"), _("Unable to open template"), 
+                       Alert::alert(_("Error!"), _("Unable to open template"), 
                                   MakeDisplayPath(tname));
                        // no template, start with empty buffer
                        b->paragraph = new Paragraph;
@@ -476,12 +498,16 @@ 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:"), 
+               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
@@ -512,7 +538,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                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 (Alert::askQuestion(_("Do you want to retrieve file under version control?"))) {
                                // 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.
@@ -520,7 +546,7 @@ Buffer * BufferList::loadLyXFile(string const & filename, bool tolastfiles)
                                return loadLyXFile(filename, tolastfiles);
                        }
                }
-               if (AskQuestion(_("Cannot open specified file:"), 
+               if (Alert::askQuestion(_("Cannot open specified file:"), 
                                MakeDisplayPath(s, 50),
                                _("Create new document with this name?")))
                        {