Collect the outliner names for the children's tocs

[lyx.git] / src / frontends / qt4 / Menus.cpp

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 9887093255d68fde9416376b5b89dc01c59270d4..249d742013cb6d2d5fed90bd59e36c5c2c454c4b 100644 (file)
--- a/src/frontends/qt4/Menus.cpp
+++ b/src/frontends/qt4/Menus.cpp
@@ -1320,7 +1320,8 @@ void MenuDefinition::expandToc(Buffer const * buf)
                        continue;
                MenuDefinition submenu;
                submenu.expandTocSubmenu(cit->first, *cit->second);
-               MenuItem item(MenuItem::Submenu, guiName(cit->first, buf->params()));
+               docstring const toc_name = buf->tocBackend().outlinerName(cit->first);
+               MenuItem item(MenuItem::Submenu, toqstr(toc_name));
                item.setSubmenu(submenu);
                // deserves to be in the main menu?
                if (!TocBackend::isOther(cit->first))
@@ -1703,7 +1704,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
 {
        if (!bv)
                return;
-    
+
        if (!bv->cursor().inTexted())
                return;
 
@@ -1719,7 +1720,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
 
        map<string, docstring> styles = quoteparams.getTypes();
        string const qtype = qinset->getType();
-       
+
        map<string, docstring>::const_iterator qq = styles.begin();
        map<string, docstring>::const_iterator end = styles.end();
 
@@ -1768,7 +1769,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
                docstring const style = from_ascii(qq->first);
                bool langdef = (style[0] == langqs);
                bool globaldef = (style[0] == globalqsc);
-               
+
                if (prefixIs(style, qtype[0])) {
                        FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + style);
                        docstring const desc = quoteparams.getShortGuiLabel(style);
@@ -1786,7 +1787,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
 
        add(MenuItem(MenuItem::Separator));
 
-       bool have_section = false;
        bool display_static = false;
        // ... then potentially items to reset to the defaults and to dynamic style ...
        if (!main_dynamic_qs && globalqsc != 'x') {
@@ -1794,7 +1794,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
                docstring const desc = bformat(_("Use dynamic quotes (%1$s)|d"),
                                                quoteparams.getGuiLabel(globalqs));
                add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
-               have_section = true;
                display_static = true;
        }
        if (!main_global_qs && langdefqs != globalqs) {
@@ -1803,7 +1802,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
                docstring const desc = bformat(_("Reset to document default (%1$s, %2$s)|o"),
                                                quoteparams.getGuiLabel(globalqs), variant);
                add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
-               have_section = true;
        }
        if (!main_langdef_qs) {
                FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + globalqsc + wildcards);
@@ -1813,11 +1811,9 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
                                        : bformat(_("Reset to language default (%1$s)|l"),
                                                  quoteparams.getGuiLabel(langdefqs));
                add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
-               have_section = true;
        }
 
-       if (have_section)
-               add(MenuItem(MenuItem::Separator));
+       add(MenuItem(MenuItem::Separator));
 
        // ... and a subitem with the rest
        MenuItem item(MenuItem::Submenu, qt_("Change Style|y"));