#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;
{ "separator", TO_SEPARATOR }
};
-} // end of anon namespace
+} // namespace anon
ToolbarBackend::ToolbarBackend()
Toolbar tb;
tb.name = lex.getString();
+ lex.next(true);
+ tb.gui_name = lex.getString();
+ if (!lex) {
+ lyxerr << "ToolbarBackend::read: Malformed toolbar "
+ "description " << lex.getString() << endl;
+ return;
+ }
bool quit = false;
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]
+ LYXERR(Debug::PARSER)
<< "ToolbarBackend::read TO_ADD func: `"
<< func_arg << '\'' << endl;
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"))
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();
}
}
if (!fullname.empty()) {
- lyxerr[Debug::GUI] << "Full icon name is `"
+ LYXERR(Debug::GUI) << "Full icon name is `"
<< fullname << '\'' << endl;
return fullname;
}
- lyxerr[Debug::GUI] << "Cannot find icon for command \""
+ 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