Cleanup mouse/selection/context-menu interactions.

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 118c045dc220b6aa9a5c69e167661315c5fb9773..624ff4ca2ac57c574aa54a2742dc5feae2195272 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -106,31 +106,26 @@ void InsetNoteParams::read(Lexer & lex)
 }
 
 
-InsetNote::InsetNote(BufferParams const & bp, string const & label)
-       : InsetCollapsable(bp)
+/////////////////////////////////////////////////////////////////////
+//
+// InsetNode
+//
+/////////////////////////////////////////////////////////////////////
+
+InsetNote::InsetNote(Buffer const & buf, string const & label)
+       : InsetCollapsable(buf)
 {
        params_.type = notetranslator().find(label);
 }
 
 
-InsetNote::InsetNote(InsetNote const & in)
-       : InsetCollapsable(in), params_(in.params_)
-{}
-
-
 InsetNote::~InsetNote()
 {
        InsetNoteMailer(*this).hideDialog();
 }
 
 
-Inset * InsetNote::clone() const
-{
-       return new InsetNote(*this);
-}
-
-
-docstring const InsetNote::editMessage() const
+docstring InsetNote::editMessage() const
 {
        return _("Opened Note Inset");
 }
@@ -148,17 +143,17 @@ Inset::DisplayType InsetNote::display() const
 }
 
 
-void InsetNote::write(Buffer const & buf, ostream & os) const
+void InsetNote::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-void InsetNote::read(Buffer const & buf, Lexer & lex)
+void InsetNote::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(buf, lex);
+       InsetCollapsable::read(lex);
 }
 
 
@@ -202,6 +197,16 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY:
+               // disallow comment and greyed out in commands
+               flag.enabled(!cur.paragraph().layout().isCommand() ||
+                               cmd.getArg(2) == "Note");
+               if (cmd.getArg(0) == "note") {
+                       InsetNoteParams params;
+                       InsetNoteMailer::string2params(to_utf8(cmd.argument()), params);
+                       flag.setOnOff(params_.type == params.type);
+               }
+               return true;
+
        case LFUN_INSET_DIALOG_UPDATE:
                flag.enabled(true);
                return true;
@@ -211,22 +216,22 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
        }
 }
 
-void InsetNote::updateLabels(Buffer const & buf, ParIterator const & it)
+
+void InsetNote::updateLabels(ParIterator const & it)
 {
-       TextClass const & tclass = buf.params().getTextClass();
+       DocumentClass const & tclass = buffer().params().documentClass();
        Counters savecnt = tclass.counters();
-       InsetCollapsable::updateLabels(buf, it);
+       InsetCollapsable::updateLabels(it);
        tclass.counters() = savecnt;
 }
 
 
-void InsetNote::addToToc(TocList & toclist, Buffer const & /*buf*/,
-       ParConstIterator const & cpit) const
+void InsetNote::addToToc(ParConstIterator const & cpit) const
 {
        ParConstIterator pit = cpit;
        pit.push_back(*this);
 
-       Toc & toc = toclist["note"];
+       Toc & toc = buffer().tocBackend().toc("note");
        docstring str;
        str = notetranslator_loc().find(params_.type) + from_ascii(": ")
                + getNewLabel(str);
@@ -234,18 +239,17 @@ void InsetNote::addToToc(TocList & toclist, Buffer const & /*buf*/,
 }
 
 
-bool InsetNote::isMacroScope(Buffer const & buf) const
+bool InsetNote::isMacroScope() const
 {
        // LyX note has no latex output
        if (params_.type == InsetNoteParams::Note)
                return true;
 
-       return InsetCollapsable::isMacroScope(buf);
+       return InsetCollapsable::isMacroScope();
 }
 
 
-int InsetNote::latex(Buffer const & buf, odocstream & os,
-                    OutputParams const & runparams_in) const
+int InsetNote::latex(odocstream & os, OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
                return 0;
@@ -258,7 +262,7 @@ int InsetNote::latex(Buffer const & buf, odocstream & os,
        } 
 
        odocstringstream ss;
-       InsetCollapsable::latex(buf, ss, runparams);
+       InsetCollapsable::latex(ss, runparams);
        // the space after the comment in 'a[comment] b' will be eaten by the
        // comment environment since the space before b is ignored with the
        // following latex output:
@@ -281,7 +285,7 @@ int InsetNote::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetNote::plaintext(Buffer const & buf, odocstream & os,
+int InsetNote::plaintext(odocstream & os,
                         OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
@@ -293,16 +297,15 @@ int InsetNote::plaintext(Buffer const & buf, odocstream & os,
                // Ignore files that are exported inside a comment
                runparams.exportdata.reset(new ExportData);
        }
-       os << '[' << buf.B_("note") << ":\n";
-       InsetText::plaintext(buf, os, runparams);
+       os << '[' << buffer().B_("note") << ":\n";
+       InsetText::plaintext(os, runparams);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetNote::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams_in) const
+int InsetNote::docbook(odocstream & os, OutputParams const & runparams_in) const
 {
        if (params_.type == InsetNoteParams::Note)
                return 0;
@@ -315,7 +318,7 @@ int InsetNote::docbook(Buffer const & buf, odocstream & os,
                runparams.exportdata.reset(new ExportData);
        }
 
-       int const n = InsetText::docbook(buf, os, runparams);
+       int const n = InsetText::docbook(os, runparams);
 
        if (params_.type == InsetNoteParams::Comment)
                os << "\n</remark>\n";
@@ -338,6 +341,11 @@ void InsetNote::validate(LaTeXFeatures & features) const
 }
 
 
+docstring InsetNote::contextMenu(BufferView const &, int, int) const
+{
+       return from_ascii("context-note");
+}
+
 
 string const InsetNoteMailer::name_("note");
 
@@ -383,7 +391,7 @@ void InsetNoteMailer::string2params(string const & in,
        string id;
        lex >> id;
        if (!lex || id != "Note")
-               return print_mailer_error("InsetBoxMailer", in, 2, "Note");
+               return print_mailer_error("InsetNoteMailer", in, 2, "Note");
 
        params.read(lex);
 }