* 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
This commit is contained in:
Stefan Schimanski 2008-01-22 22:56:10 +00:00
parent d60aff6c00
commit 135fbe2c1b
2 changed files with 3 additions and 1 deletions

View File

@ -40,6 +40,6 @@ Toolbars
"table" "table,bottom" "table" "table,bottom"
"math_panels" "math,bottom" "math_panels" "math,bottom"
"math" "math,bottom" "math" "math,bottom"
"mathmacrotemplate" "mathmacrotemplate,bottom" "mathmacrotemplate" "auto,mathmacrotemplate,bottom"
"minibuffer" "off,bottom" "minibuffer" "off,bottom"
End End

View File

@ -307,6 +307,8 @@ void ToolbarBackend::readToolbarSettings(Lexer & lex)
flag = ToolbarInfo::LEFT; flag = ToolbarInfo::LEFT;
else if (!compare_ascii_no_case(*cit, "right")) else if (!compare_ascii_no_case(*cit, "right"))
flag = ToolbarInfo::RIGHT; flag = ToolbarInfo::RIGHT;
else if (!compare_ascii_no_case(*cit, "auto"))
flag = ToolbarInfo::AUTO;
else { else {
LYXERR(Debug::ANY, LYXERR(Debug::ANY,
"ToolbarBackend::readToolbarSettings: unrecognised token:`" "ToolbarBackend::readToolbarSettings: unrecognised token:`"