X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=ad0165acc21ae120ce346a91c1b57d400185b112;hb=2d8eb4b9d466e8293534ef7410737aa9448361c6;hp=d365a0d2803ababe5f342db13f9c976b1fb92df2;hpb=807682efd3d4c7019156ef4a6555b05a7885300c;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index d365a0d280..ad0165acc2 100644
--- 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"
@@ -39,7 +40,6 @@
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
-#include "support/BoostFormat.h"
 #include <boost/function.hpp>
 
 #include <cstdlib>
@@ -78,16 +78,9 @@ namespace {
 
 void showFileError(string const & error)
 {
-#if USE_BOOST_FORMAT
 	Alert::warning(_("Could not read configuration file"),
-		   boost::io::str(boost::format(
-		   _("Error while reading the configuration file\n%1$s.\n"
-		     "Please check your installation.")) % error));
-#else
-	Alert::warning(_("Could not read configuration file"),
-		   string(_("Error while reading the configuration file\n"))
-		   + error + _(".\nPlease check your installation."));
-#endif
+		   bformat(_("Error while reading the configuration file\n%1$s.\n"
+		     "Please check your installation."), error));
 	exit(EXIT_FAILURE);
 }
 
@@ -116,15 +109,8 @@ LyX::LyX(int & argc, char * argv[])
 	// other than documents
 	for (int argi = 1; argi < argc ; ++argi) {
 		if (argv[argi][0] == '-') {
-#if USE_BOOST_FORMAT
-			lyxerr << boost::format(_("Wrong command line option `%1$s'. Exiting."))
-				% argv[argi]
-			       << endl;
-#else
-			lyxerr << _("Wrong command line option `")
-			       << argv[argi] << _("'. Exiting.")
-			       << endl;
-#endif
+			lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."),
+				argv[argi]) << endl;
 			exit(1);
 		}
 	}
@@ -157,14 +143,16 @@ 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);
+			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;
 
@@ -375,16 +363,8 @@ void LyX::init(bool gui)
 					<< "Giving up." << endl;
 				exit(1);
 			}
-#if USE_BOOST_FORMAT
-			lyxerr << boost::format(_("Using built-in default %1$s"
-						  " but expect problems."))
-				% static_cast<char *>(LYX_DIR)
-			       << endl;
-#else
-			lyxerr << _("Using built-in default ") << LYX_DIR
-			       << _(" but expect problems.")
-			       << endl;
-#endif
+			lyxerr << bformat(_("Using built-in default %1$s but expect problems."),
+				LYX_DIR) << endl;
 		} else {
 			lyxerr << _("Expect problems.") << endl;
 		}
@@ -616,29 +596,14 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
 
 	first_start = !explicit_userdir;
 
-#if USE_BOOST_FORMAT
-	lyxerr << boost::format(_("LyX: Creating directory %1$s"
-				  " and running configure..."))
-		% user_lyxdir
-	       << endl;
-#else
-	lyxerr << _("LyX: Creating directory ") << user_lyxdir
-	       << _(" and running configure...")
-	       << endl;
-#endif
+	lyxerr << bformat(_("LyX: Creating directory %1$s"
+				  " and running configure..."), user_lyxdir) << endl;
 
 	if (!createDirectory(user_lyxdir, 0755)) {
 		// Failed, let's use $HOME instead.
 		user_lyxdir = GetEnvPath("HOME");
-#if USE_BOOST_FORMAT
-		lyxerr << boost::format(_("Failed. Will use %1$s instead."))
-			% user_lyxdir
-		       << endl;
-#else
-		lyxerr << _("Failed. Will use ") << user_lyxdir <<
-			_(" instead.")
-		       << endl;
-#endif
+		lyxerr << bformat(_("Failed. Will use %1$s instead."),
+			user_lyxdir) << endl;
 		return;
 	}
 
@@ -673,6 +638,7 @@ void LyX::readUIFile(string const & name)
 	enum Uitags {
 		ui_menuset = 1,
 		ui_toolbar,
+		ui_toolbars,
 		ui_include,
 		ui_last
 	};
@@ -680,7 +646,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)
@@ -735,6 +702,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: "
@@ -788,19 +759,14 @@ int parse_dbg(string const & arg, string const &)
 		Debug::showTags(lyxerr);
 		exit(0);
 	}
-#if USE_BOOST_FORMAT
-	lyxerr << boost::format(_("Setting debug level to %1$s"))
-		% arg
-	       << endl;
-#else
-	lyxerr << _("Setting debug level to ") << arg << endl;
-#endif
+	lyxerr << bformat(_("Setting debug level to %1$s"), arg) << endl;
 
 	lyxerr.level(Debug::value(arg));
 	Debug::showLevel(lyxerr, lyxerr.level());
 	return 1;
 }
 
+
 int parse_help(string const &, string const &)
 {
 	lyxerr <<