float2string #4 (Spacing)

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 412616db598b901f96871a0f62fb2db25e8447ed..baa2ddfbcdfaf57865410b8aaaf1f53a02978fb4 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -3,18 +3,19 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author unknown
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "ToolbarBackend.h"
+#include "funcrequest.h"
 #include "LyXAction.h"
 #include "lyxlex.h"
 #include "debug.h"
-#include "lyxlex.h"
 #include "gettext.h"
 
 #include "support/lstrings.h"
@@ -22,11 +23,16 @@
 
 #include "frontends/controllers/ControlMath.h"
 
-#include <vector>
+using lyx::support::compare_ascii_no_case;
+using lyx::support::getVectorFromString;
+using lyx::support::LibFileSearch;
+using lyx::support::subst;
 
 using std::endl;
-using std::vector;
 using std::make_pair;
+using std::string;
+using std::vector;
+
 
 ToolbarBackend toolbarbackend;
 
@@ -69,6 +75,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;
 
@@ -83,24 +96,27 @@ void ToolbarBackend::read(LyXLex & lex)
                        if (lex.next(true)) {
                                string const tooltip = _(lex.getString());
                                lex.next(true);
-                               string const func = lex.getString();
+                               string const func_arg = lex.getString();
                                lyxerr[Debug::PARSER]
                                        << "ToolbarBackend::read TO_ADD func: `"
-                                       << func << '\'' << endl;
+                                       << func_arg << '\'' << endl;
+
+                               FuncRequest func =
+                                       lyxaction.lookupFunc(func_arg);
                                add(tb, func, tooltip);
                        }
                        break;
 
                case TO_MINIBUFFER:
-                       add(tb, MINIBUFFER);
+                       add(tb, FuncRequest(kb_action(MINIBUFFER)));
                        break;
 
                case TO_SEPARATOR:
-                       add(tb, SEPARATOR);
+                       add(tb, FuncRequest(kb_action(SEPARATOR)));
                        break;
 
                case TO_LAYOUTS:
-                       add(tb, LAYOUTS);
+                       add(tb, FuncRequest(kb_action(LAYOUTS)));
                        break;
 
                case TO_ENDTOOLBAR:
@@ -187,29 +203,19 @@ void ToolbarBackend::readToolbars(LyXLex & lex)
 }
 
 
-void ToolbarBackend::add(Toolbar & tb, int action, string const & tooltip)
+void ToolbarBackend::add(Toolbar & tb,
+                        FuncRequest const & func, string const & tooltip)
 {
-       tb.items.push_back(make_pair(action, tooltip));
+       tb.items.push_back(make_pair(func, tooltip));
+       tb.items.back().first.origin = FuncRequest::UI;
 }
 
 
-void ToolbarBackend::add(Toolbar & tb, string const & func, string const & tooltip)
+string const ToolbarBackend::getIcon(FuncRequest const & f)
 {
-       int const tf = lyxaction.LookupFunc(func);
+       using lyx::frontend::find_xpm;
 
-       if (tf == -1) {
-               lyxerr << "ToolbarBackend::add: no LyX command called `"
-                      << func << "' exists!" << endl;
-       } else {
-               add(tb, tf, tooltip);
-       }
-}
-
-
-string const ToolbarBackend::getIcon(int action)
-{
        string fullname;
-       FuncRequest f = lyxaction.retrieveActionArg(action);
 
        if (f.action == LFUN_INSERT_MATH) {
                if (!f.argument.empty())
@@ -237,5 +243,8 @@ string const ToolbarBackend::getIcon(int action)
                return fullname;
        }
 
+       lyxerr[Debug::GUI] << "Cannot find icon for command \""
+                          << lyxaction.getActionName(f.action)
+                          << '(' << f.argument << ")\"" << endl;
        return LibFileSearch("images", "unknown", "xpm");
 }