X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=58aa12d99aa6b15e4351b9386339238f15acb2ce;hb=3c488c22e1d86da021750e04b0c8e85a8d8630ab;hp=073ddcb6f46f33c14d376a21cfc99eccba9be8a1;hpb=42dfd711977353e892aadbea6f531e59b0d92179;p=features.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 073ddcb6f4..58aa12d99a 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -15,38 +15,18 @@
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferList.h"
-#include "BufferParams.h"
-#include "DocIterator.h"
-#include "Counters.h"
-#include "ErrorList.h"
-#include "Floating.h"
-#include "FloatList.h"
-#include "InsetList.h"
-#include "Language.h"
-#include "LaTeX.h"
-#include "Layout.h"
-#include "LyX.h"
-#include "TextClass.h"
-#include "Paragraph.h"
-#include "ParagraphList.h"
-#include "ParagraphParameters.h"
-#include "ParIterator.h"
-#include "TexRow.h"
-#include "Text.h"
-#include "TocBackend.h"
+#include "LyXVC.h"
 
 #include "frontends/alert.h"
 
-#include "insets/InsetBibitem.h"
-#include "insets/InsetInclude.h"
-
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/textutils.h"
+#include "support/mutex.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -72,33 +52,50 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		docstring const text = bformat(_(
 				"The document %1$s is already loaded and has unsaved changes.\n"
 				"Do you want to abandon your changes and reload the version on disk?"), file);
-		if (!Alert::prompt(_("Reload saved document?"),
-			  text, 0, 1,  _("&Reload"), _("&Keep Changes"))) {
-			// reload the document
-			if (checkBuffer->reload() != Buffer::ReadSuccess)
-				return 0;
+		int res = Alert::prompt(_("Reload saved document?"),
+					text, 2, 2,  _("Yes, &Reload"), _("No, &Keep Changes"), _("&Cancel"));
+		switch (res) {
+			case 0: {
+				// reload the document
+				if (checkBuffer->reload() != Buffer::ReadSuccess)
+					return nullptr;
+				return checkBuffer;
+			}
+			case 1:
+				// keep changes
+				return checkBuffer;
+			case 2:
+				// cancel
+				return nullptr;
 		}
-		return checkBuffer;
 	}
 
-	if (filename.exists()) {
-		if (!filename.isReadableFile()) {
-			docstring text = bformat(_("The file %1$s exists but is not "
-				"readable by the current user."),
-				from_utf8(filename.absFileName()));
-			Alert::error(_("File not readable!"), text);
-			return 0;
+	bool const exists = filename.exists();
+	bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
+	if (exists || tryVC) {
+		if (exists) {
+			if (!filename.isReadableFile()) {
+				docstring text = bformat(_("The file %1$s exists but is not "
+					"readable by the current user."),
+					from_utf8(filename.absFileName()));
+				Alert::error(_("File not readable!"), text);
+				return nullptr;
+			}
+			if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+				// Makes it possible to open an empty (0 bytes) .lyx file
+				return newFile(filename.absFileName(), "", true);
+			}
 		}
 		Buffer * b = theBufferList().newBuffer(filename.absFileName());
 		if (!b) {
 			// Buffer creation is not possible.
-			return 0;
+			return nullptr;
 		}
 		if (b->loadLyXFile() != Buffer::ReadSuccess) {
 			// do not save an emergency file when releasing the buffer
 			b->markClean();
 			theBufferList().release(b);
-			return 0;
+			return nullptr;
 		}
 		return b;
 	}
@@ -107,10 +104,10 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
 		"exist.\n\nDo you want to create a new document?"),
 		from_utf8(filename.absFileName()));
 	if (!Alert::prompt(_("Create new document?"),
-			text, 0, 1, _("&Create"), _("Cancel")))
+			text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
 		return newFile(filename.absFileName(), string(), true);
 
-	return 0;
+	return nullptr;
 }
 
 
@@ -122,7 +119,7 @@ Buffer * newFile(string const & filename, string const & templatename,
 	Buffer * b = theBufferList().newBuffer(filename);
 	if (!b)
 		// Buffer creation is not possible.
-		return 0;
+		return nullptr;
 
 	FileName tname;
 	// use defaults.lyx as a default template if it exists.
@@ -139,7 +136,7 @@ Buffer * newFile(string const & filename, string const & templatename,
 				file);
 			Alert::error(_("Could not read template"), text);
 			theBufferList().release(b);
-			return 0;
+			return nullptr;
 		}
 	}
 
@@ -161,15 +158,17 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
 						string const & templatename)
 {
 	static map<string, int> file_number;
+	static Mutex mutex;
 
+	Mutex::Locker locker(&mutex);
 	FileName filename;
 
 	do {
-		filename.set(path, 
+		filename.set(path,
 			prefix + convert<string>(++file_number[prefix]) + ".lyx");
 	}
 	while (theBufferList().exists(filename) || filename.isReadableFile());
-		
+
 	return newFile(filename.absFileName(), templatename, false);
 }
 
@@ -178,18 +177,18 @@ Buffer * loadIfNeeded(FileName const & fname)
 {
 	Buffer * buffer = theBufferList().getBuffer(fname);
 	if (!buffer) {
-		if (!fname.exists())
-			return 0;
+		if (!fname.exists() && !LyXVC::fileInVC(fname))
+			return nullptr;
 
 		buffer = theBufferList().newBuffer(fname.absFileName());
 		if (!buffer)
 			// Buffer creation is not possible.
-			return 0;
+			return nullptr;
 
 		if (buffer->loadLyXFile() != Buffer::ReadSuccess) {
 			//close the buffer we just opened
 			theBufferList().release(buffer);
-			return 0;
+			return nullptr;
 		}
 	}
 	return buffer;