* add "auto" flag for toolbars

* make macro toolbar automatic

This reverts commit 7d48e270549aa04c34fae9ce9682162c78f57eda.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22655 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index bf82cd843ce1367097f770a1c110c71f04e3d0c9..21ec83c0a725470eb5b7848f4aff7e167e883ac4 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -40,6 +40,6 @@ Toolbars
        "table" "table,bottom"
        "math_panels" "math,bottom"
        "math" "math,bottom"
-       "mathmacrotemplate" "mathmacrotemplate,bottom"
+       "mathmacrotemplate" "auto,mathmacrotemplate,bottom"
        "minibuffer" "off,bottom"
 End

diff --git a/src/ToolbarBackend.cpp b/src/ToolbarBackend.cpp
index b038623fcb14260b114cc71036b5863fb8f92b4a..afb2a78069eaec18228972116bd7a36f379c5673 100644 (file)
--- a/src/ToolbarBackend.cpp
+++ b/src/ToolbarBackend.cpp
@@ -307,6 +307,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
                                flag = ToolbarInfo::LEFT;
                        else if (!compare_ascii_no_case(*cit, "right"))
                                flag = ToolbarInfo::RIGHT;
+                       else if (!compare_ascii_no_case(*cit, "auto"))
+                               flag = ToolbarInfo::AUTO;
                        else {
                                LYXERR(Debug::ANY,
                                        "ToolbarBackend::readToolbarSettings: unrecognised token:`"