X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=3567bae6ea4e196b0b07844a60443b020cd1dfc4;hb=dad3c8ce74d1ebea92973bea5ca44f97d660d38e;hp=cb7d3f6aaf11d65a6198ae1e1b96c02337f0f7e0;hpb=e611cc2d4a42ca00a1a66993add2aa3fa77f0ff3;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index cb7d3f6aaf..3567bae6ea 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -110,6 +110,7 @@ public:
 		RC_LANGUAGE_USE_BABEL,
 		RC_LOADSESSION,
 		RC_MACRO_EDIT_STYLE,
+		RC_MAC_DONTSWAP_CTRL_META,
 		RC_MAC_LIKE_WORD_MOVEMENT,
 		RC_MAKE_BACKUP,
 		RC_MARK_FOREIGN_LANGUAGE,
@@ -156,6 +157,7 @@ public:
 		RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
 		RC_SCREEN_ZOOM,
 		RC_SCROLL_BELOW_DOCUMENT,
+		RC_SCROLL_WHEEL_ZOOM,
 		RC_SERVERPIPE,
 		RC_SET_COLOR,
 		RC_SHOW_BANNER,
@@ -165,7 +167,6 @@ public:
 		RC_SPELLCHECK_CONTINUOUSLY,
 		RC_SPELLCHECK_NOTES,
 		RC_SPELLCHECKER,
-		RC_SPELL_MINLENGTH,
 		RC_SPLITINDEX_COMMAND,
 		RC_TEMPDIRPATH,
 		RC_TEMPLATEPATH,
@@ -182,6 +183,7 @@ public:
 		RC_USE_ESC_CHARS,
 		RC_USE_INP_ENC,
 		RC_USE_PERS_DICT,
+		RC_USE_SYSTEM_COLORS,
 		RC_USE_TOOLTIP,
 		RC_USE_PIXMAP_CACHE,
 		RC_USE_SPELL_LIB,
@@ -351,6 +353,8 @@ public:
 	bool paragraph_markers;
 	/// Use tooltips?
 	bool use_tooltip;
+	/// Use the colors from current system theme?
+	bool use_system_colors;
 	/// Use pixmap cache?
 	bool use_pixmap_cache;
 	/// Spellchecker engine: aspell, hunspell, etc
@@ -363,8 +367,6 @@ public:
 	bool spellcheck_continuously;
 	/// spellcheck notes and comments?
 	bool spellcheck_notes;
-	/// minimum length of words to complete
-	unsigned int spellcheck_minlength;
 	///
 	bool use_kbmap;
 	///
@@ -410,6 +412,8 @@ public:
 	/// all available editors
 	Alternatives editor_alternatives;
 	///
+	bool mac_dontswap_ctrl_meta;
+	///
 	bool mac_like_word_movement;
 	///
 	bool cursor_follows_scrollbar;
@@ -505,6 +509,15 @@ public:
 	int export_overwrite;
 	/// Default decimal point when aligning table columns on decimal
 	std::string default_decimal_point;
+	///
+	enum ScrollWheelZoom {
+		SCROLL_WHEEL_ZOOM_OFF,
+		SCROLL_WHEEL_ZOOM_CTRL,
+		SCROLL_WHEEL_ZOOM_SHIFT,
+		SCROLL_WHEEL_ZOOM_ALT
+	};
+	///
+	ScrollWheelZoom scroll_wheel_zoom;
 };