X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=6c7809c7e5811ea933e1021f9e059e3df8fdfe16;hb=4db3e641ed6765e005343010cb90ee8af26f8f99;hp=6dba894ef7107cb885aad4077adfbeee1dc84306;hpb=47e98487838b6c99b2631f0b203abf89e2d739bd;p=lyx.git

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 6dba894ef7..6c7809c7e5 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,7 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 10; // tommaso: new prefs option: close_buffer_with_last_view
+static unsigned int const LYXRC_FILEFORMAT = 13; // vfr: System theme's icons
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -134,7 +134,7 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\language_package_selection", LyXRC::RC_LANGUAGE_PACKAGE_SELECTION },
 	{ "\\load_session", LyXRC::RC_LOADSESSION },
 	{ "\\mac_dontswap_ctrl_meta", LyXRC::RC_MAC_DONTSWAP_CTRL_META },
-	{ "\\mac_like_word_movement", LyXRC::RC_MAC_LIKE_WORD_MOVEMENT },
+	{ "\\mac_like_cursor_movement", LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT },
 	{ "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
 	{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
 	{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
@@ -203,6 +203,7 @@ LexerKeyword lyxrcTags[] = {
 	{ "\\use_qimage", LyXRC::RC_USE_QIMAGE },
 	// compatibility with versions older than 1.4.0 only
 	{ "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS },
+	{ "\\use_system_theme_icons", LyXRC::RC_USE_SYSTEM_THEME_ICONS },
 	{ "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
 	{ "\\user_email", LyXRC::RC_USER_EMAIL },
 	{ "\\user_name", LyXRC::RC_USER_NAME },
@@ -228,6 +229,7 @@ LyXRC::LyXRC()
 void LyXRC::setDefaults()
 {
 	icon_set = string();
+	use_system_theme_icons = false;
 	bind_file = "cua";
 	def_file = "default";
 	ui_file = "default";
@@ -329,7 +331,7 @@ void LyXRC::setDefaults()
 	scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
 	paragraph_markers = false;
 	mac_dontswap_ctrl_meta = false;
-	mac_like_word_movement = false;
+	mac_like_cursor_movement = false;
 	macro_edit_style = MACRO_EDIT_INLINE_BOX;
 	dialogs_iconify_with_main = false;
 	preview = PREVIEW_OFF;
@@ -833,6 +835,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			lexrc >> icon_set;
 			break;
 
+		case RC_USE_SYSTEM_THEME_ICONS:
+			lexrc >> use_system_theme_icons;
+			break;
+
 		case RC_SCREEN_FONT_ROMAN:
 			if (lexrc.next()) {
 				roman_font_name = lexrc.getString();
@@ -925,8 +931,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			lexrc >> mac_dontswap_ctrl_meta;
 			break;
 
-		case RC_MAC_LIKE_WORD_MOVEMENT:
-			lexrc >> mac_like_word_movement;
+		case RC_MAC_LIKE_CURSOR_MOVEMENT:
+			lexrc >> mac_like_cursor_movement;
 			break;
 
 		case RC_MACRO_EDIT_STYLE:
@@ -1701,6 +1707,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		if (tag != RC_LAST)
 			break;
 
+	case RC_USE_SYSTEM_THEME_ICONS:
+		if (ignore_system_lyxrc ||
+			  use_system_theme_icons != system_lyxrc.use_system_theme_icons) {
+			os << "\\use_system_theme_icons "
+				<< convert<string>(use_system_theme_icons)
+				<< "\n";
+		}
+		if (tag != RC_LAST)
+			break;
+
 	case RC_SCREEN_DPI:
 		if (ignore_system_lyxrc ||
 		    dpi != system_lyxrc.dpi) {
@@ -1768,12 +1784,12 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 		}
 		if (tag != RC_LAST)
 			break;
-	case RC_MAC_LIKE_WORD_MOVEMENT:
+	case RC_MAC_LIKE_CURSOR_MOVEMENT:
 		if (ignore_system_lyxrc ||
-		    mac_like_word_movement
-		    != system_lyxrc.mac_like_word_movement) {
-			os << "\\mac_like_word_movement "
-			   << convert<string>(mac_like_word_movement) << '\n';
+		    mac_like_cursor_movement
+		    != system_lyxrc.mac_like_cursor_movement) {
+			os << "\\mac_like_cursor_movement "
+			   << convert<string>(mac_like_cursor_movement) << '\n';
 		}
 		if (tag != RC_LAST)
 			break;
@@ -2760,7 +2776,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 				    || sysfmt == sysend               // format not found
 					 || sysfmt->second.count(cmd) == 0 // this command not found
 				   )
-					os << "\\viewer_alternatives " << fmt << " " << cmd << "\n";
+					os << "\\viewer_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
 			}
 		}
 		if (tag != RC_LAST)
@@ -2785,7 +2801,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
 				    || sysfmt == sysend               // format not found
 				    || sysfmt->second.count(cmd) == 0 // this command not found
 				   )
-					os << "\\editor_alternatives " << fmt << " " << cmd << "\n";
+					os << "\\editor_alternatives " << fmt << " \"" << escapeCommand(cmd) << "\"\n";
 			}
 		}
 		if (tag != RC_LAST)
@@ -2951,7 +2967,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_LANGUAGE_PACKAGE_SELECTION:
 	case LyXRC::RC_LYXRCFORMAT:
 	case LyXRC::RC_MAC_DONTSWAP_CTRL_META:
-	case LyXRC::RC_MAC_LIKE_WORD_MOVEMENT:
+	case LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT:
 	case LyXRC::RC_MACRO_EDIT_STYLE:
 	case LyXRC::RC_MAKE_BACKUP:
 	case LyXRC::RC_MARK_FOREIGN_LANGUAGE:
@@ -3023,6 +3039,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_USE_TOOLTIP:
 	case LyXRC::RC_USE_PIXMAP_CACHE:
 	case LyXRC::RC_USE_QIMAGE:
+	case LyXRC::RC_USE_SYSTEM_THEME_ICONS:
 	case LyXRC::RC_VIEWDVI_PAPEROPTION:
 	case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON:
 	case LyXRC::RC_SINGLE_INSTANCE:
@@ -3128,8 +3145,8 @@ string const LyXRC::getDescription(LyXRCTags tag)
 		str = _("Make Apple key act as Meta and Control key as Ctrl.");
 		break;
 
-	case RC_MAC_LIKE_WORD_MOVEMENT:
-		str = _("Use the Mac OS X conventions for the word-level cursor movement");
+	case RC_MAC_LIKE_CURSOR_MOVEMENT:
+		str = _("Use the Mac OS X conventions for cursor movement");
 		break;
 
 	case RC_SHOW_MACRO_LABEL: