if (label == "EPS" || label == "XPM" || label == "PNG")
continue;
- if (kind == MenuItem::ImportFormats)
+ if (kind == MenuItem::ImportFormats) {
if ((*fit)->name() == "text")
- label = _("Ascii text as lines");
+ label = _("ASCII text as lines");
else if ((*fit)->name() == "textparagraph")
- label = _("Ascii text as paragraphs");
+ label = _("ASCII text as paragraphs");
+ label += "...";
+ }
if (!(*fit)->shortcut().empty())
- label += "|" + (*fit)->shortcut();
+ label += '|' + (*fit)->shortcut();
int const action2 = lyxaction.
getPseudoAction(action, (*fit)->name());
tomenu.add(MenuItem(MenuItem::Command, label, action2));
label += limit_string_length(toc_list[i].str);
if (toc_list[i].depth == depth
&& ++shortcut_count <= 9) {
- label += "|" + tostr(shortcut_count);
+ label += '|' + tostr(shortcut_count);
}
tomenu.add(MenuItem(MenuItem::Command, label, action));
}
void expandToc(Menu & tomenu, Buffer const * buf)
{
- FloatList const & floats = buf->params.getLyXTextClass().floats();
+ if (!buf) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"), LFUN_NOACTION));
+ return;
+ }
+
toc::TocList toc_list = toc::getTocList(buf);
toc::TocList::const_iterator cit = toc_list.begin();
toc::TocList::const_iterator end = toc_list.end();
for (; cit != end; ++cit) {
// Handle this later
- if (cit->first == "TOC") continue;
+ if (cit->first == "TOC")
+ continue;
// All the rest is for floats
Menu * menu = new Menu;
menu->add(MenuItem(MenuItem::Command,
label, ccit->action()));
}
- MenuItem item(MenuItem::Submenu,
- floats[cit->first]->second.name());
+ string const & floatName = cit->first;
+ // Is the _(...) really needed here? (Lgb)
+ MenuItem item(MenuItem::Submenu, _(floatName));
item.submenu(menu);
tomenu.add(item);
}