X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.cpp;h=a406cb48ab25691453095343bb5f001bdf0874a6;hb=6c977615633e5e132494b9a7fa778588210f9c95;hp=8dd1df50cf1e061e0a38f5a6c45cc715f44e3b76;hpb=150cf11651ad92090a452bb9e6cb72d7eea886d5;p=lyx.git

diff --git a/src/ToolbarBackend.cpp b/src/ToolbarBackend.cpp
index 8dd1df50cf..a406cb48ab 100644
--- a/src/ToolbarBackend.cpp
+++ b/src/ToolbarBackend.cpp
@@ -14,24 +14,20 @@
 #include "ToolbarBackend.h"
 #include "FuncRequest.h"
 #include "Lexer.h"
-#include "debug.h"
-#include "gettext.h"
 #include "LyXAction.h"
 #include "support/lstrings.h"
 
-#include <boost/bind.hpp>
-#include <algorithm>
+#include "support/debug.h"
+#include "support/gettext.h"
 
-namespace lyx {
+#include <boost/bind.hpp>
 
-using support::compare_ascii_no_case;
-using support::getVectorFromString;
+#include <algorithm>
 
-using std::make_pair;
-using std::string;
-using std::vector;
-using std::find_if;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 namespace {
 
@@ -145,12 +141,12 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 
 		case TO_MINIBUFFER:
 			add(ToolbarItem(ToolbarItem::MINIBUFFER,
-				FuncRequest(kb_action(ToolbarItem::MINIBUFFER))));
+				FuncRequest(FuncCode(ToolbarItem::MINIBUFFER))));
 			break;
 
 		case TO_SEPARATOR:
 			add(ToolbarItem(ToolbarItem::SEPARATOR,
-				FuncRequest(kb_action(ToolbarItem::SEPARATOR))));
+				FuncRequest(FuncCode(ToolbarItem::SEPARATOR))));
 			break;
 
 		case TO_POPUPMENU:
@@ -173,14 +169,14 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 
 		case TO_LAYOUTS:
 			add(ToolbarItem(ToolbarItem::LAYOUTS,
-				FuncRequest(kb_action(ToolbarItem::LAYOUTS))));
+				FuncRequest(FuncCode(ToolbarItem::LAYOUTS))));
 			break;
 
 		case TO_TABLEINSERT:
 			if (lex.next(true)) {
 				docstring const tooltip = lex.getDocString();
 				add(ToolbarItem(ToolbarItem::TABLEINSERT,
-					FuncRequest(kb_action(ToolbarItem::TABLEINSERT)), tooltip));
+					FuncRequest(FuncCode(ToolbarItem::TABLEINSERT)), tooltip));
 			}
 			break;
 
@@ -204,6 +200,7 @@ ToolbarInfo & ToolbarInfo::read(Lexer & lex)
 
 ToolbarBackend::ToolbarBackend()
 {
+	fullScreenWindows = 0;
 }
 
 
@@ -301,6 +298,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
 				flag = ToolbarInfo::MATH;
 			else if (!compare_ascii_no_case(*cit, "table"))
 				flag = ToolbarInfo::TABLE;
+			else if (!compare_ascii_no_case(*cit, "mathmacrotemplate"))
+				flag = ToolbarInfo::MATHMACROTEMPLATE;
 			else if (!compare_ascii_no_case(*cit, "review"))
 				flag = ToolbarInfo::REVIEW;
 			else if (!compare_ascii_no_case(*cit, "top"))
@@ -311,6 +310,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
 				flag = ToolbarInfo::LEFT;
 			else if (!compare_ascii_no_case(*cit, "right"))
 				flag = ToolbarInfo::RIGHT;
+			else if (!compare_ascii_no_case(*cit, "auto"))
+				flag = ToolbarInfo::AUTO;
 			else {
 				LYXERR(Debug::ANY,
 					"ToolbarBackend::readToolbarSettings: unrecognised token:`"