#include "support/gettext.h"
#include "support/lstrings.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <algorithm>
void ToolbarInfo::add(ToolbarItem const & item)
{
items.push_back(item);
- items.back().func_.origin = FuncRequest::TOOLBAR;
+ items.back().func_.setOrigin(FuncRequest::TOOLBAR);
}
TO_EXPORTFORMATS,
TO_IMPORTFORMATS,
TO_UPDATEFORMATS,
- TO_VIEWFORMATS,
+ TO_VIEWFORMATS
};
struct LexerKeyword toolTags[] = {
{
enum {
TO_TOOLBAR = 1,
- TO_ENDTOOLBARSET,
+ TO_ENDTOOLBARSET
};
struct LexerKeyword toolTags[] = {
flag = MATHMACROTEMPLATE;
else if (!compare_ascii_no_case(*cit, "review"))
flag = REVIEW;
+ else if (!compare_ascii_no_case(*cit, "minibuffer"))
+ flag = MINIBUFFER;
else if (!compare_ascii_no_case(*cit, "top"))
flag = TOP;
else if (!compare_ascii_no_case(*cit, "bottom"))
flag = RIGHT;
else if (!compare_ascii_no_case(*cit, "auto"))
flag = AUTO;
+ else if (!compare_ascii_no_case(*cit, "samerow"))
+ flag = SAMEROW;
+ else if (!compare_ascii_no_case(*cit, "ipa"))
+ flag = IPA;
else {
LYXERR(Debug::ANY,
"Toolbars::readToolbarSettings: unrecognised token:`"
}
toolbar_visibility_[name] = visibility;
- if (visibility >= MATH) {
+ if (visibility & ALLOWAUTO) {
if (ToolbarInfo const * ti = info(name))
const_cast<ToolbarInfo *>(ti)->gui_name +=
" (" + _("auto") + ")";