Enable convertDefault.sh to run even if its executable bit is not set.

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

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 0c64eb5013d091bd6a9e1241c35edec5648f1ac4..53cb0189c0f39327a5f760ecdae76152b5b9827a 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -5,13 +5,14 @@
  *
  * \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 "gettext.h"
 #include "insettoc.h"
+#include "funcrequest.h"
 #include "BufferView.h"
 #include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
@@ -22,8 +23,8 @@ using std::vector;
 using std::ostream;
 
 
-InsetTOC::InsetTOC(InsetCommandParams const & p, bool same_id)
-       : InsetCommand(p, same_id)
+InsetTOC::InsetTOC(InsetCommandParams const & p)
+       : InsetCommand(p)
 {}
 
 
@@ -34,7 +35,7 @@ InsetTOC::~InsetTOC()
 }
 
 
-string const InsetTOC::getScreenLabel(Buffer const *) const
+string const InsetTOC::getScreenLabel(Buffer const &) const
 {
        string const cmdname(getCmdName());
 
@@ -44,40 +45,54 @@ string const InsetTOC::getScreenLabel(Buffer const *) const
 }
 
 
-Inset::Code InsetTOC::lyxCode() const
+InsetOld::Code InsetTOC::lyxCode() const
 {
        string const cmdname(getCmdName());
        if (cmdname == "tableofcontents")
-               return Inset::TOC_CODE;
-       return Inset::NO_CODE;
+               return InsetOld::TOC_CODE;
+       return InsetOld::NO_CODE;
 }
 
 
-void InsetTOC::edit(BufferView *, int, int, mouse_button::state)
+void InsetTOC::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       InsetCommandMailer mailer("toc", *this);
-       mailer.showDialog();
+       InsetCommand::metrics(mi, dim);
+       center_indent_ = (mi.base.textwidth - dim.wid) / 2;
+       dim.wid = mi.base.textwidth;
+       dim_ = dim;
+}
+
+
+void InsetTOC::draw(PainterInfo & pi, int x, int y) const
+{
+       InsetCommand::draw(pi, x + center_indent_, y);
 }
 
 
-void InsetTOC::edit(BufferView * bv, bool)
+dispatch_result InsetTOC::localDispatch(FuncRequest const & cmd)
 {
-       edit(bv, 0, 0, mouse_button::none);
+       switch (cmd.action) {
+       case LFUN_INSET_EDIT:
+               InsetCommandMailer("toc", *this).showDialog(cmd.view());
+               return DISPATCHED;
+       default:
+               return InsetCommand::localDispatch(cmd);
+       }
 }
 
 
-int InsetTOC::ascii(Buffer const * buffer, ostream & os, int) const
+int InsetTOC::ascii(Buffer const & buffer, ostream & os, int) const
 {
        os << getScreenLabel(buffer) << "\n\n";
 
-       toc::asciiTocList(toc::getType(getCmdName()), buffer, os);
+       lyx::toc::asciiTocList(lyx::toc::getType(getCmdName()), buffer, os);
 
        os << "\n";
        return 0;
 }
 
 
-int InsetTOC::linuxdoc(Buffer const *, ostream & os) const
+int InsetTOC::linuxdoc(Buffer const &, ostream & os) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc>";
@@ -85,7 +100,7 @@ int InsetTOC::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetTOC::docbook(Buffer const *, ostream & os, bool) const
+int InsetTOC::docbook(Buffer const &, ostream & os, bool) const
 {
        if (getCmdName() == "tableofcontents")
                os << "<toc></toc>";