using lyx::support::compare_ascii_no_case;
using lyx::support::getVectorFromString;
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
using lyx::support::subst;
using std::endl;
Toolbars::iterator tcit = toolbars.begin();
Toolbars::iterator tend = toolbars.end();
for (; tcit != tend; ++tcit) {
- if (compare_ascii_no_case(name, tcit->name) == 0)
+ if (tcit->name == name)
break;
}
FuncRequest const & func, string const & tooltip)
{
tb.items.push_back(make_pair(func, tooltip));
+ tb.items.back().first.origin = FuncRequest::UI;
}
string const ToolbarBackend::getIcon(FuncRequest const & f)
{
+ using lyx::frontend::find_xpm;
+
string fullname;
if (f.action == LFUN_INSERT_MATH) {
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");
+ return libFileSearch("images", "unknown", "xpm");
}