#include "FuncStatus.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"
namespace lyx {
-
InsetERT::InsetERT(Buffer const & buf, CollapseStatus status)
: InsetCollapsable(buf, status)
{}
InsetERT::~InsetERT()
{
- InsetERTMailer(*this).hideDialog();
+ hideDialogs("ert", this);
}
Layout const layout = bp.documentClass().emptyLayout();
//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, "\"");
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:
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
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();
}