X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.h;h=136814ad809e02d72a737b742161f805bb80760e;hb=5d3718cad2a2ef6a4d6a495054ab0705ba27b6b5;hp=6f4bf989dbc9dc96acaf734fd1a4ce17284c662a;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index 6f4bf989db..136814ad80 100644
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -14,15 +14,17 @@
 #ifndef MENUBACKEND_H
 #define MENUBACKEND_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
+
+#include <boost/shared_ptr.hpp>
+
 #include <vector>
 
+#include "FuncStatus.h"
+
 class LyXLex;
-class Buffer;
+class LyXView;
+class Menu;
 
 ///
 class MenuItem {
@@ -70,10 +72,10 @@ public:
 	MenuItem(Kind kind,
 		 string const & label,
 		 int action,
-		 bool optional = false)
-		: kind_(kind), label_(label),
-		  action_(action), submenu_(), optional_(optional) {}
+		 bool optional = false);
 
+	/// This one is just to please boost::shared_ptr<>
+	~MenuItem();
 	/// The label of a given menuitem
 	string const label() const;
 	/// The keyboard shortcut (usually underlined in the entry)
@@ -84,11 +86,27 @@ public:
 	Kind kind() const { return kind_; }
 	/// the action (if relevant)
 	int action() const { return action_; }
-	/// the description of the  submenu (if relevant)
-	string const & submenu() const { return submenu_; }
 	/// returns true if the entry should be ommited when disabled
 	bool optional() const { return optional_; }
+	/// returns the status of the lfun associated with this entry
+	FuncStatus const & status() const { return status_; }	
+	/// returns the status of the lfun associated with this entry
+	FuncStatus & status() { return status_; }	
+	/// returns the status of the lfun associated with this entry
+	void status(FuncStatus const & status) { status_ = status; }	
+	/// returns the binding associated to this action
+	string const binding() const;
+	/// the description of the  submenu (if relevant)
+	string const & submenuname() const { return submenuname_; }
+	/// set the description of the  submenu
+	void submenuname(string const & name) { submenuname_ = name; }
+	///
+	Menu * submenu() const { return submenu_.get(); }
+	///
+	void submenu(Menu * menu);
+
 private:
+	//friend class MenuBackend;
 	///
 	Kind kind_;
 	///
@@ -96,9 +114,13 @@ private:
 	///
 	int action_;
 	///
-	string submenu_;
+	string submenuname_;
 	///
 	bool optional_;
+	///
+	FuncStatus status_;
+	///
+	boost::shared_ptr<Menu> submenu_;
 };
 
 
@@ -110,20 +132,14 @@ public:
 	///
 	typedef ItemList::const_iterator const_iterator;
 	///
-	explicit Menu(string const & name = string(), bool mb = false)
-		: menubar_(mb), name_(name) {}
+	typedef ItemList::size_type size_type;
 	///
-	Menu & add(MenuItem const &);
+	explicit Menu(string const & name = string())
+		: name_(name) {}
 	///
-	Menu & read(LyXLex &);
-	/// Expands some special entries of the menu
-	/** The entries with the following kind are expanded to a
-	    sequence of Command MenuItems: Lastfiles, Documents,
-	    ViewFormats, ExportFormats, UpdateFormats
-	*/
-	void expand(Menu & tomenu, Buffer *) const;
+	Menu & add(MenuItem const &, LyXView const * view = 0);
 	///
-	bool menubar() const { return menubar_; }
+	Menu & read(LyXLex &);
 	///
 	string const & name() const { return name_; }
 	///
@@ -145,11 +161,10 @@ public:
 	void checkShortcuts() const;
 
 private:
+	friend class MenuBackend;
 	///
 	ItemList items_;
 	///
-	bool menubar_;
-	///
 	string name_;
 };
 
@@ -173,8 +188,17 @@ public:
 	Menu & getMenu (string const &);
 	///
 	Menu const & getMenu (string const &) const;
-	//
+	///
+	Menu const & getMenubar() const;
+	///
 	bool empty() const { return menulist_.empty(); }
+	/// Expands some special entries of the menu
+	/** The entries with the following kind are expanded to a
+	    sequence of Command MenuItems: Lastfiles, Documents,
+	    ViewFormats, ExportFormats, UpdateFormats
+	*/
+	void expand(Menu const & frommenu, Menu & tomenu,
+		    LyXView const *) const;
 	///
 	const_iterator begin() const {
 		return menulist_.begin();
@@ -186,6 +210,8 @@ public:
 private:
 	///
 	MenuList menulist_;
+	///
+	Menu menubar_;
 };
 
 ///