added a parseError signal to Buffer and use it

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 5f1a44cfc0f579203689423e99ab253327b117b1..dee88dd305b48c049a4f4c923c2c37de9ce8482c 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -24,6 +24,7 @@
 
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxserver.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
@@ -40,9 +41,12 @@
 #include "frontends/lyx_gui.h"
 
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/signals/signal1.hpp>
 
 #include <cstdlib>
 #include <csignal>
+#include <iostream>
 
 using std::vector;
 using std::endl;
@@ -142,14 +146,17 @@ LyX::LyX(int & argc, char * argv[])
                vector<string>::iterator it = files.begin();
                vector<string>::iterator end = files.end();
                for (; it != end; ++it) {
-                       last_loaded = bufferlist.loadLyXFile(*it);
+                       last_loaded = bufferlist.newBuffer(*it, false);
+                       last_loaded->parseError.connect(boost::bind(&LyX::printError, this, _1));
+                       loadLyXFile(last_loaded, *it);
                }
 
                files.clear();
 
                // no buffer loaded, create one
+               string const tmpfile = "tmpfile";
                if (!last_loaded)
-                       last_loaded = bufferlist.newFile("tmpfile", string());
+                       last_loaded = newFile(tmpfile, string());
 
                bool success = false;
 
@@ -212,6 +219,14 @@ static void error_handler(int err_sig)
 }
 
 
+void LyX::printError(ErrorItem const & ei)
+{
+       std::cerr << _("LyX: ") << ei.error 
+                 << ':' << ei.description << std::endl;
+
+}
+
+
 void LyX::init(bool gui)
 {
        signal(SIGHUP, error_handler);
@@ -635,6 +650,7 @@ void LyX::readUIFile(string const & name)
        enum Uitags {
                ui_menuset = 1,
                ui_toolbar,
+               ui_toolbars,
                ui_include,
                ui_last
        };
@@ -642,7 +658,8 @@ void LyX::readUIFile(string const & name)
        struct keyword_item uitags[ui_last - 1] = {
                { "include", ui_include },
                { "menuset", ui_menuset },
-               { "toolbar", ui_toolbar }
+               { "toolbar", ui_toolbar },
+               { "toolbars", ui_toolbars }
        };
 
        // Ensure that a file is read only once (prevents include loops)
@@ -697,6 +714,10 @@ void LyX::readUIFile(string const & name)
                        toolbarbackend.read(lex);
                        break;
 
+               case ui_toolbars:
+                       toolbarbackend.readToolbars(lex);
+                       break;
+
                default:
                        if (!rtrim(lex.getString()).empty())
                                lex.printError("LyX::ReadUIFile: "