Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 1a3b2a9ae47737d6a031274127e4d1ca9a0b40f5..d120a58114d783aad6dacf6ce94048d0cf7dee9d 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -29,10 +29,6 @@
 #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"
 
@@ -112,14 +108,18 @@ 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;
-       }
+       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;
        }
+
 }
 
 
@@ -128,9 +128,12 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        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);
        }
@@ -140,9 +143,9 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 docstring const InsetERT::buttonLabel(BufferView const & bv) const
 {
        if (decoration() == InsetLayout::CLASSIC)
-               return isOpen(bv) ? _("TeX") : getNewLabel(_("TeX"));
+               return isOpen(bv) ? _("ERT") : getNewLabel(_("ERT"));
        else
-               return getNewLabel(_("TeX"));
+               return getNewLabel(_("ERT"));
 }