anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

se Floating::listName() as title of

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10369 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2005-07-28 14:36:16 +00:00
parent 33c966b34b
commit b2cd9a9093
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-07-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* MenuBackend.C (expandToc): use Floating::listName() as title of
the floats submenus.
2005-07-27 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2005-07-27 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* toc.[Ch]: Do not use translatable strings (bug 1870). * toc.[Ch]: Do not use translatable strings (bug 1870).

10
src/MenuBackend.C
View File

@ -666,7 +666,9 @@ void expandToc(Menu & tomenu, LyXView const * view)
// know that all the entries in a TOC will be have status_ == // know that all the entries in a TOC will be have status_ ==
// OK, so we avoid this unnecessary overhead (JMarc) // OK, so we avoid this unnecessary overhead (JMarc)
if (!view->buffer()) {
Buffer const * buf = view->buffer();
if (!buf) {
tomenu.add(MenuItem(MenuItem::Command, tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"), _("No Documents Open!"),
FuncRequest(LFUN_NOACTION)), FuncRequest(LFUN_NOACTION)),
@ -674,7 +676,8 @@ void expandToc(Menu & tomenu, LyXView const * view)
return; 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 cit = toc_list.begin();
lyx::toc::TocList::const_iterator end = toc_list.end(); lyx::toc::TocList::const_iterator end = toc_list.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
@ -692,8 +695,7 @@ void expandToc(Menu & tomenu, LyXView const * view)
label, label,
FuncRequest(ccit->action()))); FuncRequest(ccit->action())));
} }
string const & floatName = cit->first; string const & floatName = floatlist.getType(cit->first).listName();
// Is the _(...) really needed here? (Lgb)
MenuItem item(MenuItem::Submenu, _(floatName)); MenuItem item(MenuItem::Submenu, _(floatName));
item.submenu(menu.release()); item.submenu(menu.release());
tomenu.add(item); tomenu.add(item);