X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLyXRC.h;h=c196d579f13f5776062d4ee8c8606d60d14bfc12;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=d795d345ec57044c1c1639519fbdc68dbcc1893d;hpb=44ede7ef4b1603c70c74c02ab784c17e5d7053e2;p=lyx.git

diff --git a/src/LyXRC.h b/src/LyXRC.h
index d795d345ec..c196d579f1 100644
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -51,8 +51,11 @@ public:
 		RC_BIBTEX_ALTERNATIVES,
 		RC_BIBTEX_COMMAND,
 		RC_BINDFILE,
+		RC_BOOKMARKS_VISIBILITY,
 		RC_CHECKLASTFILES,
 		RC_CHKTEX_COMMAND,
+		RC_CITATION_SEARCH,
+		RC_CITATION_SEARCH_PATTERN,
 		RC_CITATION_SEARCH_VIEW,
 		RC_COMPLETION_CURSOR_TEXT,
 		RC_COMPLETION_INLINE_DELAY,
@@ -87,13 +90,13 @@ public:
 		RC_FILEFORMAT,
 		RC_FORWARD_SEARCH_DVI,
 		RC_FORWARD_SEARCH_PDF,
-		RC_FULL_SCREEN_LIMIT,
+		RC_SCREEN_LIMIT,
 		RC_FULL_SCREEN_SCROLLBAR,
 		RC_FULL_SCREEN_STATUSBAR,
 		RC_FULL_SCREEN_TABBAR,
 		RC_FULL_SCREEN_MENUBAR,
 		RC_FULL_SCREEN_TOOLBARS,
-		RC_FULL_SCREEN_WIDTH,
+		RC_SCREEN_WIDTH,
 		RC_GEOMETRY_SESSION,
 		RC_GROUP_LAYOUTS,
 		RC_GUI_LANGUAGE,
@@ -186,13 +189,14 @@ public:
 		RC_VIEWER_ALTERNATIVES,
 		RC_VISUAL_CURSOR,
 		RC_CLOSE_BUFFER_WITH_LAST_VIEW,
+		RC_DRAW_STRATEGY,
 		RC_LAST
 	};
 
 	///
 	LyXRC() : user_name(support::user_name()),
 	          user_email(support::user_email()) // always empty
-		{};
+		{}
 
 	/// \param check_format: whether to try to convert the file format,
 	/// if it is not current. this should only be true, really, for the
@@ -244,13 +248,15 @@ public:
 	/// default paper size for local xdvi/dvips/ghostview/whatever
 	/// command to run chktex incl. options
 	std::string chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
-	// Name of external script, which searches for file corresponding to a 
-	// given citation. At this moment only script lyxpaperview[.py] is supported
-	// (search for pdf based on author+year), but we can generalize if requested.
-	// Citation context menu item "Open Citation Content" will be always enabled
-	// if the name of this script in nonempty (last resort when citation entry
-	// does not contain neccessary info.
+	/// Use external script to search for file corresponding to a 
+	/// given citation.
+	bool citation_search = false;
+	/// Name of external script which searches for file corresponding to a 
+	/// given citation. At this moment only script lyxpaperview.py is supported
+	/// (search for pdf or ps based on specific items)
 	std::string citation_search_view;
+	/// Items to search for in citation_search_view
+	std::string citation_search_pattern = "%year% %abbrvciteauthor%";
 	/// all available commands to run bibtex incl. options
 	CommandSet bibtex_alternatives;
 	/// command to run bibtex incl. options
@@ -314,6 +320,7 @@ public:
 	int defaultZoom = 150;
 	/// Actual zoom factor for screen fonts
 	/// (default zoom plus buffer zoom factor)
+	/// Do not set directly. Use GuiView::setCurrentZoom()
 	int currentZoom = 150;
 	/// Screen font sizes in points for each font size
 	std::string font_sizes[10] = { "5.0", "7.0", "8.0", "9.0", "10.0",
@@ -366,11 +373,9 @@ public:
 	/// Accept compound words in spellchecker?
 	bool spellchecker_accept_compound = false;
 	/// spellcheck continuously?
-	bool spellcheck_continuously = false;
+	bool spellcheck_continuously = true;
 	/// spellcheck notes and comments?
 	bool spellcheck_notes = true;
-	/// minimum length of words to complete
-	unsigned int completion_minlength = 6;
 	///
 	bool use_kbmap = false;
 	///
@@ -506,9 +511,9 @@ public:
 	/// Toggle statusbar in fullscreen mode?
 	bool full_screen_statusbar = true;
 	/// Limit the text width?
-	bool full_screen_limit = false;
-	/// Width of limited screen (in pixels) in fullscreen mode
-	int full_screen_width = 700;
+	bool screen_limit = false;
+	/// Width of limited screen width 
+	Length screen_width = Length(7, Length::IN); 
 	///
 	bool completion_cursor_text = true;
 	///
@@ -519,6 +524,8 @@ public:
 	bool completion_inline_text = false;
 	///
 	int completion_inline_dots = -1;
+	/// minimum length of words to complete
+	unsigned int completion_minlength = 6;
 	///
 	double completion_popup_delay = 2.0;
 	///
@@ -554,10 +561,30 @@ public:
 	};
 	///
 	ScrollWheelZoom scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
+	// FIXME: should be caret_width
 	///
-	int cursor_width = 1;
+	int cursor_width = 0;
 	/// One of: yes, no, ask
 	std::string close_buffer_with_last_view = "yes";
+	enum BookmarksVisibility {
+		BMK_NONE,
+		BMK_MARGIN,
+		BMK_INLINE
+	};
+
+	///
+	BookmarksVisibility bookmarks_visibility = BMK_NONE;
+
+	enum DrawStrategy {
+		// draw all (not implemented yet)
+		// FS_FULL,
+		// draw only what has changed
+		DS_PARTIAL,
+		// draw in backing store (only what has changed)
+		DS_BACKINGSTORE
+	};
+	///
+	DrawStrategy draw_strategy = DS_PARTIAL;
 };