Make document_language non-mutable

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index dbda8d9153740f4bddde3427c2ee1a4462fa94bf..d1326685f05c5e790db980ecd1d36fbe76b26dea 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,6 +69,7 @@ public:
                RC_DATE_INSERT_FORMAT,
                RC_DEFAULT_DECIMAL_POINT,
                RC_DEFAULT_LENGTH_UNIT,
+               RC_DEFAULT_OTF_VIEW_FORMAT,
                RC_DEFAULT_VIEW_FORMAT,
                RC_DEFFILE,
                RC_DIALOGS_ICONIFY_WITH_MAIN,
@@ -81,12 +80,12 @@ public:
                RC_EXAMPLEPATH,
                RC_EXPORT_OVERWRITE,
                RC_FONT_ENCODING,
-               RC_FORCE_PAINT_SINGLE_CHAR,
                RC_FILEFORMAT,
                RC_FORWARD_SEARCH_DVI,
                RC_FORWARD_SEARCH_PDF,
                RC_FULL_SCREEN_LIMIT,
                RC_FULL_SCREEN_SCROLLBAR,
+               RC_FULL_SCREEN_STATUSBAR,
                RC_FULL_SCREEN_TABBAR,
                RC_FULL_SCREEN_MENUBAR,
                RC_FULL_SCREEN_TOOLBARS,
@@ -116,7 +115,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,
@@ -147,7 +146,6 @@ public:
                RC_PRINTTOPRINTER,
                RC_PRINT_ADAPTOUTPUT,
                RC_PRINT_COMMAND,
-               RC_RTL_SUPPORT,
                RC_SAVE_COMPRESSED,
                RC_SCREEN_DPI,
                RC_SCREEN_FONT_ROMAN,
@@ -186,6 +184,7 @@ public:
                RC_USE_TOOLTIP,
                RC_USE_PIXMAP_CACHE,
                RC_USE_QIMAGE,
+               RC_USE_SYSTEM_THEME_ICONS,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
                RC_VIEWER_ALTERNATIVES,
@@ -410,8 +409,6 @@ public:
        };
        ///
        LangPackageSelection language_package_selection;
-       ///
-       bool rtl_support;
        /// bidi cursor movement: true = visual, false = logical
        bool visual_cursor;
        ///
@@ -421,6 +418,8 @@ public:
        ///
        std::string gui_language;
        ///
+       std::string default_otf_view_format;
+       ///
        std::string default_view_format;
        /// all available viewers
        Alternatives viewer_alternatives;
@@ -429,7 +428,7 @@ public:
        ///
        bool mac_dontswap_ctrl_meta;
        ///
-       bool mac_like_word_movement;
+       bool mac_like_cursor_movement;
        ///
        bool cursor_follows_scrollbar;
        ///
@@ -466,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
@@ -495,6 +496,8 @@ public:
        bool full_screen_tabbar;
        /// Toggle menubar in fullscreen mode?
        bool full_screen_menubar;
+       /// Toggle statusbar in fullscreen mode?
+       bool full_screen_statusbar;
        /// Limit the text width?
        bool full_screen_limit;
        /// Width of limited screen (in pixels) in fullscreen mode
@@ -545,25 +548,12 @@ public:
        ///
        ScrollWheelZoom scroll_wheel_zoom;
        ///
-       bool force_paint_single_char;
-       ///
        int cursor_width;
        /// One of: yes, no, ask
        std::string close_buffer_with_last_view;
 };
 
 
-/** \c LyXRC_PreviewStatus is a wrapper for LyXRC::PreviewStatus.
- *  It can be forward-declared and passed as a function argument without
- *  having to expose LyXRC.h.
- */
-class LyXRC_PreviewStatus {
-       LyXRC::PreviewStatus val_;
-public:
-       LyXRC_PreviewStatus(LyXRC::PreviewStatus val) : val_(val) {}
-       operator LyXRC::PreviewStatus() const { return val_; }
-};
-
 void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 
 ///