Fix mis-nomer

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

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index ea1299720d495c9e63a41d86f66597e2b06cdf73..d5e7fb324c5fc720bf6ae681c0740b115fab8059 100644 (file)
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -37,6 +37,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lstrings.h"
 #include "support/Translator.h"
 
 #include "frontends/Application.h"
@@ -63,7 +64,7 @@ NoteTranslator const init_notetranslator()
 
 NoteTranslator const & notetranslator()
 {
-       static NoteTranslator translator = init_notetranslator();
+       static NoteTranslator const translator = init_notetranslator();
        return translator;
 }
 
@@ -149,14 +150,26 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action()) {
 
-       case LFUN_INSET_MODIFY:
-               cur.recordUndoInset(ATOMIC_UNDO, this);
+       case LFUN_INSET_MODIFY: {
+               // Do not do anything if converting to the same type of Note.
+               // A quick break here is done instead of disabling the LFUN
+               // because disabling the LFUN would lead to a greyed out
+               // entry, which might confuse users.
+               // In the future, we might want to have a radio button for
+               // switching between notes.
+               InsetNoteParams params;
+               string2params(to_utf8(cmd.argument()), params);
+               if (params_.type == params.type)
+                 break;
+
+               cur.recordUndoInset(this);
                string2params(to_utf8(cmd.argument()), params_);
                setButtonLabel();
                // what we really want here is a TOC update, but that means
                // a full buffer update
                cur.forceBufferUpdate();
                break;
+       }
 
        case LFUN_INSET_DIALOG_UPDATE:
                cur.bv().updateDialog("note", params2string(params()));
@@ -195,18 +208,23 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit) const
+void InsetNote::addToToc(DocIterator const & cpit, bool output_active,
+                                                UpdateType utype) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetNote &>(*this)));
 
-       Toc & toc = buffer().tocBackend().toc("note");
        InsetLayout const & il = getLayout();
-       docstring str = translateIfPossible(il.labelstring()) + from_ascii(": ");
-       text().forToc(str, TOC_ENTRY_LENGTH);
-       toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
+       docstring str;
+       text().forOutliner(str, TOC_ENTRY_LENGTH);
+       str = translateIfPossible(il.labelstring()) + ": " + str;
+
+       shared_ptr<Toc> toc = buffer().tocBackend().toc("note");
+       toc->push_back(TocItem(pit, 0, str, output_active));
+
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit);
+       bool doing_output = output_active && producesOutput();
+       InsetCollapsable::addToToc(cpit, doing_output, utype);
 }
 
 
@@ -310,15 +328,15 @@ void InsetNote::validate(LaTeXFeatures & features) const
 {
        switch (params_.type) {
        case InsetNoteParams::Comment:
-               features.require("verbatim");
                if (features.runparams().flavor == OutputParams::HTML)
                        // we do output this but set display to "none" by default,
                        // but people might want to use it.
                        InsetCollapsable::validate(features);
+               else
+                       // Only do the requires
+                       features.useInsetLayout(getLayout());
                break;
        case InsetNoteParams::Greyedout:
-               features.require("color");
-               features.require("lyxgreyedout");
                InsetCollapsable::validate(features);
                break;
        case InsetNoteParams::Note: