X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLyXRC.h;h=7049bf8d5e865f8c351a0a006c54b2cdc366ff9a;hb=3a123b90af838b08680471d87170c38e56787df9;hp=9392a0ef6d11a45e81894ef608145f9b6930a00a;hpb=260a98d295c54ba1009236cf7101a76cba20bd03;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 9392a0ef6d..7049bf8d5e 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -70,6 +70,7 @@ public:
 		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,
@@ -98,6 +99,7 @@ public:
 		RC_INDEX_ALTERNATIVES,
 		RC_INDEX_COMMAND,
 		RC_INPUT,
+		RC_JBIBTEX_ALTERNATIVES,
 		RC_JBIBTEX_COMMAND,
 		RC_JINDEX_COMMAND,
 		RC_KBMAP,
@@ -129,24 +131,10 @@ 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_PYGMENTIZE_COMMAND,
 		RC_SAVE_COMPRESSED,
 		RC_SAVE_ORIGIN,
 		RC_SCREEN_DPI,
@@ -182,6 +170,9 @@ public:
 		RC_USER_EMAIL,
 		RC_USER_NAME,
 		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,
@@ -237,38 +228,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;
@@ -283,6 +244,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
@@ -293,6 +256,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;
 	///
@@ -332,8 +297,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.
@@ -366,6 +334,8 @@ public:
 	bool use_tooltip;
 	/// Use the colors from current system theme?
 	bool use_system_colors;
+	/// use native file dialog or our own ?
+	bool use_native_filedialog;
 	/// Use pixmap cache?
 	bool use_pixmap_cache;
 	/// Use QImage backend?
@@ -426,6 +396,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;
@@ -488,6 +460,10 @@ public:
 	std::string texinputs_prefix;
 	/// Use the cache for file converters?
 	bool use_converter_cache;
+	/// Forbid use of external converters with 'needauth' option
+	bool use_converter_needauth_forbidden;
+	/// Ask user before calling external converters with 'needauth' option
+	bool use_converter_needauth;
 	/// The maximum age of cache files in seconds
 	unsigned int converter_cache_maxage;
 	/// Sort layouts alphabetically
@@ -568,7 +544,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