Change string

[lyx.git] / src / insets / InsetCommand.cpp

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 6593171920e953024e378accd9fecc53d2c2344d..c1fa7b6f06dec976503e20745de174fa11d9a0df 100644 (file)
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -35,8 +35,7 @@ InsetCommand::InsetCommand(InsetCommandParams const & p,
                           string const & mailer_name)
        : p_(p),
          mailer_name_(mailer_name),
-         mouse_hover_(false),
-         updateButtonLabel_(true)
+         mouse_hover_(false)
 {}
 
 
@@ -49,11 +48,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (updateButtonLabel_) {
-               updateButtonLabel_ = false;
-               button_.update(getScreenLabel(mi.base.bv->buffer()),
-                              editable() != NOT_EDITABLE);
-       }
+       button_.update(screenLabel(), editable() != NOT_EDITABLE);
        button_.metrics(mi, dim);
 }
 
@@ -75,29 +70,27 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 void InsetCommand::setParams(InsetCommandParams const & p)
 {
        p_ = p;
-       updateButtonLabel_ = true;
+       initView();
 }
 
 
-int InsetCommand::latex(Buffer const &, odocstream & os,
-                       OutputParams const &) const
+int InsetCommand::latex(odocstream & os, OutputParams const &) const
 {
        os << getCommand();
        return 0;
 }
 
 
-int InsetCommand::plaintext(Buffer const & buf, odocstream & os,
-                           OutputParams const &) const
+int InsetCommand::plaintext(odocstream & os, OutputParams const &) const
 {
-       docstring const str = "[" + buf.B_("LaTeX Command: ") + from_utf8(getCmdName()) + "]";
+       docstring const str = "[" + buffer().B_("LaTeX Command: ")
+               + from_utf8(getCmdName()) + "]";
        os << str;
        return str.size();
 }
 
 
-int InsetCommand::docbook(Buffer const &, odocstream &,
-                         OutputParams const &) const
+int InsetCommand::docbook(odocstream &, OutputParams const &) const
 {
        return 0;
 }
@@ -106,10 +99,6 @@ int InsetCommand::docbook(Buffer const &, odocstream &,
 void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
-       case LFUN_INSET_REFRESH:
-               updateButtonLabel_ = true;
-               break;
-
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(p_.code());
                InsetCommandMailer::string2params(mailer_name_, to_utf8(cmd.argument()), p);
@@ -127,7 +116,7 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_MOUSE_RELEASE: {
-               if (!cur.selection())
+               if (!cur.selection() && cmd.button() != mouse_button::button3)
                        edit(cur, true);
                break;
        }
@@ -149,7 +138,6 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
                status.enabled(false);
                return true;
        // we handle these
-       case LFUN_INSET_REFRESH:
        case LFUN_INSET_MODIFY:
        case LFUN_INSET_DIALOG_UPDATE:
                status.enabled(true);
@@ -160,7 +148,13 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetCommand::edit(Cursor & cur, bool, EntryDirectionType)
+docstring InsetCommand::contextMenu(BufferView const &, int, int) const
+{
+       return from_ascii("context-") + from_ascii(mailer_name_);
+}
+
+
+void InsetCommand::edit(Cursor & cur, bool, EntryDirection)
 {
        if (!mailer_name_.empty())
                InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());