X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=a4520de545474812293b38f58edfb0fc3b621b73;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=d7b6f09b4561fcc4c4b5285d7573064c7b382e50;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d7b6f09b45..a4520de545 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -41,19 +41,12 @@
 #include "support/userinfo.h"
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
 namespace os = support::os;
 
-using support::ascii_lowercase;
-using support::bformat;
-using support::expandPath;
-using support::FileName;
-using support::getEnv;
-using support::libFileSearch;
-using support::token;
-
 namespace {
 
 // when adding something to this array keep it sorted!
@@ -163,6 +156,7 @@ keyword_item lyxrcTags[] = {
 	{ "\\use_spell_lib", LyXRC::RC_USE_SPELL_LIB },
 	// compatibility with versions older than 1.4.0 only
 	{ "\\use_tempdir", LyXRC::RC_USETEMPDIR },
+	{ "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
 	{ "\\user_email", LyXRC::RC_USER_EMAIL },
 	{ "\\user_name", LyXRC::RC_USER_NAME },
 	{ "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
@@ -272,6 +266,7 @@ void LyXRC::setDefaults() {
 	preview_hashed_labels  = false;
 	preview_scale_factor = "0.9";
 	use_converter_cache = true;
+	use_tooltip = true;
 	use_pixmap_cache = false;
 	converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
 
@@ -311,7 +306,7 @@ int LyXRC::read(FileName const & filename)
 }
 
 
-int LyXRC::read(std::istream & is)
+int LyXRC::read(istream & is)
 {
 	Lexer lexrc(lyxrcTags, lyxrcCount);
 	if (lyxerr.debugging(Debug::PARSER))
@@ -889,6 +884,11 @@ int LyXRC::read(Lexer & lexrc)
 				isp_use_pers_dict = lexrc.getBool();
 			}
 			break;
+		case RC_USE_TOOLTIP:
+			if (lexrc.next()) {
+				use_tooltip = lexrc.getBool();
+			}
+			break;
 		case RC_USE_PIXMAP_CACHE:
 			if (lexrc.next()) {
 				use_pixmap_cache = lexrc.getBool();
@@ -1068,7 +1068,7 @@ int LyXRC::read(Lexer & lexrc)
 			int flgs = Format::none;
 			while (!flags.empty()) {
 				string flag;
-				flags = support::split(flags, flag, ',');
+				flags = split(flags, flag, ',');
 				if (flag == "document")
 					flgs |= Format::document;
 				else if (flag == "vector")
@@ -1200,7 +1200,7 @@ void LyXRC::print() const
 
 class SameMover {
 public:
-	typedef std::pair<std::string, SpecialisedMover> Data;
+	typedef pair<string, SpecialisedMover> Data;
 
 	SameMover(Data const & comparison)
 		: comparison_(comparison) {}
@@ -2061,6 +2061,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
+	case RC_USE_TOOLTIP:
+		if (ignore_system_lyxrc ||
+		    use_tooltip != system_lyxrc.use_tooltip) {
+			os << "\\use_tooltip "
+			   << convert<string>(use_tooltip)
+			   << '\n';
+		}
 	case RC_USE_PIXMAP_CACHE:
 		if (ignore_system_lyxrc ||
 		    use_pixmap_cache != system_lyxrc.use_pixmap_cache) {
@@ -2222,12 +2229,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 				   << cit->shortcut() << "\" \""
 				   << cit->viewer() << "\" \""
 				   << cit->editor() << "\" \"";
-				std::vector<string> flags;
+				vector<string> flags;
 				if (cit->documentFormat())
 					flags.push_back("document");
 				if (cit->vectorFormat())
 					flags.push_back("vector");
-				os << support::getStringFromVector(flags);
+				os << getStringFromVector(flags);
 				os << "\"\n";
 			}
 		}
@@ -2288,10 +2295,10 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 
 		for (; it != end; ++it) {
 			Movers::const_iterator const sysit =
-				std::find_if(sysbegin, sysend, SameMover(*it));
+				find_if(sysbegin, sysend, SameMover(*it));
 			if (sysit == sysend) {
-				std::string const & fmt = it->first;
-				std::string const & command =
+				string const & fmt = it->first;
+				string const & command =
 					it->second.command();
 
 				os << "\\copier " << fmt
@@ -2676,6 +2683,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Specify whether to pass the -T input encoding option to ispell. Enable this if you cannot check the spelling of words containing accented letters. This may not work with all dictionaries.");
 		break;
 
+	case RC_USE_TOOLTIP:
+		str = _("Enable the automatic appearance of tool tips in the work area.");
+		break;
+
 	case RC_USE_PIXMAP_CACHE:
 		str = _("Enable the pixmap cache that might improve performance on Mac and Windows.");
 		break;