use floatname instead of floattype

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5791 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index dfda1c2be8770d812d1f3b321018d3272fcea8d7..553c87816c2f10194d36da7f46ad1ded8d33dd0a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,12 @@
+2002-12-08  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * MenuBackend.C (expandToc): gettext on float names.
+
 2002-12-03  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
- 
-       * lyxlength.[Ch]: set default unit to UNIT_NONE,
-       implement bool empty() [bug 490]
- 
+
+       * lyxlength.[Ch]: set default unit to UNIT_NONE,
+       implement bool empty() [bug 490]
+
 2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * text2.C, CutAndPaste.C: use BoostFormat.h not boost/format.hpp

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 7d118317f8f591a39a080a23a85ae36c73a4f1bc..0305c9558eabd8a413ae980aacd92e0a1f85fac7 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -505,7 +505,7 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                                           label, ccit->action()));
                }
                MenuItem item(MenuItem::Submenu,
-                             floats[cit->first]->second.name());
+                             _(floats[cit->first]->second.name()));
                item.submenu(menu);
                tomenu.add(item);
        }

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 15f699fb8d37f820bdc03ec209cfc8f19f4456c9..9c2b24d39f42fbc4f4a9d40599d725dec043a605 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-08  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * insetfloat.C (addToToc): use the floats name not its type
+       * insetwrap.C (addToToc): ditto
+
 2002-12-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * insetnote.C (init): make label font smaller
@@ -5,7 +10,7 @@
 2002-12-04  John Levon  <levon@movementarian.org>
 
        * insetinclude.C: ressurect setting of command name
- 
+
 2002-12-02  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * insetquotes.C (dispString): disambiguate insert call

diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 3c9c62784b492e17348a6bf4938068e5e3ee6672..e5610ea8c80ce8962c93c3adf2f5b37ba916e20d 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -348,11 +348,12 @@ void InsetFloat::addToToc(toc::TocList & toclist, Buffer const * buf) const
                Paragraph * tmp = *pit;
 
                if (tmp->layout()->name() == caplayout) {
+                       string const name = floatname(type(), buf->params);
                        string const str =
-                               tostr(toclist[type()].size() + 1)
+                               tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
                        toc::TocItem const item(tmp, 0 , str);
-                       toclist[type()].push_back(item);
+                       toclist[name].push_back(item);
                }
        }
 }

diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 43dc8afd500f2690e8d950ff12c5a08d82d12a94..b33e2f3d326fa02ada336c76a3421bbe9969ef5d 100644 (file)
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -260,11 +260,12 @@ void InsetWrap::addToToc(toc::TocList & toclist, Buffer const * buf) const
        Paragraph * tmp = inset.paragraph();
        while (tmp) {
                if (tmp->layout()->name() == caplayout) {
+                       string const name = floatname(type(), buf->params);
                        string const str =
-                               tostr(toclist[type()].size() + 1)
+                               tostr(toclist[name].size() + 1)
                                + ". " + tmp->asString(buf, false);
                        toc::TocItem const item(tmp, 0 , str);
-                       toclist[type()].push_back(item);
+                       toclist[name].push_back(item);
                }
                tmp = tmp->next();
        }