Alfredo's second patch

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 263efeb1981581417661146c9c4bf5117bb8729d..1d379e0ab6004d5654edaa608ca2bdee02cc2820 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -22,27 +22,29 @@
 
 #include "frontends/controllers/ControlMath.h"
 
+#include <vector>
+
 using std::endl;
+using std::vector;
 
 ToolbarBackend toolbarbackend;
 
 namespace {
 
-enum _tooltags {
+enum tooltags {
        TO_ADD = 1,
        TO_ENDTOOLBAR,
        TO_SEPARATOR,
        TO_LAYOUTS,
-       TO_NEWLINE,
+       TO_MINIBUFFER,
        TO_LAST
 };
 
-
 struct keyword_item toolTags[TO_LAST - 1] = {
        { "end", TO_ENDTOOLBAR },
        { "item", TO_ADD },
        { "layouts", TO_LAYOUTS },
-       { "newline", TO_NEWLINE },
+       { "minibuffer", TO_MINIBUFFER },
        { "separator", TO_SEPARATOR }
 };
 
@@ -54,12 +56,6 @@ ToolbarBackend::ToolbarBackend()
 }
 
 
-void ToolbarBackend::add(int action, string const & tooltip)
-{
-       items.push_back(make_pair(action, tooltip));
-}
-
-
 void ToolbarBackend::read(LyXLex & lex)
 {
        //consistency check
@@ -68,6 +64,44 @@ void ToolbarBackend::read(LyXLex & lex)
                       << lex.getString() << '\'' << endl;
        }
 
+       lex.next(true);
+
+       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;
 
        lex.pushTable(toolTags, TO_LAST - 1);
@@ -85,20 +119,20 @@ void ToolbarBackend::read(LyXLex & lex)
                                lyxerr[Debug::PARSER]
                                        << "ToolbarBackend::read TO_ADD func: `"
                                        << func << '\'' << endl;
-                               add(func, tooltip);
+                               add(tb, func, tooltip);
                        }
                        break;
 
-               case TO_SEPARATOR:
-                       add(SEPARATOR);
+               case TO_MINIBUFFER:
+                       add(tb, MINIBUFFER);
                        break;
 
-               case TO_LAYOUTS:
-                       add(LAYOUTS);
+               case TO_SEPARATOR:
+                       add(tb, SEPARATOR);
                        break;
 
-               case TO_NEWLINE:
-                       add(NEWLINE);
+               case TO_LAYOUTS:
+                       add(tb, LAYOUTS);
                        break;
 
                case TO_ENDTOOLBAR:
@@ -110,11 +144,20 @@ void ToolbarBackend::read(LyXLex & lex)
                        break;
                }
        }
+
+       toolbars.push_back(tb);
+
        lex.popTable();
 }
 
 
-void ToolbarBackend::add(string const & func, string const & tooltip)
+void ToolbarBackend::add(Toolbar & tb, int action, string const & tooltip)
+{
+       tb.items.push_back(make_pair(action, tooltip));
+}
+
+
+void ToolbarBackend::add(Toolbar & tb, string const & func, string const & tooltip)
 {
        int const tf = lyxaction.LookupFunc(func);
 
@@ -122,7 +165,7 @@ void ToolbarBackend::add(string const & func, string const & tooltip)
                lyxerr << "ToolbarBackend::add: no LyX command called `"
                       << func << "' exists!" << endl;
        } else {
-               add(tf, tooltip);
+               add(tb, tf, tooltip);
        }
 }
 
@@ -132,8 +175,11 @@ string const ToolbarBackend::getIcon(int action)
        string fullname;
        FuncRequest f = lyxaction.retrieveActionArg(action);
 
-       if (f.action == LFUN_INSERT_MATH && !f.argument.empty()) {
-               fullname = find_xpm(f.argument.substr(1));
+       if (f.action == LFUN_INSERT_MATH) {
+               if (!f.argument.empty())
+                       fullname = find_xpm(f.argument.substr(1));
+       } else if (f.action == LFUN_MATH_DELIM) {
+               fullname = find_xpm(f.argument);
        } else {
                string const name = lyxaction.getActionName(f.action);
                string xpm_name(name);