fix #832

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

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index e9d2c8d69d143af4a9b38e5dbdd2b76440732bdb..0231e58d7b871d1c9cfa926aaacc17ad6203d070 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -1,18 +1,23 @@
+/**
+ * \file insetref.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author José Matos
+ *
+ * Full author contact details are available in file CREDITS
+ */
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "insetref.h"
 #include "buffer.h"
-#include "commandtags.h"
+#include "funcrequest.h"
 #include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "LyXView.h"
+#include "frontends/LyXView.h"
 #include "frontends/Dialogs.h"
-#include "lyxfunc.h"
 #include "BufferView.h"
 #include "support/lstrings.h"
 
@@ -22,19 +27,28 @@ InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool)
        : InsetCommand(p), isLatex(buf.isLatex())
 {}
 
-void InsetRef::edit(BufferView * bv, int, int, unsigned int button)
+
+InsetRef::~InsetRef()
 {
-       // Eventually trigger dialog with button 3 not 1
-       if (button == 3 )
-               bv->owner()->getLyXFunc()->
-                       dispatch(LFUN_REF_GOTO, getContents());
-       else if (button == 1 )
-               bv->owner()->getDialogs()->showRef( this );
+       InsetCommandMailer("ref", *this).hideDialog();
 }
 
 
-void InsetRef::edit(BufferView *, bool)
+dispatch_result InsetRef::localDispatch(FuncRequest const & cmd)
 {
+       switch (cmd.action) {
+       case LFUN_INSET_EDIT:   
+               // Eventually trigger dialog with button 3 not 1
+               if (cmd.button() == mouse_button::button3)
+                       cmd.view()->owner()->
+                               dispatch(FuncRequest(LFUN_REF_GOTO, getContents()));
+               if (cmd.button() == mouse_button::button1)
+                       InsetCommandMailer("ref", *this).showDialog(cmd.view());
+               return DISPATCHED;
+       
+       default:
+               return UNDISPATCHED;
+       }
 }
 
 
@@ -63,7 +77,7 @@ int InsetRef::latex(Buffer const *, ostream & os,
        if (getOptions().empty())
                os << escape(getCommand());
        else {
-               InsetCommandParams p( getCmdName(), getContents(), "" );
+               InsetCommandParams p(getCmdName(), getContents(), "");
                os << escape(p.getCommand());
        }
        return 0;
@@ -72,7 +86,7 @@ int InsetRef::latex(Buffer const *, ostream & os,
 
 int InsetRef::ascii(Buffer const *, ostream & os, int) const
 {
-       os << "[" << getContents() << "]";
+       os << '[' << getContents() << ']';
        return 0;
 }
 
@@ -85,7 +99,7 @@ int InsetRef::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetRef::docbook(Buffer const *, ostream & os) const
+int InsetRef::docbook(Buffer const *, ostream & os, bool) const
 {
        if (getOptions().empty()) {
                os << "<xref linkend=\"" << getContents() << "\">";
@@ -101,17 +115,19 @@ int InsetRef::docbook(Buffer const *, ostream & os) const
 void InsetRef::validate(LaTeXFeatures & features) const
 {
        if (getCmdName() == "vref" || getCmdName() == "vpageref")
-               features.varioref = true;
+               features.require("varioref");
        else if (getCmdName() == "prettyref")
-               features.prettyref = true;
+               features.require("prettyref");
 }
 
+
 InsetRef::type_info InsetRef::types[] = {
-       { "ref",        N_("Standard"),                 N_("Ref: ")},
-       { "pageref",    N_("Page Number"),              N_("Page: ")},
-       { "vpageref",   N_("Textual Page Number"),      N_("TextPage: ")},
-       { "vref",       N_("Standard+Textual Page"),    N_("Ref+Text: ")},
-       { "prettyref",  N_("PrettyRef"),                N_("PrettyRef: ")},
+       { "ref",       N_("Standard"),              N_("Ref: ")},
+       { "eqref",     N_("Equation"),              N_("EqRef: ")},
+       { "pageref",   N_("Page Number"),           N_("Page: ")},
+       { "vpageref",  N_("Textual Page Number"),   N_("TextPage: ")},
+       { "vref",      N_("Standard+Textual Page"), N_("Ref+Text: ")},
+       { "prettyref", N_("PrettyRef"),             N_("PrettyRef: ")},
        { "", "", "" }
 };