Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/Toolbars.h b/src/frontends/qt4/Toolbars.h
index 6ecc738ad9b7ffecd5ca1aff2739780dd32362b1..a4acb419cb2d3f4990826c6f8cfa0e54f18b99fa 100644 (file)
--- a/src/frontends/qt4/Toolbars.h
+++ b/src/frontends/qt4/Toolbars.h
@@ -17,6 +17,7 @@
 
 #include <vector>
 #include <map>
+#include <memory>
 
 
 namespace lyx {
@@ -38,10 +39,14 @@ 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,
                ///
-               ICONPALETTE
+               DYNAMICMENU
        };
 
        ToolbarItem(Type type,
@@ -55,7 +60,7 @@ public:
        /// item type
        Type type_;
        /// action
-       FuncRequest func_;
+       std::shared_ptr<FuncRequest> func_; // non-null
        /// label/tooltip
        docstring label_;
        /// name
@@ -77,7 +82,7 @@ public:
        /// toolbar name
        std::string name;
        /// toolbar GUI name
-       std::string gui_name;
+       docstring gui_name;
        /// toolbar contents
        Items items;
 
@@ -105,7 +110,12 @@ 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
+               IPA = 4096, //< show when in IPA inset
+               MINIBUFFER = 8192, //< show when command-execute has been invoked
+               MINIBUFFER_FOCUS = 16384, //< set focus to minibuffer
+               ALLOWAUTO = MATH | TABLE | REVIEW | MATHMACROTEMPLATE | IPA | MINIBUFFER
        };
 
        typedef std::vector<ToolbarInfo> Infos;