Do not overwrite read-only files. We now move the file to the backup directory and...

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 7429105a4e3f0733d8bfc8ad47cf86961828cef6..b58982276ea814280ec0b1b8c74be9916de682cf 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -106,10 +106,11 @@ public:
                RC_LANGUAGE_COMMAND_END,
                RC_LANGUAGE_COMMAND_LOCAL,
                RC_LANGUAGE_GLOBAL_OPTIONS,
-               RC_LANGUAGE_PACKAGE,
-               RC_LANGUAGE_USE_BABEL,
+               RC_LANGUAGE_CUSTOM_PACKAGE,
+               RC_LANGUAGE_PACKAGE_SELECTION,
                RC_LOADSESSION,
                RC_MACRO_EDIT_STYLE,
+               RC_MAC_DONTSWAP_CTRL_META,
                RC_MAC_LIKE_WORD_MOVEMENT,
                RC_MAKE_BACKUP,
                RC_MARK_FOREIGN_LANGUAGE,
@@ -161,6 +162,7 @@ public:
                RC_SET_COLOR,
                RC_SHOW_BANNER,
                RC_SINGLE_CLOSE_TAB_BUTTON,
+               RC_SINGLE_INSTANCE,
                RC_SORT_LAYOUTS,
                RC_SPELL_COMMAND,
                RC_SPELLCHECK_CONTINUOUSLY,
@@ -182,6 +184,7 @@ public:
                RC_USE_ESC_CHARS,
                RC_USE_INP_ENC,
                RC_USE_PERS_DICT,
+               RC_USE_SYSTEM_COLORS,
                RC_USE_TOOLTIP,
                RC_USE_PIXMAP_CACHE,
                RC_USE_SPELL_LIB,
@@ -351,6 +354,8 @@ public:
        bool paragraph_markers;
        /// Use tooltips?
        bool use_tooltip;
+       /// Use the colors from current system theme?
+       bool use_system_colors;
        /// Use pixmap cache?
        bool use_pixmap_cache;
        /// Spellchecker engine: aspell, hunspell, etc
@@ -374,7 +379,7 @@ public:
        ///
        std::string date_insert_format;
        ///
-       std::string language_package;
+       std::string language_custom_package;
        ///
        bool language_auto_begin;
        ///
@@ -388,7 +393,14 @@ public:
        ///
        bool language_global_options;
        ///
-       bool language_use_babel;
+       enum LangPackageSelection {
+               LP_AUTO = 0,
+               LP_BABEL,
+               LP_CUSTOM,
+               LP_NONE
+       };
+       ///
+       LangPackageSelection language_package_selection;
        ///
        bool rtl_support;
        /// bidi cursor movement: true = visual, false = logical
@@ -408,6 +420,8 @@ public:
        /// all available editors
        Alternatives editor_alternatives;
        ///
+       bool mac_dontswap_ctrl_meta;
+       ///
        bool mac_like_word_movement;
        ///
        bool cursor_follows_scrollbar;
@@ -496,6 +510,8 @@ public:
        ///
        bool single_close_tab_button;
        ///
+       bool single_instance;
+       ///
        std::string forward_search_dvi;
        ///
        std::string forward_search_pdf;
@@ -508,10 +524,10 @@ public:
                SCROLL_WHEEL_ZOOM_OFF,
                SCROLL_WHEEL_ZOOM_CTRL,
                SCROLL_WHEEL_ZOOM_SHIFT,
-               SCROLL_WHEEL_ZOOM_OPTION
+               SCROLL_WHEEL_ZOOM_ALT
        };
        ///
-       ScrollWheelZoom scroll_whell_zoom;
+       ScrollWheelZoom scroll_wheel_zoom;
 };