X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FToolbars.cpp;h=b03b110d13e56ae8bbd1d271824d28770a15b645;hb=5a46224f7311067cda747e0cae32d22dd919f179;hp=bd1c9af7639f41c9e2d6ad4888501ebec59edc07;hpb=e032cd934d7d94aa37d7951411660dc32a4b9f0e;p=lyx.git

diff --git a/src/frontends/qt4/Toolbars.cpp b/src/frontends/qt4/Toolbars.cpp
index bd1c9af763..b03b110d13 100644
--- a/src/frontends/qt4/Toolbars.cpp
+++ b/src/frontends/qt4/Toolbars.cpp
@@ -23,7 +23,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 
 #include <algorithm>
 
@@ -55,7 +55,7 @@ ToolbarItem::ToolbarItem(Type type, string const & name, docstring const & label
 void ToolbarInfo::add(ToolbarItem const & item)
 {
 	items.push_back(item);
-	items.back().func_.origin = FuncRequest::TOOLBAR;
+	items.back().func_.setOrigin(FuncRequest::TOOLBAR);
 }
 
 
@@ -154,7 +154,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 				add(ToolbarItem(ToolbarItem::POPUPMENU, name, label));
 			}
 			break;
-		
+
 		case TO_STICKYPOPUPMENU:
 			if (lex.next(true)) {
 				string const name = lex.getString();
@@ -210,7 +210,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 				docstring const prettyname =
 					from_utf8((*fit)->prettyname());
 				docstring tooltip;
-				FuncCode lfun;
+				FuncCode lfun = LFUN_NOACTION;
 				switch (code) {
 				case TO_EXPORTFORMATS:
 					lfun = LFUN_BUFFER_EXPORT;
@@ -218,7 +218,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 					break;
 				case TO_IMPORTFORMATS:
 					lfun = LFUN_BUFFER_IMPORT;
-					tooltip = _("Import %1$s ...");
+					tooltip = _("Import %1$s");
 					break;
 				case TO_UPDATEFORMATS:
 					lfun = LFUN_BUFFER_UPDATE;
@@ -358,6 +358,8 @@ void Toolbars::readToolbarSettings(Lexer & lex)
 				flag = RIGHT;
 			else if (!compare_ascii_no_case(*cit, "auto"))
 				flag = AUTO;
+			else if (!compare_ascii_no_case(*cit, "samerow"))
+				flag = SAMEROW;
 			else {
 				LYXERR(Debug::ANY,
 					"Toolbars::readToolbarSettings: unrecognised token:`"