#include "DispatchResult.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "support/gettext.h"
#include "Lexer.h"
#include "MetricsInfo.h"
+#include "support/debug.h"
+#include "support/gettext.h"
+
+#include "frontends/Application.h"
+
#include <sstream>
using namespace std;
-namespace lyx {
+namespace lyx {
// FIXME Would it now be possible to use the InsetCode in
// place of the mailer name and recover that information?
InsetCommand::~InsetCommand()
{
if (!mailer_name_.empty())
- InsetCommandMailer(mailer_name_, *this).hideDialog();
+ hideDialogs(mailer_name_, this);
}
}
+void InsetCommand::setParam(std::string const & name, docstring const & value)
+{
+ p_[name] = value;
+}
+
+
+docstring const & InsetCommand::getParam(std::string const & name) const
+{
+ return p_[name];
+}
+
+
void InsetCommand::setParams(InsetCommandParams const & p)
{
p_ = p;
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
+ if (cmd.getArg(0) == "changetype") {
+ p_.setCmdName(cmd.getArg(1));
+ initView();
+ break;
+ }
InsetCommandParams p(p_.code());
- InsetCommandMailer::string2params(mailer_name_, to_utf8(cmd.argument()), p);
+ InsetCommand::string2params(mailer_name_, to_utf8(cmd.argument()), p);
if (p.getCmdName().empty())
cur.noUpdate();
else
case LFUN_INSET_DIALOG_UPDATE: {
string const name = to_utf8(cmd.argument());
- InsetCommandMailer(name, *this).updateDialog(&cur.bv());
+ cur.bv().updateDialog(name, params2string(name, params()));
break;
}
switch (cmd.action) {
// suppress these
case LFUN_ERT_INSERT:
- status.enabled(false);
+ status.setEnabled(false);
return true;
// we handle these
case LFUN_INSET_MODIFY:
+ if (cmd.getArg(0) == "changetype") {
+ string const newtype = cmd.getArg(1);
+ status.setEnabled(p_.isCompatibleCommand(p_.code(), newtype));
+ status.setOnOff(newtype == p_.getCmdName());
+ }
+ status.setEnabled(true);
+ return true;
case LFUN_INSET_DIALOG_UPDATE:
- status.enabled(true);
+ status.setEnabled(true);
return true;
default:
return Inset::getStatus(cur, cmd, status);
void InsetCommand::edit(Cursor & cur, bool, EntryDirection)
{
if (!mailer_name_.empty())
- InsetCommandMailer(mailer_name_, *this).showDialog(&cur.bv());
+ cur.bv().showDialog(mailer_name_, params2string(mailer_name_, p_), this);
}
-InsetCommandMailer::InsetCommandMailer(
- string const & name, InsetCommand & inset)
- : name_(name), inset_(inset)
-{}
-
-
-string const InsetCommandMailer::inset2string(Buffer const &) const
-{
- return params2string(name(), inset_.params());
-}
-
-
-//FIXME This could take an InsetCode instead of a string
-bool InsetCommandMailer::string2params(
- string const & name, string const & in, InsetCommandParams & params)
+// FIXME This could take an InsetCode instead of a string
+bool InsetCommand::string2params(string const & name, string const & in,
+ InsetCommandParams & params)
{
params.clear();
if (in.empty())
return false;
-
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
-
- string n;
- lex >> n;
- if (!lex || n != name) {
- print_mailer_error("InsetCommandMailer", in, 1, name);
- return false;
- }
-
- // This is part of the inset proper that is usually swallowed
- // by Text::readInset
- string id;
- lex >> id;
- if (!lex || id != "CommandInset") {
- print_mailer_error("InsetCommandMailer", in, 2, "LatexCommand");
- return false;
- }
-
+ lex.setContext("InsetCommand::string2params");
+ lex >> name.c_str(); // check for name
+ lex >> "CommandInset";
params.read(lex);
return true;
}
-//FIXME This could take an InsetCode instead of a string
-string const
-InsetCommandMailer::params2string(string const & name,
+// FIXME This could take an InsetCode instead of a string
+string InsetCommand::params2string(string const & name,
InsetCommandParams const & params)
{
ostringstream data;