X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=587e1e7c71dda3fa0651f396da7712aa0ce1fa1d;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=c8b69d1ec50b1d49f39124bdc079a261acabfa6c;hpb=9b64d7bd24d606490c344a548fff4b93f837ccaf;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index c8b69d1ec5..587e1e7c71 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -18,6 +18,7 @@
 
 #include "LyXRC.h"
 
+#include "BufferList.h"
 #include "ColorSet.h"
 #include "Converter.h"
 #include "FontEnums.h"
@@ -58,7 +59,7 @@ namespace {
 
 // The format should also be updated in configure.py, and conversion code
 // should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 19; // rgh: remove print support
+static unsigned int const LYXRC_FILEFORMAT = 20; // tommaso: 'needauth' options
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -188,6 +189,8 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\thesaurusdir_path", LyXRC::RC_THESAURUSDIRPATH },
 	{ "\\ui_file", LyXRC::RC_UIFILE },
 	{ "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
+	{ "\\use_converter_needauth", LyXRC::RC_USE_CONVERTER_NEEDAUTH },
+	{ "\\use_converter_needauth_forbidden", LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN },
 	{ "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
 	{ "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE },
 	{ "\\use_qimage", LyXRC::RC_USE_QIMAGE },
@@ -315,6 +318,8 @@ void LyXRC::setDefaults()
 	preview_hashed_labels  = false;
 	preview_scale_factor = 1.0;
 	use_converter_cache = true;
+	use_converter_needauth_forbidden = true;
+	use_converter_needauth = true;
 	use_system_colors = false;
 	use_tooltip = true;
 	use_pixmap_cache = false;
@@ -987,11 +992,12 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		}
 		case RC_FILEFORMAT: {
 			bool ok = true;
-			string format, extensions, prettyname, shortcut;
+			string format, extensions, shortcut;
+			docstring prettyname;
 			if (!(lexrc >> format >> extensions))
 				ok = false;
 			if (ok && lexrc.next(true))
-				prettyname  = lexrc.getString();
+				prettyname = lexrc.getDocString();
 			else
 				ok = false;
 			if (ok)
@@ -1110,6 +1116,12 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 		case RC_USE_CONVERTER_CACHE:
 			lexrc >> use_converter_cache;
 			break;
+		case RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+			lexrc >> use_converter_needauth_forbidden;
+			break;
+		case RC_USE_CONVERTER_NEEDAUTH:
+			lexrc >> use_converter_needauth;
+			break;
 		case RC_CONVERTER_CACHE_MAXAGE:
 			lexrc >> converter_cache_maxage;
 			break;
@@ -1210,6 +1222,7 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 	/// Update converters data-structures
 	theConverters().update(formats);
 	theConverters().buildGraph();
+	theBufferList().invalidateConverterCache();
 
 	return ReadOK;
 }
@@ -1590,6 +1603,24 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 
+	case RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+		if (ignore_system_lyxrc ||
+		    use_converter_needauth_forbidden != system_lyxrc.use_converter_needauth_forbidden) {
+			os << "\\use_converter_needauth_forbidden "
+			   << convert<string>(use_converter_needauth_forbidden) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
+
+	case RC_USE_CONVERTER_NEEDAUTH:
+		if (ignore_system_lyxrc ||
+		    use_converter_needauth != system_lyxrc.use_converter_needauth) {
+			os << "\\use_converter_needauth "
+			   << convert<string>(use_converter_needauth) << '\n';
+		}
+		if (tag != RC_LAST)
+			break;
+
 	case RC_CONVERTER_CACHE_MAXAGE:
 		if (ignore_system_lyxrc ||
 		    converter_cache_maxage != system_lyxrc.converter_cache_maxage) {
@@ -2524,7 +2555,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 			    format->mime() != cit->mime()) {
 				os << "\\format \"" << cit->name() << "\" \""
 				   << cit->extensions() << "\" \""
-				   << cit->prettyname() << "\" \""
+				   << to_utf8(cit->prettyname()) << "\" \""
 				   << cit->shortcut() << "\" \""
 				   << escapeCommand(cit->viewer()) << "\" \""
 				   << escapeCommand(cit->editor()) << "\" \"";
@@ -2830,6 +2861,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_USER_EMAIL:
 	case LyXRC::RC_USER_NAME:
 	case LyXRC::RC_USE_CONVERTER_CACHE:
+	case LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN:
+	case LyXRC::RC_USE_CONVERTER_NEEDAUTH:
 	case LyXRC::RC_USE_SYSTEM_COLORS:
 	case LyXRC::RC_USE_TOOLTIP:
 	case LyXRC::RC_USE_PIXMAP_CACHE:
@@ -2922,6 +2955,14 @@ string const LyXRC::getDescription(LyXRCTags tag)
 	case RC_CONVERTER:
 		break;
 
+	case RC_CONVERTER_NEEDAUTH_FORBIDDEN:
+		str = _("Forbid use of external converters with 'needauth' option to prevent undesired effects.");
+		break;
+
+	case RC_CONVERTER_NEEDAUTH:
+		str = _("Ask user before calling external converters with 'needauth' option to prevent undesired effects.");
+		break;
+
 	case RC_COPIER:
 		break;