various bits from Michael

[features.git] / src / MenuBackend.C

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 2af19defcbe8080f1a124e2d3e9bee3811f33c38..2488f26df2faf54190cd61341318c8f9db8bb000 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -373,13 +373,15 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
                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));
@@ -443,7 +445,7 @@ void expandToc2(Menu & tomenu, toc::Toc const & toc_list,
                        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));
                }
@@ -486,13 +488,13 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                return;
        }
 
-       FloatList const & floats = buf->params.getLyXTextClass().floats();
        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;
@@ -503,8 +505,9 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                        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);
        }