installer: further preparation

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 0ddc5da51c1c7729a35626683c131c7628613da3..903d53f7e4e6e12bd1372f9f7831ff2daaff0079 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -18,7 +18,6 @@
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#include "paper.h"
 #include "Length.h"
 
 #include "support/strfwd.h"
@@ -26,7 +25,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <vector>
 
 
 namespace lyx {
@@ -71,7 +69,6 @@ public:
                RC_DATE_INSERT_FORMAT,
                RC_DEFAULT_DECIMAL_POINT,
                RC_DEFAULT_LENGTH_UNIT,
-               RC_DEFAULT_LANGUAGE,
                RC_DEFAULT_VIEW_FORMAT,
                RC_DEFFILE,
                RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -117,7 +114,7 @@ public:
                RC_LYXRCFORMAT,
                RC_MACRO_EDIT_STYLE,
                RC_MAC_DONTSWAP_CTRL_META,
-               RC_MAC_LIKE_WORD_MOVEMENT,
+               RC_MAC_LIKE_CURSOR_MOVEMENT,
                RC_MAKE_BACKUP,
                RC_MARK_FOREIGN_LANGUAGE,
                RC_MOUSE_WHEEL_SPEED,
@@ -187,10 +184,12 @@ public:
                RC_USE_TOOLTIP,
                RC_USE_PIXMAP_CACHE,
                RC_USE_QIMAGE,
+               RC_USE_SYSTEM_THEME_ICONS,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
                RC_VIEWER_ALTERNATIVES,
                RC_VISUAL_CURSOR,
+               RC_CLOSE_BUFFER_WITH_LAST_VIEW,
                RC_LAST
        };
 
@@ -419,8 +418,6 @@ public:
        ///
        bool mark_foreign_language;
        ///
-       std::string default_language;
-       ///
        std::string gui_language;
        ///
        std::string default_view_format;
@@ -431,7 +428,7 @@ public:
        ///
        bool mac_dontswap_ctrl_meta;
        ///
-       bool mac_like_word_movement;
+       bool mac_like_cursor_movement;
        ///
        bool cursor_follows_scrollbar;
        ///
@@ -468,6 +465,8 @@ public:
        std::string user_email;
        /// icon set name
        std::string icon_set;
+       /// whether to use the icons from the theme
+       bool use_system_theme_icons;
        /// True if the TeX engine cannot handle posix paths
        bool windows_style_tex_paths;
        /// True if the TeX engine can handle file names containing spaces
@@ -550,6 +549,8 @@ public:
        bool force_paint_single_char;
        ///
        int cursor_width;
+       /// One of: yes, no, ask
+       std::string close_buffer_with_last_view;
 };