- moderncv.layout: add missing separator style

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 145ac93d246eb66db299c5cfaf92d25cfe243766..fa86a02fd16bbbd9a007e022f2439c3133c6afd2 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,7 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 4; // vfr: remove default paper size
+static unsigned int const LYXRC_FILEFORMAT = 6; // younes: add use_qimage option
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -78,6 +78,7 @@ LexerKeyword lyxrcTags[] = {
        { "\\completion_inline_dots", LyXRC::RC_COMPLETION_INLINE_DOTS },
        { "\\completion_inline_math", LyXRC::RC_COMPLETION_INLINE_MATH },
        { "\\completion_inline_text", LyXRC::RC_COMPLETION_INLINE_TEXT },
+       { "\\completion_minlength", LyXRC::RC_COMPLETION_MINLENGTH },
        { "\\completion_popup_after_complete", LyXRC::RC_COMPLETION_POPUP_AFTER_COMPLETE },
        { "\\completion_popup_delay", LyXRC::RC_COMPLETION_POPUP_DELAY },
        { "\\completion_popup_math", LyXRC::RC_COMPLETION_POPUP_MATH },
@@ -91,6 +92,7 @@ LexerKeyword lyxrcTags[] = {
        { "\\def_file", LyXRC::RC_DEFFILE },
        { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT },
        { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
+       { "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT },
        { "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT },
        { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
        { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
@@ -198,6 +200,7 @@ LexerKeyword lyxrcTags[] = {
        { "\\use_converter_cache", LyXRC::RC_USE_CONVERTER_CACHE },
        { "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS },
        { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE },
+       { "\\use_qimage", LyXRC::RC_USE_QIMAGE },
        // compatibility with versions older than 1.4.0 only
        { "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS },
        { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP },
@@ -300,6 +303,7 @@ void LyXRC::setDefaults()
 #endif
        spellchecker_accept_compound = false;
        spellcheck_continuously = false;
+       completion_minlength = 6;
        spellcheck_notes = true;
        use_kbmap = false;
        rtl_support = true;
@@ -336,6 +340,7 @@ void LyXRC::setDefaults()
        use_system_colors = false;
        use_tooltip = true;
        use_pixmap_cache = false;
+       use_qimage = true;
        converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months
        user_name = to_utf8(support::user_name());
        user_email = to_utf8(support::user_email());
@@ -365,6 +370,7 @@ void LyXRC::setDefaults()
        completion_inline_dots = -1;
        completion_inline_delay = 0.2;
        default_decimal_point = ".";
+       default_length_unit = Length::CM;
        cursor_width = 1;
 }
 
@@ -811,6 +817,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                        lexrc >> completion_popup_after_complete;
                        break;
 
+               case RC_COMPLETION_MINLENGTH:
+                       lexrc >> completion_minlength;
+                       break;
+
                case RC_NUMLASTFILES:
                        lexrc >> num_lastfiles;
                        break;
@@ -949,6 +959,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                case RC_USE_PIXMAP_CACHE:
                        lexrc >> use_pixmap_cache;
                        break;
+               case RC_USE_QIMAGE:
+                       lexrc >> use_qimage;
+                       break;
                case RC_SPELLCHECKER:
                        lexrc >> spellchecker;
                        break;
@@ -979,6 +992,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
                case RC_DEFAULT_DECIMAL_POINT:
                        lexrc >> default_decimal_point;
                        break;
+               case RC_DEFAULT_LENGTH_UNIT:
+                       if (lexrc.next())
+                               default_length_unit = (Length::UNIT) lexrc.getInteger();
+                       break;
                case RC_DATE_INSERT_FORMAT:
                        lexrc >> date_insert_format;
                        break;
@@ -2290,7 +2307,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
-       case RC_NUMLASTFILES:
+       case RC_COMPLETION_MINLENGTH:
+               if (ignore_system_lyxrc ||
+                       completion_minlength != system_lyxrc.completion_minlength) {
+                       os << "\\completion_minlength " << convert<string>(completion_minlength)
+                       << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+                       
+               case RC_NUMLASTFILES:
                if (ignore_system_lyxrc ||
                    num_lastfiles != system_lyxrc.num_lastfiles) {
                        os << "\\num_lastfiles " << num_lastfiles << '\n';
@@ -2433,6 +2459,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_USE_QIMAGE:
+               if (ignore_system_lyxrc ||
+                   use_qimage != system_lyxrc.use_qimage) {
+                       os << "\\use_qimage "
+                          << convert<string>(use_qimage)
+                          << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
 
                os << "\n#\n"
                   << "# LANGUAGE SUPPORT SECTION ##########################\n"
@@ -2448,6 +2483,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                if (tag != RC_LAST)
                        break;
 
+       case RC_DEFAULT_LENGTH_UNIT:
+               if (ignore_system_lyxrc ||
+                   default_length_unit != system_lyxrc.default_length_unit) {
+                       os << "\\default_length_unit " << int(default_length_unit) << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
+
        case RC_SPELLCHECKER:
                if (ignore_system_lyxrc ||
                    spellchecker != system_lyxrc.spellchecker) {
@@ -2859,6 +2902,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_COMPLETION_POPUP_DELAY:
        case LyXRC::RC_COMPLETION_POPUP_MATH:
        case LyXRC::RC_COMPLETION_POPUP_TEXT:
+       case LyXRC::RC_COMPLETION_MINLENGTH:
        case LyXRC::RC_USELASTFILEPOS:
        case LyXRC::RC_LOADSESSION:
        case LyXRC::RC_CHKTEX_COMMAND:
@@ -2979,6 +3023,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_USE_SYSTEM_COLORS:
        case LyXRC::RC_USE_TOOLTIP:
        case LyXRC::RC_USE_PIXMAP_CACHE:
+       case LyXRC::RC_USE_QIMAGE:
        case LyXRC::RC_VIEWDVI_PAPEROPTION:
        case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON:
        case LyXRC::RC_SINGLE_INSTANCE:
@@ -2996,6 +3041,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_FORWARD_SEARCH_PDF:
        case LyXRC::RC_EXPORT_OVERWRITE:
        case LyXRC::RC_DEFAULT_DECIMAL_POINT:
+       case LyXRC::RC_DEFAULT_LENGTH_UNIT:
        case LyXRC::RC_SCROLL_WHEEL_ZOOM:
        case LyXRC::RC_CURSOR_WIDTH:
                break;