From b2cd9a9093fe95902584c33d520c49a91df40208 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 28 Jul 2005 14:36:16 +0000 Subject: [PATCH] se Floating::listName() as title of git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10369 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/MenuBackend.C | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 2566c7779c..763ab97cee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-07-28 Jean-Marc Lasgouttes + + * MenuBackend.C (expandToc): use Floating::listName() as title of + the floats submenus. + 2005-07-27 Jürgen Spitzmüller * toc.[Ch]: Do not use translatable strings (bug 1870). diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 97fd3a7d4f..b2eb7ba10d 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -666,7 +666,9 @@ void expandToc(Menu & tomenu, LyXView const * view) // know that all the entries in a TOC will be have status_ == // OK, so we avoid this unnecessary overhead (JMarc) - if (!view->buffer()) { + + Buffer const * buf = view->buffer(); + if (!buf) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), FuncRequest(LFUN_NOACTION)), @@ -674,7 +676,8 @@ void expandToc(Menu & tomenu, LyXView const * view) return; } - lyx::toc::TocList toc_list = lyx::toc::getTocList(*view->buffer()); + FloatList const & floatlist = buf->params().getLyXTextClass().floats(); + lyx::toc::TocList toc_list = lyx::toc::getTocList(*buf); lyx::toc::TocList::const_iterator cit = toc_list.begin(); lyx::toc::TocList::const_iterator end = toc_list.end(); for (; cit != end; ++cit) { @@ -692,8 +695,7 @@ void expandToc(Menu & tomenu, LyXView const * view) label, FuncRequest(ccit->action()))); } - string const & floatName = cit->first; - // Is the _(...) really needed here? (Lgb) + string const & floatName = floatlist.getType(cit->first).listName(); MenuItem item(MenuItem::Submenu, _(floatName)); item.submenu(menu.release()); tomenu.add(item); -- 2.39.5