Fix bug #6997

[lyx.git] / src / frontends / qt4 / Toolbars.h

diff --git a/src/frontends/qt4/Toolbars.h b/src/frontends/qt4/Toolbars.h
index 07e1e47ff8f7920b7b81602dbd70e103576cdaae..92bd3de78b46e1f1032264c6f7a88538808f5a7e 100644 (file)
--- a/src/frontends/qt4/Toolbars.h
+++ b/src/frontends/qt4/Toolbars.h
@@ -16,6 +16,7 @@
 #include "FuncRequest.h"
 
 #include <vector>
+#include <map>
 
 
 namespace lyx {
@@ -37,8 +38,10 @@ public:
                LAYOUTS,
                /// a special widget to insert tabulars
                TABLEINSERT,
-               ///
+               /// a button that expands a menu
                POPUPMENU,
+               /// a button that expands a menu but remembers the last choice
+               STICKYPOPUPMENU,
                ///
                ICONPALETTE
        };
@@ -76,7 +79,7 @@ public:
        /// toolbar name
        std::string name;
        /// toolbar GUI name
-       std::string gui_name;
+       docstring gui_name;
        /// toolbar contents
        Items items;
 
@@ -104,13 +107,17 @@ public:
                MATH = 128, //< show when in math
                TABLE = 256, //< show when in table
                REVIEW = 512, //< show when change tracking is enabled
-               MATHMACROTEMPLATE = 1024 //< show in math macro template
+               MATHMACROTEMPLATE = 1024, //< show in math macro template
+               SAMEROW = 2048 //place to the current row, no new line
        };
 
        typedef std::vector<ToolbarInfo> Infos;
 
        Toolbars() {}
 
+       ///
+       void reset();
+
        /// iterator for all toolbars
        Infos::const_iterator begin() const { return toolbar_info_.begin(); }
 
@@ -130,6 +137,8 @@ public:
        ToolbarInfo const * info(std::string const & name) const;
        ///
        int defaultVisibility(std::string const & name) const;
+       ///
+       bool isMainToolbar(std::string const & name) const;
 
 private:
        /// all the defined toolbars