X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.h;h=7d9fc9f6b914729081bd8c95f033a996287efb0a;hb=cd4033aef3a3f1efdb5a676b8bab3d367f53a830;hp=946cf0fb91c0bcddc5b204eb0250a66cb52a04fe;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 946cf0fb91..7d9fc9f6b9 100644
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,13 +13,17 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
+#include "funcrequest.h"
+
 #include <vector>
-#include <algorithm>
 
-#include "LString.h"
+
+namespace lyx {
+
 
 class LyXLex;
 
+
 ///
 class ToolbarBackend {
 public:
@@ -34,10 +38,10 @@ public:
 	};
 
 	/// action, tooltip
-	typedef std::pair<int, string> Item;
+	typedef std::pair<FuncRequest, docstring> Item;
 
 	/// the toolbar items
-	typedef std::vector<std::pair<int, string> > Items;
+	typedef std::vector<Item> Items;
 
 	/// toolbar flags
 	enum Flags {
@@ -48,13 +52,17 @@ public:
 		TOP = 16, //< show at top
 		BOTTOM = 32, //< show at bottom
 		LEFT = 64, //< show at left
-		RIGHT = 128 //< show at right
+		RIGHT = 128, //< show at right
+		REVIEW = 256, //< shown when change tracking is enabled
+		AUTO = 512  //< only if AUTO is set, will MATH, TABLE and REIVEW is used
 	};
 
 	/// a toolbar
 	struct Toolbar {
-		/// toolbar UI name
-		string name;
+		/// toolbar name
+		std::string name;
+		/// toolbar GUI name
+		std::string gui_name;
 		/// toolbar contents
 		Items items;
 		/// flags
@@ -68,13 +76,13 @@ public:
 	ToolbarBackend();
 
 	/// iterator for all toolbars
-	Toolbars::const_iterator begin() const {
-		return usedtoolbars.begin();
-	}
+	Toolbars::const_iterator begin() const { return usedtoolbars.begin(); }
+
+	Toolbars::const_iterator end() const { return usedtoolbars.end(); }
 
-	Toolbars::const_iterator end() const {
-		return usedtoolbars.end();
-	}
+	Toolbars::iterator begin() { return usedtoolbars.begin(); }
+
+	Toolbars::iterator end() { return usedtoolbars.end(); }
 
 	/// read a toolbar from the file
 	void read(LyXLex &);
@@ -83,14 +91,12 @@ public:
 	void readToolbars(LyXLex &);
 
 	/// return a full path of an XPM for the given action
-	static string const getIcon(int action);
+	static std::string const getIcon(FuncRequest const &);
 
 private:
 	/// add the given lfun with tooltip if relevant
-	void add(Toolbar & tb, int, string const & tooltip = string());
-
-	/// add the given lfun with tooltip if relevant
-	void add(Toolbar & tb, string const &, string const & tooltip);
+	void add(Toolbar & tb, FuncRequest const &,
+		 docstring const & tooltip = docstring());
 
 	/// all the toolbars
 	Toolbars toolbars;
@@ -103,4 +109,7 @@ private:
 extern ToolbarBackend toolbarbackend;
 
 
+
+} // namespace lyx
+
 #endif // TOOLBAR_BACKEND_H