GuiBox.cpp: fix #6721

[lyx.git] / src / LyXRC.cpp

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 3b363fd3f764abb2617227f10890fac7dc596fa8..a717a6b84e5158ecb49d51059123b0b0ab28fc7c 100644 (file)
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -23,6 +23,7 @@
 #include "FontEnums.h"
 #include "Format.h"
 #include "Lexer.h"
+#include "LyX.h"
 #include "Mover.h"
 #include "Session.h"
 #include "version.h"
@@ -92,8 +93,11 @@ LexerKeyword lyxrcTags[] = {
        { "\\editor_alternatives", LyXRC::RC_EDITOR_ALTERNATIVES },
        { "\\escape_chars", LyXRC::RC_ESC_CHARS },
        { "\\example_path", LyXRC::RC_EXAMPLEPATH },
+       { "\\export_overwrite", LyXRC::RC_EXPORT_OVERWRITE },
        { "\\font_encoding", LyXRC::RC_FONT_ENCODING },
        { "\\format", LyXRC::RC_FORMAT },
+       { "\\forward_search_dvi", LyXRC::RC_FORWARD_SEARCH_DVI },
+       { "\\forward_search_pdf", LyXRC::RC_FORWARD_SEARCH_PDF },
        { "\\fullscreen_limit", LyXRC::RC_FULL_SCREEN_LIMIT },
        { "\\fullscreen_menubar", LyXRC::RC_FULL_SCREEN_MENUBAR },
        { "\\fullscreen_scrollbar", LyXRC::RC_FULL_SCREEN_SCROLLBAR },
@@ -326,6 +330,9 @@ void LyXRC::setDefaults()
        user_email = to_utf8(support::user_email());
        open_buffers_in_tabs = true;
        single_close_tab_button = false;
+       forward_search_dvi = string();
+       forward_search_pdf = string();
+       export_overwrite = NO_FILES;
 
        // Fullscreen settings
        full_screen_limit = false;
@@ -426,7 +433,7 @@ int LyXRC::read(Lexer & lexrc)
                                                      lexrc.getString());
                                if (read(tmp)) {
                                        lexrc.printError("Error reading "
-                                                        "included file: " + tmp.absFilename());
+                                                        "included file: " + tmp.absFileName());
                                }
                        }
                        break;
@@ -1156,6 +1163,29 @@ int LyXRC::read(Lexer & lexrc)
                case RC_SINGLE_CLOSE_TAB_BUTTON:
                        lexrc >> single_close_tab_button;
                        break;
+               case RC_FORWARD_SEARCH_DVI:
+                       if (lexrc.next(true)) 
+                               forward_search_dvi = lexrc.getString();
+                       break;
+               case RC_FORWARD_SEARCH_PDF:
+                       if (lexrc.next(true)) 
+                               forward_search_pdf = lexrc.getString();
+                       break;
+               case RC_EXPORT_OVERWRITE:
+                       if (lexrc.next()) {
+                               string const tmp = lexrc.getString();
+                               if (tmp == "all" || tmp == "true")
+                                       export_overwrite = ALL_FILES;
+                               else if (tmp == "main")
+                                       export_overwrite = MAIN_FILE;
+                               else {
+                                       export_overwrite = NO_FILES;
+                                       if (tmp != "ask" && tmp != "false")
+                                               LYXERR0("Unrecognized export_overwrite status \""
+                                                      << tmp << '"');
+                               }
+                       }
+                       break;
 
                // Obsoteted in 1.4.0
                case RC_USETEMPDIR:
@@ -1388,8 +1418,23 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                        case PAPER_B5:
                                os << "b5"; break;
                        case PAPER_CUSTOM:
+                       case PAPER_A0:
+                       case PAPER_A1:
+                       case PAPER_A2:
+                       case PAPER_A6:
+                       case PAPER_B0:
+                       case PAPER_B1:
+                       case PAPER_B2:
                        case PAPER_B3:
-                       case PAPER_B4: break;
+                       case PAPER_B4:
+                       case PAPER_B6:
+                       case PAPER_JISB0:
+                       case PAPER_JISB1:
+                       case PAPER_JISB2:
+                       case PAPER_JISB3:
+                       case PAPER_JISB4:
+                       case PAPER_JISB5:
+                       case PAPER_JISB6: break;
                        }
                        os << "\"\n";
                }
@@ -1840,6 +1885,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                           << convert<string>(open_buffers_in_tabs)
                           << '\n';
                }
+               if (tag != RC_LAST)
+                       break;
        case RC_SINGLE_CLOSE_TAB_BUTTON:
                if (ignore_system_lyxrc ||
                    single_close_tab_button != system_lyxrc.single_close_tab_button) {
@@ -1849,6 +1896,20 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_FORWARD_SEARCH_DVI:
+               if (ignore_system_lyxrc ||
+                   forward_search_dvi != system_lyxrc.forward_search_dvi) {
+                       os << "\\forward_search_dvi \"" << escapeCommand(forward_search_dvi) << "\"\n";
+               }
+               if (tag != RC_LAST)
+                       break;
+       case RC_FORWARD_SEARCH_PDF:
+               if (ignore_system_lyxrc ||
+                   forward_search_pdf != system_lyxrc.forward_search_pdf) {
+                       os << "\\forward_search_pdf \"" << escapeCommand(forward_search_pdf) << "\"\n";
+               }
+               if (tag != RC_LAST)
+                       break;
 
        os << "\n#\n"
                        << "# COLOR SECTION ###################################\n"
@@ -2466,6 +2527,25 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
                }
                if (tag != RC_LAST)
                        break;
+       case RC_EXPORT_OVERWRITE:
+               if (ignore_system_lyxrc ||
+                   export_overwrite != system_lyxrc.export_overwrite) {
+                       string status;
+                       switch (export_overwrite) {
+                       case NO_FILES:
+                               status = "ask";
+                               break;
+                       case MAIN_FILE:
+                               status = "main";
+                               break;
+                       case ALL_FILES:
+                               status = "all";
+                               break;
+                       }
+                       os << "\\export_overwrite " << status << '\n';
+               }
+               if (tag != RC_LAST)
+                       break;
 
                os << "\n#\n"
                   << "# FORMATS SECTION ##########################\n"
@@ -2801,6 +2881,9 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_VISUAL_CURSOR:
        case LyXRC::RC_VIEWER:
        case LyXRC::RC_VIEWER_ALTERNATIVES:
+       case LyXRC::RC_FORWARD_SEARCH_DVI:
+       case LyXRC::RC_FORWARD_SEARCH_PDF:
+       case LyXRC::RC_EXPORT_OVERWRITE:
        case LyXRC::RC_LAST:
                break;
        }