X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=d120a58114d783aad6dacf6ce94048d0cf7dee9d;hb=1cdd5fcb6f76ef8066707c521eef0c01cead00dd;hp=80b3af3890b0d0025f454424c7aff5cfdc1c210d;hpb=0b5fe5494b3d724d369abe7f5c6505c65dd01d0c;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 80b3af3890..d120a58114 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -23,22 +23,12 @@
 #include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
-#include "LyXRC.h"
 #include "LyXAction.h"
-#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "ParagraphParameters.h"
 #include "Paragraph.h"
 #include "TextClass.h"
 
-#include "graphics/PreviewImage.h"
-
-#include "insets/RenderPreview.h"
-
-#include "frontends/alert.h"
-#include "frontends/Application.h"
-
-#include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
@@ -50,35 +40,12 @@ using namespace lyx::support;
 namespace lyx {
 
 InsetERT::InsetERT(Buffer * buf, CollapseStatus status)
-	: InsetCollapsable(buf), preview_(new RenderPreview(this))
+	: InsetCollapsable(buf)
 {
 	status_ = status;
 }
 
 
-InsetERT::InsetERT(InsetERT const & other) : InsetCollapsable(other)
-{
-	operator=(other);
-}
-
-InsetERT & InsetERT::operator=(InsetERT const & other)
-{
-	if (this == &other)
-		return *this;
-	InsetCollapsable::operator=(other);
-	buffer_ = other.buffer_;
-	preview_.reset(new RenderPreview(*other.preview_, this));
-
-	return *this;
-}
-
-
-InsetERT::~InsetERT()
-{
-	hideDialogs("ert", this);
-}
-
-
 void InsetERT::write(ostream & os) const
 {
 	os << "ERT" << "\n";
@@ -140,26 +107,33 @@ int InsetERT::docbook(odocstream & os, OutputParams const &) const
 
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
-	case LFUN_INSET_MODIFY: {
-		setStatus(cur, string2params(to_utf8(cmd.argument())));
-		break;
-	}
+	switch (cmd.action()) {
+	case LFUN_INSET_MODIFY:
+		if (cmd.getArg(0) == "ert") {
+			cur.recordUndoInset(ATOMIC_UNDO, this);
+			setStatus(cur, string2params(to_utf8(cmd.argument())));
+			break;
+		}
+		//fall-through
 	default:
 		InsetCollapsable::doDispatch(cur, cmd);
 		break;
 	}
+
 }
 
 
 bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
-		status.setEnabled(true);
-		return true;
-		
+		if (cmd.getArg(0) == "ert") {
+			status.setEnabled(true);
+			return true;
+		}
+		//fall through
+
 	default:
 		return InsetCollapsable::getStatus(cur, cmd, status);
 	}
@@ -175,14 +149,6 @@ docstring const InsetERT::buttonLabel(BufferView const & bv) const
 }
 
 
-bool InsetERT::showInsetDialog(BufferView * bv) const
-{
-	bv->showDialog("ert", params2string(status(*bv)), 
-		const_cast<InsetERT *>(this));
-	return true;
-}
-
-
 InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
 	if (in.empty())
@@ -211,89 +177,4 @@ docstring InsetERT::xhtml(XHTMLStream &, OutputParams const &) const
 	return docstring();
 }
 
-
-bool InsetERT::previewState(BufferView * bv) const
-{
-	if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
-		graphics::PreviewImage const * pimage =
-			preview_->getPreviewImage(bv->buffer());
-		return pimage && pimage->image();
-	}
-	return false;
-}
-
-
-void InsetERT::addPreview(DocIterator const & inset_pos,
-	graphics::PreviewLoader & ploader) const
-{
-	preparePreview(inset_pos);
-}
-
-
-void InsetERT::preparePreview(DocIterator const & pos) const  
-{
-	odocstringstream str;  
-	OutputParams runparams(&pos.buffer()->params().encoding());
-	latex(str, runparams);
-	docstring const snippet = str.str();
-	LYXERR(Debug::MACROS, "Preview snippet: " << snippet);  
-	preview_->addPreview(snippet, *pos.buffer());  
-}
-
-
-void InsetERT::reloadPreview(DocIterator const & pos) const
-{
-	preparePreview(pos);
-	preview_->startLoading(*pos.buffer());
-}
-
-
-bool InsetERT::notifyCursorLeaves(Cursor const & old, Cursor & cur)
-{
-	reloadPreview(old);
-	cur.updateFlags(Update::Force);
-	return InsetCollapsable::notifyCursorLeaves(old, cur);
-}
-
-
-void InsetERT::draw(PainterInfo & pi, int x, int y) const
-{
-	use_preview_ = previewState(pi.base.bv);
-
-	if (use_preview_) {
-		// one pixel gap in front
-		preview_->draw(pi, x + 1, y);
-		setPosCache(pi, x, y);
-		return;
-	}
-	InsetCollapsable::draw(pi, x, y);
-}
-
-
-Inset * InsetERT::editXY(Cursor & cur, int x, int y)
-{
-	if (use_preview_) {
-		edit(cur, true);
-		return this;
-	}
-	return InsetCollapsable::editXY(cur, x, y);
-}
-
-
-void InsetERT::metrics(MetricsInfo & mi, Dimension & dim) const
-{
-	if (previewState(mi.base.bv)) {
-		preview_->metrics(mi, dim);
-		// insert a one pixel gap in front of the formula
-		dim.wid += 1;
-		// Cache the inset dimension.
-		setDimCache(mi, dim);
-		Dimension dim_dummy = dim;
-		MetricsInfo mi_dummy = mi;
-		InsetCollapsable::metrics(mi_dummy, dim_dummy);
-		return;
-	}
-	InsetCollapsable::metrics(mi, dim);
-}
-
 } // namespace lyx