X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=7b50ce0a56e9b218cee1ee9304c43207798bacbe;hb=3628ceec480c3d8fa9673f80f781eb1153fb9e1f;hp=dbda8d9153740f4bddde3427c2ee1a4462fa94bf;hpb=4985015e8939df78a8d29c31aa04bc28caa3a47f;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index dbda8d9153..7b50ce0a56 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 {
@@ -71,6 +69,7 @@ public:
 		RC_DATE_INSERT_FORMAT,
 		RC_DEFAULT_DECIMAL_POINT,
 		RC_DEFAULT_LENGTH_UNIT,
+		RC_DEFAULT_OTF_VIEW_FORMAT,
 		RC_DEFAULT_VIEW_FORMAT,
 		RC_DEFFILE,
 		RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -81,12 +80,12 @@ public:
 		RC_EXAMPLEPATH,
 		RC_EXPORT_OVERWRITE,
 		RC_FONT_ENCODING,
-		RC_FORCE_PAINT_SINGLE_CHAR,
 		RC_FILEFORMAT,
 		RC_FORWARD_SEARCH_DVI,
 		RC_FORWARD_SEARCH_PDF,
 		RC_FULL_SCREEN_LIMIT,
 		RC_FULL_SCREEN_SCROLLBAR,
+		RC_FULL_SCREEN_STATUSBAR,
 		RC_FULL_SCREEN_TABBAR,
 		RC_FULL_SCREEN_MENUBAR,
 		RC_FULL_SCREEN_TOOLBARS,
@@ -116,10 +115,11 @@ 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,
+		RC_MOUSE_MIDDLEBUTTON_PASTE,
 		RC_NOMENCL_COMMAND,
 		RC_NUMLASTFILES,
 		RC_OPEN_BUFFERS_IN_TABS,
@@ -129,26 +129,11 @@ public:
 		RC_PREVIEW,
 		RC_PREVIEW_HASHED_LABELS,
 		RC_PREVIEW_SCALE_FACTOR,
-		RC_PRINTCOLLCOPIESFLAG,
-		RC_PRINTCOPIESFLAG,
-		RC_PRINTER,
-		RC_PRINTEVENPAGEFLAG,
-		RC_PRINTEXSTRAOPTIONS,
-		RC_PRINTFILEEXTENSION,
 		RC_PRINTLANDSCAPEFLAG,
-		RC_PRINTODDPAGEFLAG,
-		RC_PRINTPAGERANGEFLAG,
 		RC_PRINTPAPERDIMENSIONFLAG,
 		RC_PRINTPAPERFLAG,
-		RC_PRINTREVERSEFLAG,
-		RC_PRINTSPOOL_COMMAND,
-		RC_PRINTSPOOL_PRINTERPREFIX,
-		RC_PRINTTOFILE,
-		RC_PRINTTOPRINTER,
-		RC_PRINT_ADAPTOUTPUT,
-		RC_PRINT_COMMAND,
-		RC_RTL_SUPPORT,
 		RC_SAVE_COMPRESSED,
+		RC_SAVE_ORIGIN,
 		RC_SCREEN_DPI,
 		RC_SCREEN_FONT_ROMAN,
 		RC_SCREEN_FONT_ROMAN_FOUNDRY,
@@ -186,6 +171,7 @@ public:
 		RC_USE_TOOLTIP,
 		RC_USE_PIXMAP_CACHE,
 		RC_USE_QIMAGE,
+		RC_USE_SYSTEM_THEME_ICONS,
 		RC_VIEWDVI_PAPEROPTION,
 		RC_VIEWER,
 		RC_VIEWER_ALTERNATIVES,
@@ -236,38 +222,8 @@ public:
 	///
 	std::string ui_file;
 	///
-	std::string printer;
-	///
-	std::string print_command;
-	///
-	std::string print_evenpage_flag;
-	///
-	std::string print_oddpage_flag;
-	///
-	std::string print_pagerange_flag;
-	///
-	std::string print_copies_flag;
-	///
-	std::string print_collcopies_flag;
-	///
-	std::string print_reverse_flag;
-	///
 	std::string print_landscape_flag;
 	///
-	std::string print_to_printer;
-	///
-	bool print_adapt_output;
-	///
-	std::string print_to_file;
-	///
-	std::string print_file_extension;
-	///
-	std::string print_extra_options;
-	///
-	std::string print_spool_command;
-	///
-	std::string print_spool_printerprefix;
-	///
 	std::string print_paper_flag;
 	///
 	std::string print_paper_dimension_flag;
@@ -306,6 +262,8 @@ public:
 	std::string hunspelldir_path;
 	///
 	bool auto_region_delete;
+	/// enable middle-mouse-button paste
+	bool mouse_middlebutton_paste;
 	/// flag telling whether lastfiles should be checked for existance
 	bool auto_reset_options;
 	///
@@ -318,6 +276,8 @@ public:
 	bool load_session;
 	/// do we save new documents as compressed by default
 	bool save_compressed;
+	/// whether or not to save the document dir in the file
+	bool save_origin;
 	/// shall a backup file be created
 	bool make_backup;
 	/// A directory for storing backup files
@@ -410,8 +370,6 @@ public:
 	};
 	///
 	LangPackageSelection language_package_selection;
-	///
-	bool rtl_support;
 	/// bidi cursor movement: true = visual, false = logical
 	bool visual_cursor;
 	///
@@ -421,6 +379,8 @@ public:
 	///
 	std::string gui_language;
 	///
+	std::string default_otf_view_format;
+	///
 	std::string default_view_format;
 	/// all available viewers
 	Alternatives viewer_alternatives;
@@ -429,7 +389,7 @@ public:
 	///
 	bool mac_dontswap_ctrl_meta;
 	///
-	bool mac_like_word_movement;
+	bool mac_like_cursor_movement;
 	///
 	bool cursor_follows_scrollbar;
 	///
@@ -466,6 +426,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
@@ -495,6 +457,8 @@ public:
 	bool full_screen_tabbar;
 	/// Toggle menubar in fullscreen mode?
 	bool full_screen_menubar;
+	/// Toggle statusbar in fullscreen mode?
+	bool full_screen_statusbar;
 	/// Limit the text width?
 	bool full_screen_limit;
 	/// Width of limited screen (in pixels) in fullscreen mode
@@ -545,25 +509,12 @@ public:
 	///
 	ScrollWheelZoom scroll_wheel_zoom;
 	///
-	bool force_paint_single_char;
-	///
 	int cursor_width;
 	/// One of: yes, no, ask
 	std::string close_buffer_with_last_view;
 };
 
 
-/** \c LyXRC_PreviewStatus is a wrapper for LyXRC::PreviewStatus.
- *  It can be forward-declared and passed as a function argument without
- *  having to expose LyXRC.h.
- */
-class LyXRC_PreviewStatus {
-	LyXRC::PreviewStatus val_;
-public:
-	LyXRC_PreviewStatus(LyXRC::PreviewStatus val) : val_(val) {}
-	operator LyXRC::PreviewStatus() const { return val_; }
-};
-
 void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 
 ///
@@ -572,7 +523,7 @@ extern LyXRC lyxrc;
 extern LyXRC system_lyxrc;
 
 // used by at least frontends/qt4/GuiPref.cpp
-const long maxlastfiles = 20;
+const long maxlastfiles = 50;
 
 } // namespace lyx