X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetERT.cpp;h=d120a58114d783aad6dacf6ce94048d0cf7dee9d;hb=1cdd5fcb6f76ef8066707c521eef0c01cead00dd;hp=d1e15bae8b806ddf27e1a9a8203a66d24a2baa09;hpb=6aefcd7c24e430c9dc09b4529a52841f82891acd;p=lyx.git diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp index d1e15bae8b..d120a58114 100644 --- a/src/insets/InsetERT.cpp +++ b/src/insets/InsetERT.cpp @@ -24,16 +24,11 @@ #include "Layout.h" #include "Lexer.h" #include "LyXAction.h" -#include "MetricsInfo.h" #include "OutputParams.h" #include "ParagraphParameters.h" #include "Paragraph.h" #include "TextClass.h" -#include "frontends/alert.h" -#include "frontends/Application.h" - -#include "support/debug.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -51,12 +46,6 @@ InsetERT::InsetERT(Buffer * buf, CollapseStatus status) } -InsetERT::~InsetERT() -{ - hideDialogs("ert", this); -} - - void InsetERT::write(ostream & os) const { os << "ERT" << "\n"; @@ -118,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); } @@ -153,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(this)); - return true; -} - - InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in) { if (in.empty())