Indentation change + small #ifndef NEW_INSETS fix.

[lyx.git] / src / MenuBackend.h

diff --git a/src/MenuBackend.h b/src/MenuBackend.h
index c5621a3c39f4215ee2fb8c80ae78685422ce3546..d21df334087a878af2a4765ccdf57a80ce3cd03d 100644 (file)
--- a/src/MenuBackend.h
+++ b/src/MenuBackend.h
@@ -23,6 +23,7 @@
 #include <vector>
 
 class LyXLex;
+class Buffer;
 
 ///
 class MenuItem {
@@ -41,25 +42,39 @@ public:
                /** This is the list of opened Documents,
                    typically for the Documents menu. */
                Documents,
+               ///
+               Toc,
                /** This is a list of viewable formats
-                   typically for the Documents menu. */
+                   typically for the File->View menu. */
                ViewFormats,
                /** This is a list of updatable formats
-                   typically for the Documents menu. */
+                   typically for the File->Update menu. */
                UpdateFormats,
                /** This is a list of exportable formats
-                   typically for the Documents menu. */
-               ExportFormats
+                   typically for the File->Export menu. */
+               ExportFormats,
+               /** This is a list of importable formats
+                   typically for the File->Export menu. */
+               ImportFormats
        };
        /// Create a Command type MenuItem
        MenuItem(Kind kind, 
                 string const & label = string(), 
                 string const & command = string(), 
                 bool optional = false);
+       MenuItem(Kind kind,
+                string const & label, 
+                int action, 
+                bool optional = false)
+               : kind_(kind), label_(label),
+                 action_(action), submenu_(), optional_(optional) {}
+ 
        /// The label of a given menuitem
-       string label() const { return token(label_, '|', 0); }
-       ///
-       string shortcut() const { return token(label_, '|', 1); }
+       string const label() const { return token(label_, '|', 0); }
+       /// The keyboard shortcut (usually underlined in the entry)
+       string const shortcut() const { return token(label_, '|', 1); }
+       /// The complete label, with label and shortcut separated by a '|'
+       string const fulllabel() const { return label_;}
        /// The kind of entry
        Kind kind() const { return kind_; } 
        /// the action (if relevant)
@@ -90,18 +105,28 @@ public:
        ///
        typedef ItemList::const_iterator const_iterator;
        ///
-       explicit Menu(string const & name, bool mb = false) 
+       explicit Menu(string const & name = string(), bool mb = false) 
                : menubar_(mb), name_(name) {}
        ///
        Menu & add(MenuItem const &);
        ///
        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;
        /// 
        bool menubar() const { return menubar_; }
        /// 
        string const & name() const { return name_; }
        ///
        bool empty() const { return items_.empty(); }
+       ///
+       ItemList::size_type size() const { return items_.size(); }
+       ///
+       bool hasSubmenu(string const &) const;
         ///
         const_iterator begin() const {
                 return items_.begin();
@@ -110,6 +135,10 @@ public:
         const_iterator end() const {
                 return items_.end();
         }
+
+       // Check whether the menu shortcuts are unique
+       void checkShortcuts() const;
+       
 private:
        ///
        ItemList items_;
@@ -134,7 +163,7 @@ public:
        ///
        void add(Menu const &);
        ///
-       bool hasMenu (string const &) const;
+       bool hasMenu(string const &) const;
        ///
        Menu & getMenu (string const &);
        ///