Amend 207eaeee9071cb

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index cf6a01231000fbc042579daa8bf871ec0116d0b4..c437021c068f9d40e6180d83f8ed69d54932d97e 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -31,9 +31,10 @@
 
 namespace lyx {
 
-namespace support { class FileName; }
-
+namespace support {
+class FileName;
 class Lexer;
+}
 
 /// This contains the runtime configuration of LyX
 class LyXRC
@@ -51,6 +52,7 @@ public:
                RC_BIBTEX_ALTERNATIVES,
                RC_BIBTEX_COMMAND,
                RC_BINDFILE,
+               RC_BOOKMARKS_VISIBILITY,
                RC_CHECKLASTFILES,
                RC_CHKTEX_COMMAND,
                RC_CITATION_SEARCH,
@@ -89,13 +91,13 @@ public:
                RC_FILEFORMAT,
                RC_FORWARD_SEARCH_DVI,
                RC_FORWARD_SEARCH_PDF,
-               RC_FULL_SCREEN_LIMIT,
+               RC_SCREEN_LIMIT,
                RC_FULL_SCREEN_SCROLLBAR,
                RC_FULL_SCREEN_STATUSBAR,
                RC_FULL_SCREEN_TABBAR,
                RC_FULL_SCREEN_MENUBAR,
                RC_FULL_SCREEN_TOOLBARS,
-               RC_FULL_SCREEN_WIDTH,
+               RC_SCREEN_WIDTH,
                RC_GEOMETRY_SESSION,
                RC_GROUP_LAYOUTS,
                RC_GUI_LANGUAGE,
@@ -172,6 +174,7 @@ public:
                RC_TEXINPUTS_PREFIX,
                RC_THESAURUSDIRPATH,
                RC_UIFILE,
+               RC_UI_STYLE,
                RC_USELASTFILEPOS,
                RC_USER_EMAIL,
                RC_USER_INITIALS,
@@ -188,13 +191,14 @@ public:
                RC_VIEWER_ALTERNATIVES,
                RC_VISUAL_CURSOR,
                RC_CLOSE_BUFFER_WITH_LAST_VIEW,
+               RC_DRAW_STRATEGY,
                RC_LAST
        };
 
        ///
        LyXRC() : user_name(support::user_name()),
                  user_email(support::user_email()) // always empty
-               {};
+               {}
 
        /// \param check_format: whether to try to convert the file format,
        /// if it is not current. this should only be true, really, for the
@@ -209,7 +213,7 @@ private:
                FormatMismatch
        };
        ///
-       ReturnValues read(Lexer &, bool check_format);
+       ReturnValues read(support::Lexer &, bool check_format);
 public:
        ///
        typedef std::set<std::string> CommandSet;
@@ -250,7 +254,7 @@ public:
        /// given citation.
        bool citation_search = false;
        /// Name of external script which searches for file corresponding to a 
-       /// given citation. At this moment only script lyxpaperview.p is supported
+       /// given citation. At this moment only script lyxpaperview.py is supported
        /// (search for pdf or ps based on specific items)
        std::string citation_search_view;
        /// Items to search for in citation_search_view
@@ -318,6 +322,7 @@ public:
        int defaultZoom = 150;
        /// Actual zoom factor for screen fonts
        /// (default zoom plus buffer zoom factor)
+       /// Do not set directly. Use GuiView::setCurrentZoom()
        int currentZoom = 150;
        /// Screen font sizes in points for each font size
        std::string font_sizes[10] = { "5.0", "7.0", "8.0", "9.0", "10.0",
@@ -470,6 +475,8 @@ public:
        std::string user_initials;
        /// icon set name
        std::string icon_set;
+       /// ui style name
+       std::string ui_style = "default";
        /// whether to use the icons from the theme
        bool use_system_theme_icons = false;
        /// True if the TeX engine cannot handle posix paths
@@ -508,9 +515,9 @@ public:
        /// Toggle statusbar in fullscreen mode?
        bool full_screen_statusbar = true;
        /// Limit the text width?
-       bool full_screen_limit = false;
-       /// Width of limited screen (in pixels) in fullscreen mode
-       int full_screen_width = 700;
+       bool screen_limit = false;
+       /// Width of limited screen width 
+       Length screen_width = Length(7, Length::IN); 
        ///
        bool completion_cursor_text = true;
        ///
@@ -563,6 +570,25 @@ public:
        int cursor_width = 0;
        /// One of: yes, no, ask
        std::string close_buffer_with_last_view = "yes";
+       enum BookmarksVisibility {
+               BMK_NONE,
+               BMK_MARGIN,
+               BMK_INLINE
+       };
+
+       ///
+       BookmarksVisibility bookmarks_visibility = BMK_NONE;
+
+       enum DrawStrategy {
+               // draw all (not implemented yet)
+               // FS_FULL,
+               // draw only what has changed
+               DS_PARTIAL,
+               // draw in backing store (only what has changed)
+               DS_BACKINGSTORE
+       };
+       ///
+       DrawStrategy draw_strategy = DS_PARTIAL;
 };