Store ASCII data in std::string

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 903d53f7e4e6e12bd1372f9f7831ff2daaff0079..d1326685f05c5e790db980ecd1d36fbe76b26dea 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -69,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,
@@ -79,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,
@@ -145,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,
@@ -409,8 +409,6 @@ public:
        };
        ///
        LangPackageSelection language_package_selection;
-       ///
-       bool rtl_support;
        /// bidi cursor movement: true = visual, false = logical
        bool visual_cursor;
        ///
@@ -420,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;
@@ -496,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
@@ -546,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);
 
 ///