Tooltips for collapsables and branches

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 96e0dac284e635b774ffcecaaab1857b0c6546bc..6705b08aed09eeed27cb8690433e0615065c0602 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -95,8 +95,10 @@ keyword_item lyxrcTags[] = {
        { "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
        { "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
        { "\\load_session", LyXRC::RC_LOADSESSION },
+       { "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
        { "\\make_backup", LyXRC::RC_MAKE_BACKUP },
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
+       { "\\mouse_wheel_speed", LyXRC::RC_MOUSE_WHEEL_SPEED },
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
        { "\\path_prefix", LyXRC::RC_PATH_PREFIX },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
@@ -137,7 +139,6 @@ keyword_item lyxrcTags[] = {
        { "\\serverpipe", LyXRC::RC_SERVERPIPE },
        { "\\set_color", LyXRC::RC_SET_COLOR },
        { "\\show_banner", LyXRC::RC_SHOW_BANNER },
-       { "\\show_macro_label", LyXRC::RC_SHOW_MACRO_LABEL },
        { "\\sort_layouts", LyXRC::RC_SORT_LAYOUTS },
        { "\\spell_command", LyXRC::RC_SPELL_COMMAND },
        { "\\tempdir_path", LyXRC::RC_TEMPDIRPATH },
@@ -162,7 +163,8 @@ keyword_item lyxrcTags[] = {
        { "\\user_name", LyXRC::RC_USER_NAME },
        { "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION },
        // compatibility with versions older than 1.4.0 only
-       { "\\viewer", LyXRC::RC_VIEWER}
+       { "\\viewer", LyXRC::RC_VIEWER},
+       { "\\visual_cursor" ,LyXRC::RC_VISUAL_CURSOR}
 };
 
 const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
@@ -228,6 +230,7 @@ void LyXRC::setDefaults() {
        auto_region_delete = true;
        auto_reset_options = false;
        plaintext_linelen = 65;
+       mouse_wheel_speed = 1.0;
        num_lastfiles = maxlastfiles;
        check_lastfiles = true;
        use_lastfilepos = true;
@@ -245,6 +248,7 @@ void LyXRC::setDefaults() {
        isp_use_esc_chars = false;
        use_kbmap = false;
        rtl_support = true;
+       visual_cursor = false;
        auto_number = true;
        mark_foreign_language = true;
        language_auto_begin = true;
@@ -261,7 +265,7 @@ void LyXRC::setDefaults() {
        tex_allows_spaces = false;
        date_insert_format = "%x";
        cursor_follows_scrollbar = false;
-       show_macro_label = true;
+       macro_edit_style = MACRO_EDIT_INLINE_BOX;
        dialogs_iconify_with_main = false;
        label_init_length = 3;
        preview = PREVIEW_OFF;
@@ -734,6 +738,12 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
+               case RC_MOUSE_WHEEL_SPEED:
+                       if (lexrc.next()) {
+                               mouse_wheel_speed = lexrc.getFloat();
+                       }
+                       break;
+
                case RC_NUMLASTFILES:
                        if (lexrc.next()) {
                                num_lastfiles = lexrc.getInteger();
@@ -839,9 +849,13 @@ int LyXRC::read(Lexer & lexrc)
                        }
                        break;
 
-               case RC_SHOW_MACRO_LABEL:
+               case RC_MACRO_EDIT_STYLE:
                        if (lexrc.next()) {
-                               show_macro_label = lexrc.getBool();
+                               switch (lexrc.getInteger()) {
+                               case 0: macro_edit_style = MACRO_EDIT_INLINE_BOX; break;
+                               case 1: macro_edit_style = MACRO_EDIT_INLINE; break;
+                               case 2: macro_edit_style = MACRO_EDIT_LIST; break;
+                               }
                        }
                        break;
 
@@ -983,6 +997,11 @@ int LyXRC::read(Lexer & lexrc)
                                rtl_support = lexrc.getBool();
                        }
                        break;
+               case RC_VISUAL_CURSOR:
+                       if (lexrc.next()) {
+                               visual_cursor = lexrc.getBool();
+                       }
+                       break;
                case RC_AUTO_NUMBER:
                        if (lexrc.next()) {
                                auto_number = lexrc.getBool();
@@ -1582,12 +1601,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
-       case RC_SHOW_MACRO_LABEL:
+       case RC_MACRO_EDIT_STYLE:
                if (ignore_system_lyxrc ||
-                   show_macro_label
-                   != system_lyxrc.show_macro_label) {
-                       os << "\\show_macro_label "
-                          << convert<string>(show_macro_label) << '\n';
+                   macro_edit_style
+                   != system_lyxrc.macro_edit_style) {
+                       os << "\\macro_edit_style ";
+                       switch (macro_edit_style) {
+                       case MACRO_EDIT_INLINE_BOX: os << "0\n"; break;
+                       case MACRO_EDIT_INLINE: os << "1\n"; break;
+                       case MACRO_EDIT_LIST: os << "2\n"; break;
+                       }
                }
                if (tag != RC_LAST)
                        break;
@@ -1934,6 +1957,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_MOUSE_WHEEL_SPEED:
+               if (ignore_system_lyxrc ||
+                   mouse_wheel_speed != system_lyxrc.mouse_wheel_speed) {
+                       os << "\\mouse_wheel_speed " << mouse_wheel_speed << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_NUMLASTFILES:
                if (ignore_system_lyxrc ||
                    num_lastfiles != system_lyxrc.num_lastfiles) {
@@ -2121,6 +2151,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_VISUAL_CURSOR:
+               if (ignore_system_lyxrc ||
+                       visual_cursor != system_lyxrc.visual_cursor) {
+                       os << "\\visual_cursor " << convert<string>(visual_cursor) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
        case RC_LANGUAGE_PACKAGE:
                if (ignore_system_lyxrc ||
                    language_package != system_lyxrc.language_package) {
@@ -2522,6 +2559,11 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Select to control the highlighting of words with a language foreign to that of the document.");
                break;
 
+       case RC_MOUSE_WHEEL_SPEED:
+               str = bformat(_("The scrolling speed of the mouse wheel. "),
+                     maxlastfiles);
+               break;
+
        case RC_NUMLASTFILES:
                str = bformat(_("Maximal number of lastfiles. Up to %1$d can appear in the file menu."),
                        maxlastfiles);
@@ -2626,6 +2668,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
                break;
 
+       case RC_VISUAL_CURSOR:
+               str = _("Select to have visual bidi cursor movement, unselect for logical movement.");
+               break;
+
        case RC_SCREEN_DPI:
                str = _("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
                break;