Change string

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 7eed1d7f8a28bddadbc612d49c686c92d9c57e6a..92c95b0d1e5736981178ae0947990edd840e507f 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -63,6 +63,7 @@ keyword_item lyxrcTags[] = {
        { "\\bind_file", LyXRC::RC_BINDFILE },
        { "\\check_lastfiles", LyXRC::RC_CHECKLASTFILES },
        { "\\chktex_command", LyXRC::RC_CHKTEX_COMMAND },
+       { "\\completion_cursor_text", LyXRC::RC_COMPLETION_CURSOR_TEXT },
        { "\\completion_inline_delay", LyXRC::RC_COMPLETION_INLINE_DELAY },
        { "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS },
        { "\\completion_inline_math", LyXRC::RC_COMPLETION_INLINE_MATH },
@@ -114,6 +115,7 @@ keyword_item lyxrcTags[] = {
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
        { "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
+       { "\\open_buffers_in_tabs", LyXRC::RC_OPEN_BUFFERS_IN_TABS },
        { "\\path_prefix", LyXRC::RC_PATH_PREFIX },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
        { "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
@@ -153,7 +155,6 @@ keyword_item lyxrcTags[] = {
        { "\\serverpipe", LyXRC::RC_SERVERPIPE },
        { "\\set_color", LyXRC::RC_SET_COLOR },
        { "\\show_banner", LyXRC::RC_SHOW_BANNER },
-       { "\\single_window", LyXRC::RC_SINGLE_WINDOW },
        { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
        { "\\spell_command", LyXRC::RC_SPELL_COMMAND },
        { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
@@ -162,6 +163,7 @@ keyword_item lyxrcTags[] = {
        { "\\tex_expects_windows_paths", LyXRC::RC_TEX_EXPECTS_WINDOWS_PATHS },
        { "\\ui_file", LyXRC::RC_UIFILE },
        { "\\use_alt_language", LyXRC::RC_USE_ALT_LANG },
+       { "\\use_bundled_format", LyXRC::RC_USE_BUNDLED_FORMAT },
        { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
        { "\\use_escape_chars", LyXRC::RC_USE_ESC_CHARS },
        { "\\use_input_encoding", LyXRC::RC_USE_INP_ENC },
@@ -294,10 +296,11 @@ void LyXRC::setDefaults() {
        user_name = to_utf8(support::user_name());
        user_email = to_utf8(support::user_email());
 #ifdef __APPLE_CC__
-       single_window = false;
+       open_buffers_in_tabs = false;
 #else
-       single_window = true;
+       open_buffers_in_tabs = true;
 #endif
+       use_bundled_format = false;
 
        // Fullscreen settings
        full_screen_limit = false;
@@ -306,6 +309,7 @@ void LyXRC::setDefaults() {
        full_screen_scrollbar = true;
        full_screen_width = 700;
 
+       completion_cursor_text = true;
        completion_popup_math = true;
        completion_popup_text = false;
        completion_popup_delay = 2.0;
@@ -821,6 +825,12 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
+               case RC_COMPLETION_CURSOR_TEXT:
+                       if (lexrc.next()) {
+                               completion_cursor_text = lexrc.getBool();
+                       }
+                       break;
+
                case RC_COMPLETION_POPUP_AFTER_COMPLETE:
                        if (lexrc.next()) {
                                completion_popup_after_complete = lexrc.getBool();
@@ -1302,9 +1312,13 @@ int LyXRC::read(Lexer & lexrc)
                        if (lexrc.next())
                                full_screen_width = lexrc.getInteger();
                        break;
-               case RC_SINGLE_WINDOW:
+               case RC_OPEN_BUFFERS_IN_TABS:
                        if (lexrc.next())
-                               single_window = lexrc.getBool();
+                               open_buffers_in_tabs = lexrc.getBool();
+                               break;
+               case RC_USE_BUNDLED_FORMAT:
+                       if (lexrc.next())
+                               use_bundled_format = lexrc.getBool();
                                break;
 
                case RC_LAST: break; // this is just a dummy
@@ -1884,11 +1898,20 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
-       case RC_SINGLE_WINDOW:
+       case RC_OPEN_BUFFERS_IN_TABS:
+               if (ignore_system_lyxrc ||
+                   open_buffers_in_tabs != system_lyxrc.open_buffers_in_tabs) {
+                       os << "\\open_buffers_in_tabs "
+                          << convert<string>(open_buffers_in_tabs)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_USE_BUNDLED_FORMAT:
                if (ignore_system_lyxrc ||
-                   single_window != system_lyxrc.single_window) {
-                       os << "\\single_window "
-                          << convert<string>(single_window)
+                   use_bundled_format != system_lyxrc.use_bundled_format) {
+                       os << "\\use_bundled_format "
+                          << convert<string>(use_bundled_format)
                           << '\n';
                }
                if (tag != RC_LAST)
@@ -2191,6 +2214,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_COMPLETION_CURSOR_TEXT:
+               if (ignore_system_lyxrc ||
+                   completion_cursor_text != system_lyxrc.completion_cursor_text) {
+                       os << "\\completion_cursor_text "
+                          << convert<string>(completion_cursor_text) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_COMPLETION_POPUP_AFTER_COMPLETE:
                if (ignore_system_lyxrc ||
                    completion_popup_after_complete
@@ -2816,6 +2847,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Show the completion popup without delay after non-unique completion attempt.");
                break;
 
+       case RC_COMPLETION_POPUP_TEXT:
+               str = _("Show a small triangle on the cursor to indicate that a completion is available.");
+               break;
+
        case RC_COMPLETION_POPUP_DELAY:
                str = _("The inline completion delay.");
                break;