Real fix from Bernhard Roider

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 8d91fca37647ff2857e27d577960b9d440763f4c..b12fed44df1b0f956d33e2acc45285935a02072b 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -23,14 +23,17 @@
 
 #include "frontends/controllers/ControlMath.h"
 
-using lyx::support::compare_ascii_no_case;
-using lyx::support::getVectorFromString;
-using lyx::support::LibFileSearch;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::getVectorFromString;
+using support::libFileSearch;
+using support::subst;
 
 using std::endl;
 using std::make_pair;
-
+using std::string;
 using std::vector;
 
 
@@ -55,7 +58,7 @@ struct keyword_item toolTags[TO_LAST - 1] = {
        { "separator", TO_SEPARATOR }
 };
 
-} // end of anon namespace
+} // namespace anon
 
 
 ToolbarBackend::ToolbarBackend()
@@ -75,6 +78,13 @@ void ToolbarBackend::read(LyXLex & lex)
 
        Toolbar tb;
        tb.name = lex.getString();
+       lex.next(true);
+       if (!lex.isOK()) {
+               lyxerr << "ToolbarBackend::read: Malformed toolbar "
+                       "description " <<  lex.getString() << endl;
+               return;
+       }
+       tb.gui_name = lex.getString();
 
        bool quit = false;
 
@@ -87,32 +97,16 @@ void ToolbarBackend::read(LyXLex & lex)
                switch (lex.lex()) {
                case TO_ADD:
                        if (lex.next(true)) {
-                               string const tooltip = _(lex.getString());
+                               docstring const tooltip = translateIfPossible(lex.getDocString());
                                lex.next(true);
                                string const func_arg = lex.getString();
                                lyxerr[Debug::PARSER]
                                        << "ToolbarBackend::read TO_ADD func: `"
                                        << func_arg << '\'' << endl;
-                               // Split func_arg in function and arg.
-                               string::size_type sp = func_arg.find(' ');
-                               if (sp != string::npos) {
-
-                                       string const func =
-                                               func_arg.substr(0, sp);
-                                       string const arg =
-                                            func_arg.substr(sp + 1,
-                                                            string::npos);
-
-                                       kb_action const tf =
-                                               lyxaction.LookupFunc(func);
-
-                                       add(tb, FuncRequest(tf, arg), tooltip);
-                               } else {
-                                       kb_action const tf = lyxaction.LookupFunc(func_arg);
-                                       add(tb, FuncRequest(tf), tooltip);
-
-                               }
 
+                               FuncRequest func =
+                                       lyxaction.lookupFunc(func_arg);
+                               add(tb, func, tooltip);
                        }
                        break;
 
@@ -192,6 +186,8 @@ void ToolbarBackend::readToolbars(LyXLex & lex)
                                flag = MATH;
                        else if (!compare_ascii_no_case(*cit, "table"))
                                flag = TABLE;
+                       else if (!compare_ascii_no_case(*cit, "review"))
+                               flag = REVIEW;
                        else if (!compare_ascii_no_case(*cit, "top"))
                                flag = TOP;
                        else if (!compare_ascii_no_case(*cit, "bottom"))
@@ -213,33 +209,40 @@ void ToolbarBackend::readToolbars(LyXLex & lex)
 
 
 void ToolbarBackend::add(Toolbar & tb,
-                        FuncRequest const & func, string const & tooltip)
+                        FuncRequest const & func, docstring const & tooltip)
 {
        tb.items.push_back(make_pair(func, tooltip));
+       tb.items.back().first.origin = FuncRequest::TOOLBAR;
 }
 
 
 string const ToolbarBackend::getIcon(FuncRequest const & f)
 {
+       using frontend::find_xpm;
+
        string fullname;
 
-       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 {
+       switch (f.action) {
+       case LFUN_MATH_INSERT:
+               if (!f.argument().empty())
+                       fullname = find_xpm(to_utf8(f.argument()).substr(1));
+               break;
+       case LFUN_MATH_DELIM:
+       case LFUN_MATH_BIGDELIM:
+               fullname = find_xpm(to_utf8(f.argument()));
+               break;
+       default:
                string const name = lyxaction.getActionName(f.action);
                string xpm_name(name);
 
-               if (!f.argument.empty())
-                       xpm_name = subst(name + ' ' + f.argument, ' ', '_');
+               if (!f.argument().empty())
+                       xpm_name = subst(name + ' ' + to_utf8(f.argument()), ' ', '_');
 
-               fullname = LibFileSearch("images", xpm_name, "xpm");
+               fullname = libFileSearch("images", xpm_name, "xpm").absFilename();
 
                if (fullname.empty()) {
                        // try without the argument
-                       fullname = LibFileSearch("images", name, "xpm");
+                       fullname = libFileSearch("images", name, "xpm").absFilename();
                }
        }
 
@@ -251,6 +254,9 @@ string const ToolbarBackend::getIcon(FuncRequest const & f)
 
        lyxerr[Debug::GUI] << "Cannot find icon for command \""
                           << lyxaction.getActionName(f.action)
-                          << '(' << f.argument << ")\"" << endl;
-       return LibFileSearch("images", "unknown", "xpm");
+                          << '(' << to_utf8(f.argument()) << ")\"" << endl;
+       return libFileSearch("images", "unknown", "xpm").absFilename();
 }
+
+
+} // namespace lyx