X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNote.cpp;h=02f47ba30e78075cc6385168b9ea902bdd778d5e;hb=ebc2b1295a0464dde6c20a09ddc249c463a21c79;hp=751170897ab5f60d707e06040d8d07d1ea8ebc1c;hpb=fdbe775b9f5468e8f53dc83a66583f412b5970fb;p=lyx.git

diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index 751170897a..02f47ba30e 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -17,9 +17,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
-#include "BufferParams.h"
 #include "ColorSet.h"
-#include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "Exporter.h"
@@ -37,6 +35,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"
@@ -68,7 +67,7 @@ NoteTranslator const & notetranslator()
 }
 
 
-} // anon
+} // namespace
 
 
 InsetNoteParams::InsetNoteParams()
@@ -99,7 +98,7 @@ void InsetNoteParams::read(Lexer & lex)
 /////////////////////////////////////////////////////////////////////
 
 InsetNote::InsetNote(Buffer * buf, string const & label)
-	: InsetCollapsable(buf)
+	: InsetCollapsible(buf)
 {
 	params_.type = notetranslator().find(label);
 }
@@ -126,14 +125,14 @@ Inset::DisplayType InsetNote::display() const
 void InsetNote::write(ostream & os) const
 {
 	params_.write(os);
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
 void InsetNote::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCollapsible::read(lex);
 }
 
 
@@ -149,21 +148,33 @@ 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()));
 		break;
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -175,9 +186,6 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
-		// disallow comment and greyed out in commands
-		flag.setEnabled(!cur.paragraph().layout().isCommand() ||
-				cmd.getArg(2) == "Note");
 		if (cmd.getArg(0) == "note") {
 			InsetNoteParams params;
 			string2params(to_utf8(cmd.argument()), params);
@@ -190,35 +198,18 @@ bool InsetNote::getStatus(Cursor & cur, FuncRequest const & cmd,
 		return true;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 }
 
 
-void InsetNote::addToToc(DocIterator const & cpit, bool output_active) 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, output_active, toolTipText(docstring(), 3, 60)));
-
-	// Proceed with the rest of the inset.
-	bool doing_output = output_active && producesOutput();
-	InsetCollapsable::addToToc(cpit, doing_output);
-}
-
-
 bool InsetNote::isMacroScope() const
 {
 	// LyX note has no latex output
 	if (params_.type == InsetNoteParams::Note)
 		return true;
 
-	return InsetCollapsable::isMacroScope();
+	return InsetCollapsible::isMacroScope();
 }
 
 
@@ -232,7 +223,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 		runparams.inComment = true;
 		// Ignore files that are exported inside a comment
 		runparams.exportdata.reset(new ExportData);
-	} 
+	}
 
 	// 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
@@ -249,7 +240,7 @@ void InsetNote::latex(otexstream & os, OutputParams const & runparams_in) const
 	// insets whose InsetLayout Display tag is false. This is achieved
 	// by telling otexstream to protect an immediately following space
 	// and is done for both comment and greyedout insets.
-	InsetCollapsable::latex(os, runparams);
+	InsetCollapsible::latex(os, runparams);
 
 	runparams_in.encoding = runparams.encoding;
 }
@@ -304,7 +295,7 @@ docstring InsetNote::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	if (params_.type == InsetNoteParams::Note)
 		return docstring();
 
-	return InsetCollapsable::xhtml(xs, rp);
+	return InsetCollapsible::xhtml(xs, rp);
 }
 
 
@@ -312,16 +303,16 @@ 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);
+			InsetCollapsible::validate(features);
+		else
+			// Only do the requires
+			features.useInsetLayout(getLayout());
 		break;
 	case InsetNoteParams::Greyedout:
-		features.require("color");
-		features.require("lyxgreyedout");
-		InsetCollapsable::validate(features);
+		InsetCollapsible::validate(features);
 		break;
 	case InsetNoteParams::Note:
 		break;