From 135fbe2c1baf74e84750927af8e2d35af867fac8 Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Tue, 22 Jan 2008 22:56:10 +0000 Subject: [PATCH] * 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 --- lib/ui/default.ui | 2 +- src/ToolbarBackend.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ui/default.ui b/lib/ui/default.ui index bf82cd843c..21ec83c0a7 100644 --- 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 b038623fcb..afb2a78069 100644 --- 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:`" -- 2.39.2