Alfredo's second patch

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 61bfdc9260a430bf6a9a71c7702ccff08cabcf97..1d379e0ab6004d5654edaa608ca2bdee02cc2820 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -22,7 +22,10 @@
 
 #include "frontends/controllers/ControlMath.h"
 
+#include <vector>
+
 using std::endl;
+using std::vector;
 
 ToolbarBackend toolbarbackend;
 
@@ -33,14 +36,15 @@ enum tooltags {
        TO_ENDTOOLBAR,
        TO_SEPARATOR,
        TO_LAYOUTS,
+       TO_MINIBUFFER,
        TO_LAST
 };
 
-
 struct keyword_item toolTags[TO_LAST - 1] = {
        { "end", TO_ENDTOOLBAR },
        { "item", TO_ADD },
        { "layouts", TO_LAYOUTS },
+       { "minibuffer", TO_MINIBUFFER },
        { "separator", TO_SEPARATOR }
 };
 
@@ -64,6 +68,39 @@ void ToolbarBackend::read(LyXLex & lex)
 
        Toolbar tb;
        tb.name = lex.getString();
+       lex.next(true);
+       
+       tb.flags = static_cast<Flags>(0);
+       string flagstr = lex.getString();
+       vector<string> flags = getVectorFromString(flagstr);
+
+       vector<string>::const_iterator cit = flags.begin();
+       vector<string>::const_iterator end = flags.end();
+
+       for (; cit != end; ++cit) {
+               int flag = 0;
+               if (!compare_ascii_no_case(*cit, "off"))
+                       flag = OFF;
+               else if (!compare_ascii_no_case(*cit, "on"))
+                       flag = ON;
+               else if (!compare_ascii_no_case(*cit, "math"))
+                       flag = MATH;
+               else if (!compare_ascii_no_case(*cit, "table"))
+                       flag = TABLE;
+               else if (!compare_ascii_no_case(*cit, "top"))
+                       flag = TOP;
+               else if (!compare_ascii_no_case(*cit, "bottom"))
+                       flag = BOTTOM;
+               else if (!compare_ascii_no_case(*cit, "left"))
+                       flag = LEFT;
+               else if (!compare_ascii_no_case(*cit, "right"))
+                       flag = RIGHT;
+               else {
+                       lyxerr << "ToolbarBackend::read: unrecognised token:`"
+                              << *cit << '\'' << endl;
+               }
+               tb.flags = static_cast<Flags>(tb.flags | flag);
+       }
 
        bool quit = false;
 
@@ -86,6 +123,10 @@ void ToolbarBackend::read(LyXLex & lex)
                        }
                        break;
 
+               case TO_MINIBUFFER:
+                       add(tb, MINIBUFFER);
+                       break;
+
                case TO_SEPARATOR:
                        add(tb, SEPARATOR);
                        break;