- if (i != 0)
- info.insertInset(0, new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR),
- Change(Change::UNCHANGED));
- for (i = 0; i < names.top().length(); ++i)
- info.insertChar(i, names.top()[i], bp.getFont(), false);
- names.pop();
+ if (it != beg)
+ par.insertInset(par.size(), new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR),
+ f, Change(Change::UNCHANGED));
+ //FIXME: add proper underlines here. This
+ // involves rewriting searchMenu used above to
+ // return a vector of menus. If we do not do
+ // that, we might as well use below
+ // Paragraph::insert on each string (JMarc)
+ for (size_type i = 0; i != it->length(); ++i)
+ par.insertChar(par.size(), (*it)[i],
+ f, Change(Change::UNCHANGED));
+ }
+ break;
+ }
+ case ICON_INFO: {
+ FuncRequest func = lyxaction.lookupFunc(name_);
+ docstring icon_name = frontend::Application::iconName(func, true);
+ // FIXME: We should use the icon directly instead of
+ // going through FileName. The code below won't work
+ // if the icon is embedded in the executable through
+ // the Qt resource system.
+ // This is only a negligible performance problem:
+ // If the installed icon differs from the resource icon the
+ // installed one is preferred anyway, and all icons that are
+ // embedded in the resources are installed as well.
+ FileName file(to_utf8(icon_name));
+ if (file.onlyFileNameWithoutExt() == "unknown") {
+ string dir = "images";
+ FileName file2(imageLibFileSearch(dir, name_, "svgz,png"));
+ if (!file2.empty())
+ file = file2;
+ }
+ if (!file.exists())
+ break;
+ int percent_scale = 100;
+ if (use_gui) {
+ // Compute the scale factor for the icon such that its
+ // width on screen is equal to 1em in pixels.
+ // The scale factor is rounded to the integer nearest
+ // to the float value of the ratio 100*iconsize/imgsize.
+ int imgsize = QImage(toqstr(file.absFileName())).width();
+ if (imgsize > 0) {
+ int iconsize = Length(1, Length::EM).inPixels(1);
+ percent_scale = (100 * iconsize + imgsize / 2)/imgsize;
+ }