Fix layout bug. Pasting text into a cell tried to set Standard layout, because

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

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index d419e136b23b17df4fa2e8978ef6eaed145e97f4..fd06239b1dd231dd04b8a92214d8d5c91246235a 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -17,22 +17,23 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "Layout.h"
-#include "LyXAction.h"
 #include "Lexer.h"
-#include "TextClass.h"
+#include "LyXAction.h"
 #include "MetricsInfo.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"
 
 #include <sstream>
@@ -42,58 +43,43 @@ using namespace lyx::support;
 
 namespace lyx {
 
-
-InsetERT::InsetERT(BufferParams const & bp, CollapseStatus status)
-       : InsetCollapsable(bp, status)
-{}
-
-
-InsetERT::InsetERT(InsetERT const & in)
-       : InsetCollapsable(in)
+InsetERT::InsetERT(Buffer const & buf, CollapseStatus status)
+       : InsetCollapsable(buf, status)
 {}
 
 
-Inset * InsetERT::clone() const
-{
-       return new InsetERT(*this);
-}
-
-
 InsetERT::~InsetERT()
 {
-       InsetERTMailer(*this).hideDialog();
+       hideDialogs("ert", this);
 }
 
 
-void InsetERT::write(Buffer const & buf, ostream & os) const
+void InsetERT::write(ostream & os) const
 {
        os << "ERT" << "\n";
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-docstring const InsetERT::editMessage() const
+docstring InsetERT::editMessage() const
 {
        return _("Opened ERT Inset");
 }
 
 
-int InsetERT::latex(Buffer const & buf, odocstream & os,
-                   OutputParams const & op) const
+int InsetERT::latex(odocstream & os, OutputParams const & op) const
 {
-       return InsetCollapsable::latex(buf, os, op);
+       return InsetCollapsable::latex(os, op);
 }
 
 
-int InsetERT::plaintext(Buffer const &, odocstream &,
-                       OutputParams const &) const
+int InsetERT::plaintext(odocstream &, OutputParams const &) const
 {
        return 0; // do not output TeX code
 }
 
 
-int InsetERT::docbook(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+int InsetERT::docbook(odocstream & os, OutputParams const &) const
 {
        // FIXME can we do the same thing here as for LaTeX?
        ParagraphList::const_iterator par = paragraphs().begin();
@@ -118,20 +104,9 @@ int InsetERT::docbook(Buffer const &, odocstream & os,
 void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        BufferParams const & bp = cur.buffer().params();
-       LayoutPtr const layout =
-                       bp.getTextClass().defaultLayout();
+       Layout const layout = bp.documentClass().plainLayout();
        //lyxerr << "\nInsetERT::doDispatch (begin): cmd: " << cmd << endl;
        switch (cmd.action) {
-
-       case LFUN_MOUSE_PRESS:
-               if (cmd.button() != mouse_button::button3)
-                       InsetCollapsable::doDispatch(cur, cmd);
-               else
-                       // This makes the cursor leave the
-                       // inset when it collapses on mouse-3
-                       cur.undispatched();
-               break;
-
        case LFUN_QUOTE_INSERT: {
                // We need to bypass the fancy quotes in Text
                FuncRequest f(LFUN_SELF_INSERT, "\"");
@@ -139,9 +114,7 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
        case LFUN_INSET_MODIFY: {
-               InsetCollapsable::CollapseStatus st;
-               InsetERTMailer::string2params(to_utf8(cmd.argument()), st);
-               setStatus(cur, st);
+               setStatus(cur, string2params(to_utf8(cmd.argument())));
                break;
        }
        default:
@@ -151,8 +124,8 @@ void InsetERT::doDispatch(Cursor & cur, FuncRequest & cmd)
                // start of an existing paragraph get the buffer language
                // and not latex_language, so we take this brute force
                // approach.
-               cur.current_font.fontInfo() = layout->font;
-               cur.real_current_font.fontInfo() = layout->font;
+               cur.current_font.fontInfo() = layout.font;
+               cur.real_current_font.fontInfo() = layout.font;
                InsetCollapsable::doDispatch(cur, cmd);
                break;
        }
@@ -168,7 +141,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_PASTE:
                case LFUN_PRIMARY_SELECTION_PASTE:
                case LFUN_QUOTE_INSERT:
-                       status.enabled(true);
+                       status.setEnabled(true);
                        return true;
 
                // this one is difficult to get right. As a half-baked
@@ -189,7 +162,7 @@ bool InsetERT::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetERT::setButtonLabel()
 {
-       if (decoration() == Classic)
+       if (decoration() == InsetLayout::Classic)
                setLabel(isOpen() ? _("ERT") : getNewLabel(_("ERT")));
        else
                setLabel(getNewLabel(_("ERT")));
@@ -211,52 +184,31 @@ void InsetERT::draw(PainterInfo & pi, int x, int y) const
 
 bool InsetERT::showInsetDialog(BufferView * bv) const
 {
-       InsetERTMailer(const_cast<InsetERT &>(*this)).showDialog(bv);
+       bv->showDialog("ert", params2string(status()), 
+               const_cast<InsetERT *>(this));
        return true;
 }
 
 
-string const InsetERTMailer::name_("ert");
-
-InsetERTMailer::InsetERTMailer(InsetERT & inset)
-       : inset_(inset)
-{}
-
-
-string const InsetERTMailer::inset2string(Buffer const &) const
+InsetCollapsable::CollapseStatus InsetERT::string2params(string const & in)
 {
-       return params2string(inset_.status());
-}
-
-
-void InsetERTMailer::string2params(string const & in,
-                                  InsetCollapsable::CollapseStatus & status)
-{
-       status = InsetCollapsable::Collapsed;
        if (in.empty())
-               return;
-
+               return Collapsed;
        istringstream data(in);
-       Lexer lex(0,0);
+       Lexer lex;
        lex.setStream(data);
-
-       string name;
-       lex >> name;
-       if (name != name_)
-               return print_mailer_error("InsetERTMailer", in, 1, name_);
-
+       lex.setContext("InsetERT::string2params");
+       lex >> "ert";
        int s;
        lex >> s;
-       if (lex)
-               status = static_cast<InsetCollapsable::CollapseStatus>(s);
+       return static_cast<CollapseStatus>(s);
 }
 
 
-string const
-InsetERTMailer::params2string(InsetCollapsable::CollapseStatus status)
+string InsetERT::params2string(CollapseStatus status)
 {
        ostringstream data;
-       data << name_ << ' ' << status;
+       data << "ert" << ' ' << status;
        return data.str();
 }