Limit the nopassthurchars case in beamer to URL

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index 6e82a6def98e9db9ba5e6c07225616d60a02f17c..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
@@ -90,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,
@@ -173,6 +174,7 @@ public:
                RC_TEXINPUTS_PREFIX,
                RC_THESAURUSDIRPATH,
                RC_UIFILE,
+               RC_UI_STYLE,
                RC_USELASTFILEPOS,
                RC_USER_EMAIL,
                RC_USER_INITIALS,
@@ -211,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;
@@ -252,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
@@ -473,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
@@ -511,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;
        ///