Final touch 'inset display()'; fix 'is a bit silly' bug

[lyx.git] / src / insets / insetfloatlist.C

diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index ad85096c8d84e065e5d838fd6e62a2342958819b..3926935e897654a293a921e393641bea5eb64c43 100644 (file)
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -5,33 +5,37 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
-#include <config.h>
 
+#include <config.h>
 
 #include "insetfloatlist.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "Floating.h"
 #include "FloatList.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
-#include "frontends/Dialogs.h"
-#include "frontends/LyXView.h"
-#include "BufferView.h"
-#include "buffer.h"
+#include "metricsinfo.h"
 #include "toc.h"
-#include "gettext.h"
-#include "debug.h"
 
-#include "BoostFormat.h"
+#include "support/lstrings.h"
+
+using lyx::support::bformat;
 
-using std::ostream;
 using std::endl;
+using std::string;
+using std::ostream;
 
 
 InsetFloatList::InsetFloatList()
        : InsetCommand(InsetCommandParams())
-{
-}
+{}
 
 
 InsetFloatList::InsetFloatList(string const & type)
@@ -41,9 +45,16 @@ InsetFloatList::InsetFloatList(string const & type)
 }
 
 
-string const InsetFloatList::getScreenLabel(Buffer const * buf) const
+InsetFloatList::~InsetFloatList()
+{
+       InsetCommandMailer mailer("toc", *this);
+       mailer.hideDialog();
+}
+
+
+string const InsetFloatList::getScreenLabel(Buffer const & buf) const
 {
-       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       FloatList const & floats = buf.params().getLyXTextClass().floats();
        FloatList::const_iterator it = floats[getCmdName()];
        if (it != floats.end())
                return _(it->second.listName());
@@ -52,21 +63,21 @@ string const InsetFloatList::getScreenLabel(Buffer const * buf) const
 }
 
 
-Inset::Code InsetFloatList::lyxCode() const
+InsetOld::Code InsetFloatList::lyxCode() const
 {
-       return Inset::FLOAT_LIST_CODE;
+       return InsetOld::FLOAT_LIST_CODE;
 }
 
 
-void InsetFloatList::write(Buffer const *, ostream & os) const
+void InsetFloatList::write(Buffer const &, ostream & os) const
 {
        os << "FloatList " << getCmdName() << "\n";
 }
 
 
-void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
+void InsetFloatList::read(Buffer const & buf, LyXLex & lex)
 {
-       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       FloatList const & floats = buf.params().getLyXTextClass().floats();
        string token;
 
        if (lex.eatLine()) {
@@ -89,21 +100,48 @@ void InsetFloatList::read(Buffer const * buf, LyXLex & lex)
 }
 
 
-void InsetFloatList::edit(BufferView * bv, int, int, mouse_button::state)
+void InsetFloatList::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       InsetCommand::metrics(mi, dim);
+       int center_indent = (mi.base.textwidth - dim.wid) / 2;
+    Box b(center_indent, center_indent + dim.wid, -dim.asc, dim.des);
+       button().setBox(b);
+
+       dim.wid = mi.base.textwidth;
+       dim_ = dim;
+}
+
+
+void InsetFloatList::draw(PainterInfo & pi, int x, int y) const
 {
-       bv->owner()->getDialogs().showTOC(this);
+       InsetCommand::draw(pi, x + button().box().x1, y);
 }
 
 
-void InsetFloatList::edit(BufferView * bv, bool)
+dispatch_result
+InsetFloatList::priv_dispatch(FuncRequest const & cmd,
+                             idx_type & idx, pos_type & pos)
 {
-       edit(bv, 0, 0, mouse_button::none);
+       switch (cmd.action) {
+               case LFUN_MOUSE_RELEASE:
+                       if (button().box().contains(cmd.x, cmd.y))
+                               InsetCommandMailer("toc", *this).showDialog(cmd.view());
+                       return DISPATCHED;
+
+               case LFUN_INSET_DIALOG_SHOW:
+                       InsetCommandMailer("toc", *this).showDialog(cmd.view());
+                       return DISPATCHED;
+
+               default:
+                       return InsetCommand::priv_dispatch(cmd, idx, pos);
+       }
 }
 
 
-int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
+int InsetFloatList::latex(Buffer const & buf, ostream & os,
+                         LatexRunParams const &) const
 {
-       FloatList const & floats = buf->params.getLyXTextClass().floats();
+       FloatList const & floats = buf.params().getLyXTextClass().floats();
        FloatList::const_iterator cit = floats[getCmdName()];
 
        if (cit != floats.end()) {
@@ -122,29 +160,19 @@ int InsetFloatList::latex(Buffer const * buf, ostream & os, bool, bool) const
                           << cit->second.listName() << "}\n";
                }
        } else {
-#if USE_BOOST_FORMAT
-               os << "%%\\listof{"
-                  << getCmdName()
-                  << "}{"
-                  << boost::format(_("List of %1$s")) % cit->second.name()
-                  << "}\n";
-#else
-               os << "%%\\listof{"
-                  << getCmdName()
-                  << "}{"
-                  << _("List of ") << cit->second.name()
+               os << "%%\\listof{" << getCmdName() << "}{"
+                  << bformat(_("List of %1$s"), cit->second.name())
                   << "}\n";
-#endif
        }
        return 1;
 }
 
 
-int InsetFloatList::ascii(Buffer const * buffer, ostream & os, int) const
+int InsetFloatList::ascii(Buffer const & buffer, ostream & os, int) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
-       toc::asciiTocList(getCmdName(), buffer, os);
+       lyx::toc::asciiTocList(getCmdName(), buffer, os);
 
        os << "\n";
        return 0;