Rename ascii to plaintext and LatexRunParams to OutputParams.

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

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 53cb0189c0f39327a5f760ecdae76152b5b9827a..c345421baad024de2889a59498dc645728d56ad2 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -7,22 +7,24 @@
  *
  * Full author contact details are available in file CREDITS.
  */
-#include <config.h>
 
+#include <config.h>
 
-#include "gettext.h"
 #include "insettoc.h"
+
+#include "dispatchresult.h"
 #include "funcrequest.h"
-#include "BufferView.h"
-#include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "debug.h"
+#include "gettext.h"
+#include "metricsinfo.h"
 #include "toc.h"
 
-using std::vector;
+#include "support/std_ostream.h"
+
+using std::string;
 using std::ostream;
 
 
+
 InsetTOC::InsetTOC(InsetCommandParams const & p)
        : InsetCommand(p)
 {}
@@ -30,16 +32,19 @@ InsetTOC::InsetTOC(InsetCommandParams const & p)
 
 InsetTOC::~InsetTOC()
 {
-       InsetCommandMailer mailer("toc", *this);
-       mailer.hideDialog();
+       InsetCommandMailer("toc", *this).hideDialog();
 }
 
 
-string const InsetTOC::getScreenLabel(Buffer const &) const
+std::auto_ptr<InsetBase> InsetTOC::clone() const
 {
-       string const cmdname(getCmdName());
+       return std::auto_ptr<InsetBase>(new InsetTOC(*this));
+}
+
 
-       if (cmdname == "tableofcontents")
+string const InsetTOC::getScreenLabel(Buffer const &) const
+{
+       if (getCmdName() == "tableofcontents")
                return _("Table of Contents");
        return _("Unknown toc list");
 }
@@ -47,8 +52,7 @@ string const InsetTOC::getScreenLabel(Buffer const &) const
 
 InsetOld::Code InsetTOC::lyxCode() const
 {
-       string const cmdname(getCmdName());
-       if (cmdname == "tableofcontents")
+       if (getCmdName() == "tableofcontents")
                return InsetOld::TOC_CODE;
        return InsetOld::NO_CODE;
 }
@@ -57,7 +61,8 @@ InsetOld::Code InsetTOC::lyxCode() const
 void InsetTOC::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        InsetCommand::metrics(mi, dim);
-       center_indent_ = (mi.base.textwidth - dim.wid) / 2;
+       int const x1 = (mi.base.textwidth - dim.wid) / 2;
+       button().setBox(Box(x1, x1 + dim.wid, -dim.asc, dim.des));
        dim.wid = mi.base.textwidth;
        dim_ = dim;
 }
@@ -65,23 +70,32 @@ void InsetTOC::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetTOC::draw(PainterInfo & pi, int x, int y) const
 {
-       InsetCommand::draw(pi, x + center_indent_, y);
+       InsetCommand::draw(pi, button().box().x1, y);
 }
 
 
-dispatch_result InsetTOC::localDispatch(FuncRequest const & cmd)
+DispatchResult
+InsetTOC::priv_dispatch(FuncRequest const & cmd,
+                       idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
-       case LFUN_INSET_EDIT:
+       case LFUN_MOUSE_RELEASE:
+               if (button().box().contains(cmd.x, cmd.y))
+                       InsetCommandMailer("toc", *this).showDialog(cmd.view());
+               return DispatchResult(true, true);
+
+       case LFUN_INSET_DIALOG_SHOW:
                InsetCommandMailer("toc", *this).showDialog(cmd.view());
-               return DISPATCHED;
+               return DispatchResult(true, true);
+
        default:
-               return InsetCommand::localDispatch(cmd);
+               return InsetCommand::priv_dispatch(cmd, idx, pos);
        }
 }
 
 
-int InsetTOC::ascii(Buffer const & buffer, ostream & os, int) const
+int InsetTOC::plaintext(Buffer const & buffer, ostream & os,
+                   OutputParams const &) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
@@ -92,7 +106,8 @@ int InsetTOC::ascii(Buffer const & buffer, ostream & os, int) const
 }
 
 
-int InsetTOC::linuxdoc(Buffer const &, ostream & os) const
+int InsetTOC::linuxdoc(Buffer const &, ostream & os,
+                      OutputParams const &) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc>";
@@ -100,7 +115,8 @@ int InsetTOC::linuxdoc(Buffer const &, ostream & os) const
 }
 
 
-int InsetTOC::docbook(Buffer const &, ostream & os, bool) const
+int InsetTOC::docbook(Buffer const &, ostream & os,
+                     OutputParams const &) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc></toc>";