#include "frontends/controllers/ControlMath.h"
-
-using namespace lyx::support;
+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;
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;
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:
}
-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())
if (!f.argument.empty())
xpm_name = subst(name + ' ' + f.argument, ' ', '_');
- fullname = LibFileSearch("images", xpm_name, "xpm");
+ fullname = libFileSearch("images", xpm_name, "xpm");
if (fullname.empty()) {
// try without the argument
- fullname = LibFileSearch("images", name, "xpm");
+ fullname = libFileSearch("images", name, "xpm");
}
}
lyxerr[Debug::GUI] << "Cannot find icon for command \""
<< lyxaction.getActionName(f.action)
- << ' ' << f.argument << '"' << endl;
- return LibFileSearch("images", "unknown", "xpm");
+ << '(' << f.argument << ")\"" << endl;
+ return libFileSearch("images", "unknown", "xpm");
}