X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=6e1ccfd7c8aa54b772b00de2ee911f962b31d509;hb=55012674c87bae73da86b64148427b0e6e3c58f4;hp=010e957153ef06a4a8a0ee3ac99c17cb64dca051;hpb=244de5d2c10a990828eafdd72283fc87742dc133;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 010e957153..6e1ccfd7c8 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -66,10 +66,10 @@ public:
 		RC_COPIER,
 		RC_CURSOR_FOLLOWS_SCROLLBAR,
 		RC_CURSOR_WIDTH,
-		RC_DATE_INSERT_FORMAT,
 		RC_DEFAULT_DECIMAL_POINT,
 		RC_DEFAULT_LENGTH_UNIT,
 		RC_DEFAULT_OTF_VIEW_FORMAT,
+		RC_DEFAULT_PLATEX_VIEW_FORMAT,
 		RC_DEFAULT_VIEW_FORMAT,
 		RC_DEFFILE,
 		RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -79,7 +79,6 @@ public:
 		RC_ESC_CHARS,
 		RC_EXAMPLEPATH,
 		RC_EXPORT_OVERWRITE,
-		RC_FONT_ENCODING,
 		RC_FILEFORMAT,
 		RC_FORWARD_SEARCH_DVI,
 		RC_FORWARD_SEARCH_PDF,
@@ -98,6 +97,7 @@ public:
 		RC_INDEX_ALTERNATIVES,
 		RC_INDEX_COMMAND,
 		RC_INPUT,
+		RC_JBIBTEX_ALTERNATIVES,
 		RC_JBIBTEX_COMMAND,
 		RC_JINDEX_COMMAND,
 		RC_KBMAP,
@@ -132,6 +132,7 @@ public:
 		RC_PRINTLANDSCAPEFLAG,
 		RC_PRINTPAPERDIMENSIONFLAG,
 		RC_PRINTPAPERFLAG,
+		RC_PYGMENTIZE_COMMAND,
 		RC_SAVE_COMPRESSED,
 		RC_SAVE_ORIGIN,
 		RC_SCREEN_DPI,
@@ -169,10 +170,9 @@ public:
 		RC_USE_CONVERTER_CACHE,
 		RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN,
 		RC_USE_CONVERTER_NEEDAUTH,
+		RC_USE_NATIVE_FILEDIALOG,
 		RC_USE_SYSTEM_COLORS,
 		RC_USE_TOOLTIP,
-		RC_USE_PIXMAP_CACHE,
-		RC_USE_QIMAGE,
 		RC_USE_SYSTEM_THEME_ICONS,
 		RC_VIEWDVI_PAPEROPTION,
 		RC_VIEWER,
@@ -215,6 +215,8 @@ public:
 		   std::string const & tag = std::string()) const;
 	///
 	void print() const;
+	///
+	std::set<std::string> getRCs();
 	// FIXME unused (was used for xforms. Do we still need this?)
 	//static docstring const getDescription(LyXRCTags);
 	///
@@ -240,6 +242,8 @@ public:
 	std::string bibtex_command;
 	/// command to run japanese bibtex incl. options
 	std::string jbibtex_command;
+	/// all available commands to run japanese bibtex incl. options
+	CommandSet jbibtex_alternatives;
 	/// all available index commands incl. options
 	CommandSet index_alternatives;
 	/// command to run makeindex incl. options or other index programs
@@ -250,6 +254,8 @@ public:
 	std::string splitindex_command;
 	/// command to run makeindex incl. options for nomencl
 	std::string nomencl_command;
+	/// command to run the python pygments syntax highlighter
+	std::string pygmentize_command;
 	///
 	std::string document_path;
 	///
@@ -289,8 +295,11 @@ public:
 	bool allow_geometry_session;
 	/// Scrolling speed of the mouse wheel
 	double mouse_wheel_speed;
-	/// Zoom factor for screen fonts
-	unsigned int zoom;
+	/// Default zoom factor for screen fonts
+	int defaultZoom;
+	/// Actual zoom factor for screen fonts
+	/// (default zoom plus buffer zoom factor)
+	int currentZoom;
 	/// Screen font sizes in points for each font size
 	std::string font_sizes[10];
 	/// Allow the use of scalable fonts? Default is yes.
@@ -298,8 +307,6 @@ public:
 	/// DPI of monitor
 	unsigned int dpi;
 	///
-	std::string fontenc;
-	///
 	std::string roman_font_name;
 	///
 	std::string sans_font_name;
@@ -323,10 +330,8 @@ public:
 	bool use_tooltip;
 	/// Use the colors from current system theme?
 	bool use_system_colors;
-	/// Use pixmap cache?
-	bool use_pixmap_cache;
-	/// Use QImage backend?
-	bool use_qimage;
+	/// use native file dialog or our own ?
+	bool use_native_filedialog;
 	/// Spellchecker engine: aspell, hunspell, etc
 	std::string spellchecker;
 	/// Alternate language for spellchecker
@@ -348,8 +353,6 @@ public:
 	///
 	std::string lyxpipes;
 	///
-	std::string date_insert_format;
-	///
 	std::string language_custom_package;
 	///
 	bool language_auto_begin;
@@ -383,6 +386,8 @@ public:
 	///
 	std::string default_otf_view_format;
 	///
+	std::string default_platex_view_format;
+	///
 	std::string default_view_format;
 	/// all available viewers
 	Alternatives viewer_alternatives;
@@ -449,8 +454,6 @@ public:
 	bool use_converter_needauth_forbidden;
 	/// Ask user before calling external converters with 'needauth' option
 	bool use_converter_needauth;
-	/// Apply hardening when calling external converters
-	bool use_converter_wrappers;
 	/// The maximum age of cache files in seconds
 	unsigned int converter_cache_maxage;
 	/// Sort layouts alphabetically