X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=51aefe560e5b29fed2536b11d236c0e24e783c6f;hb=0a7705a6736a85c3c751f7b4e9998833cdb71fc9;hp=a45bfc6998181f54e63ad4a8599f467dbb682f6c;hpb=404f1dc80a6afda7688ed480e86c443dd430dfe3;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index a45bfc6998..51aefe560e 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -23,6 +23,10 @@
 #include "support/docstream.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
+#include "frontends/alert.h"
 
 #include <fstream>
 #include <sstream>
@@ -205,7 +209,40 @@ void KeyMap::clear()
 }
 
 
-bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
+bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt)
+{
+	FileName bf = i18nLibFileSearch("bind", bind_file, "bind");
+	if (bf.empty()) {
+		if (rt == MissingOK)
+			return true;
+
+		lyxerr << "Could not find bind file: " << bind_file;
+		if (rt == Default) {
+			frontend::Alert::warning(_("Could not find bind file"),
+				bformat(_("Unable to find the bind file\n%1$s.\n"
+						"Please check your installation."), from_utf8(bind_file)));
+			return false;
+		}
+
+		static string const defaultBindfile = "cua";
+		if (bind_file == defaultBindfile) {
+			frontend::Alert::warning(_("Could not find `cua.bind' file"),
+				_("Unable to find the default bind file `cua.bind'.\n"
+				   "Please check your installation."));
+			return false;
+		}
+
+		// Try it with the default file.
+		frontend::Alert::warning(_("Could not find bind file"),
+			bformat(_("Unable to find the bind file\n%1$s.\n"
+			          "Falling back to default."), from_utf8(bind_file)));
+		return read(defaultBindfile, unbind_map);
+	}
+	return read(bf, unbind_map);
+}
+
+
+bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 {
 	enum {
 		BN_BIND,
@@ -223,14 +260,13 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 	if (lyxerr.debugging(Debug::PARSER))
 		lexrc.printTable(lyxerr);
 
-	FileName const tmp = i18nLibFileSearch("bind", bind_file, "bind");
-	lexrc.setFile(tmp);
+	lexrc.setFile(bind_file);
 	if (!lexrc.isOK()) {
-		LYXERR0("KeyMap::read: cannot open bind file:" << tmp);
+		LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFilename());
 		return false;
 	}
 
-	LYXERR(Debug::KBMAP, "Reading bind file:" << tmp);
+	LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFilename());
 
 	bool error = false;
 	while (lexrc.isOK()) {
@@ -313,7 +349,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map)
 	}
 
 	if (error)
-		LYXERR0("KeyMap::read: error while reading bind file:" << tmp);
+		LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFilename());
 	return !error;
 }