X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=903d53f7e4e6e12bd1372f9f7831ff2daaff0079;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=f80c7b5f517ddfe736afab3d571b216a8928764c;hpb=5014b38cb7ca1967275050a90fcfe1aeade963e4;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index f80c7b5f51..903d53f7e4 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -18,7 +18,6 @@
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#include "paper.h"
 #include "Length.h"
 
 #include "support/strfwd.h"
@@ -26,7 +25,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <vector>
 
 
 namespace lyx {
@@ -58,6 +56,7 @@ public:
 		RC_COMPLETION_INLINE_MATH,
 		RC_COMPLETION_INLINE_TEXT,
 		RC_COMPLETION_INLINE_DOTS,
+		RC_COMPLETION_MINLENGTH,
 		RC_COMPLETION_POPUP_DELAY,
 		RC_COMPLETION_POPUP_MATH,
 		RC_COMPLETION_POPUP_TEXT,
@@ -70,7 +69,6 @@ public:
 		RC_DATE_INSERT_FORMAT,
 		RC_DEFAULT_DECIMAL_POINT,
 		RC_DEFAULT_LENGTH_UNIT,
-		RC_DEFAULT_LANGUAGE,
 		RC_DEFAULT_VIEW_FORMAT,
 		RC_DEFFILE,
 		RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -116,7 +114,7 @@ public:
 		RC_LYXRCFORMAT,
 		RC_MACRO_EDIT_STYLE,
 		RC_MAC_DONTSWAP_CTRL_META,
-		RC_MAC_LIKE_WORD_MOVEMENT,
+		RC_MAC_LIKE_CURSOR_MOVEMENT,
 		RC_MAKE_BACKUP,
 		RC_MARK_FOREIGN_LANGUAGE,
 		RC_MOUSE_WHEEL_SPEED,
@@ -185,10 +183,13 @@ public:
 		RC_USE_SYSTEM_COLORS,
 		RC_USE_TOOLTIP,
 		RC_USE_PIXMAP_CACHE,
+		RC_USE_QIMAGE,
+		RC_USE_SYSTEM_THEME_ICONS,
 		RC_VIEWDVI_PAPEROPTION,
 		RC_VIEWER,
 		RC_VIEWER_ALTERNATIVES,
 		RC_VISUAL_CURSOR,
+		RC_CLOSE_BUFFER_WITH_LAST_VIEW,
 		RC_LAST
 	};
 
@@ -361,6 +362,8 @@ public:
 	bool use_system_colors;
 	/// Use pixmap cache?
 	bool use_pixmap_cache;
+	/// Use QImage backend?
+	bool use_qimage;
 	/// Spellchecker engine: aspell, hunspell, etc
 	std::string spellchecker;
 	/// Alternate language for spellchecker
@@ -371,6 +374,8 @@ public:
 	bool spellcheck_continuously;
 	/// spellcheck notes and comments?
 	bool spellcheck_notes;
+	/// minimum length of words to complete
+	unsigned int completion_minlength;
 	///
 	bool use_kbmap;
 	///
@@ -413,8 +418,6 @@ public:
 	///
 	bool mark_foreign_language;
 	///
-	std::string default_language;
-	///
 	std::string gui_language;
 	///
 	std::string default_view_format;
@@ -425,7 +428,7 @@ public:
 	///
 	bool mac_dontswap_ctrl_meta;
 	///
-	bool mac_like_word_movement;
+	bool mac_like_cursor_movement;
 	///
 	bool cursor_follows_scrollbar;
 	///
@@ -462,6 +465,8 @@ public:
 	std::string user_email;
 	/// icon set name
 	std::string icon_set;
+	/// whether to use the icons from the theme
+	bool use_system_theme_icons;
 	/// True if the TeX engine cannot handle posix paths
 	bool windows_style_tex_paths;
 	/// True if the TeX engine can handle file names containing spaces
@@ -544,6 +549,8 @@ public:
 	bool force_paint_single_char;
 	///
 	int cursor_width;
+	/// One of: yes, no, ask
+	std::string close_buffer_with_last_view;
 };