#include "support/debug.h"
#include "support/Translator.h"
+#include "frontends/Application.h"
+
#include <sstream>
using namespace std;
typedef Translator<string, InsetBox::BoxType> BoxTranslator;
typedef Translator<docstring, InsetBox::BoxType> BoxTranslatorLoc;
-BoxTranslator const init_boxtranslator()
+BoxTranslator initBoxtranslator()
{
BoxTranslator translator("Boxed", InsetBox::Boxed);
translator.addPair("Frameless", InsetBox::Frameless);
}
-BoxTranslatorLoc const init_boxtranslator_loc()
+BoxTranslatorLoc initBoxtranslatorLoc()
{
BoxTranslatorLoc translator(_("simple frame"), InsetBox::Boxed);
translator.addPair(_("frameless"), InsetBox::Frameless);
BoxTranslator const & boxtranslator()
{
- static BoxTranslator translator = init_boxtranslator();
+ static BoxTranslator translator = initBoxtranslator();
return translator;
}
BoxTranslatorLoc const & boxtranslator_loc()
{
- static BoxTranslatorLoc translator = init_boxtranslator_loc();
+ static BoxTranslatorLoc translator = initBoxtranslatorLoc();
return translator;
}
-} // anon
+} // namespace anon
+
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetBox
+//
+/////////////////////////////////////////////////////////////////////////
InsetBox::InsetBox(Buffer const & buffer, string const & label)
: InsetCollapsable(buffer), params_(label)
InsetBox::~InsetBox()
{
- InsetBoxMailer(*this).hideDialog();
+ hideDialogs("box", this);
}
// FIXME: UNICODE
string name = "Box";
if (boxtranslator().find(params_.type) == Shaded)
- name += string(":Shaded");
+ name += ":Shaded";
return from_ascii(name);
}
label += _("Parbox");
else
label += _("Minipage");
- } else
+ } else {
label += boxtranslator_loc().find(btype);
+ }
label += ")";
setLabel(label);
bool InsetBox::forceEmptyLayout(idx_type) const
{
- return !params_.inner_box;
+ return !params_.inner_box && params_.type != "Framed";
}
bool InsetBox::showInsetDialog(BufferView * bv) const
{
- InsetBoxMailer(const_cast<InsetBox &>(*this)).showDialog(bv);
+ bv->showDialog("box", params2string(params_),
+ const_cast<InsetBox *>(this));
return true;
}
case LFUN_INSET_MODIFY: {
//lyxerr << "InsetBox::dispatch MODIFY" << endl;
- InsetBoxMailer::string2params(to_utf8(cmd.argument()), params_);
+ if (cmd.getArg(0) == "changetype")
+ params_.type = cmd.getArg(1);
+ else
+ string2params(to_utf8(cmd.argument()), params_);
setLayout(cur.buffer().params());
break;
}
case LFUN_INSET_DIALOG_UPDATE:
- InsetBoxMailer(*this).updateDialog(&cur.bv());
- break;
-
- case LFUN_MOUSE_RELEASE:
- if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
- InsetBoxMailer(*this).showDialog(&cur.bv());
- break;
- }
- InsetCollapsable::doDispatch(cur, cmd);
+ cur.bv().updateDialog("box", params2string(params_));
break;
default:
switch (cmd.action) {
case LFUN_INSET_MODIFY:
+ if (cmd.getArg(0) == "changetype")
+ flag.setOnOff(cmd.getArg(1) == params_.type);
+ flag.setEnabled(true);
+ return true;
+
case LFUN_INSET_DIALOG_UPDATE:
- flag.enabled(true);
+ flag.setEnabled(true);
return true;
+
case LFUN_BREAK_PARAGRAPH:
- if (params_.inner_box) {
+ if (params_.inner_box || params_.type == "Framed")
return InsetCollapsable::getStatus(cur, cmd, flag);
- } else {
- flag.enabled(false);
- return true;
- }
+ flag.setEnabled(false);
+ return true;
default:
return InsetCollapsable::getStatus(cur, cmd, flag);
if (params_.use_parbox)
os << "{";
os << "%\n";
- i += 1;
+ ++i;
}
- if (btype == Shaded)
+ if (btype == Shaded) {
os << "\\begin{shaded}%\n";
- i += 1;
+ ++i;
+ }
i += InsetText::latex(os, runparams);
}
-InsetBoxMailer::InsetBoxMailer(InsetBox & inset)
- : inset_(inset)
-{}
-
-
-string const InsetBoxMailer::name_ = "box";
-
-
-string const InsetBoxMailer::inset2string(Buffer const &) const
+docstring InsetBox::contextMenu(BufferView const &, int, int) const
{
- return params2string(inset_.params());
+ return from_ascii("context-box");
}
-string const InsetBoxMailer::params2string(InsetBoxParams const & params)
+string InsetBox::params2string(InsetBoxParams const & params)
{
ostringstream data;
data << "box" << ' ';
}
-void InsetBoxMailer::string2params(string const & in,
- InsetBoxParams & params)
+void InsetBox::string2params(string const & in, InsetBoxParams & params)
{
params = InsetBoxParams(string());
if (in.empty())
return;
istringstream data(in);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(data);
string name;
lex >> name;
- if (!lex || name != name_)
- return print_mailer_error("InsetBoxMailer", in, 1, name_);
+ if (!lex || name != "box") {
+ LYXERR0("InsetBox::string2params(" << in << ")\n"
+ "Expected arg 1 to be \"box\"\n");
+ return;
+ }
// This is part of the inset proper that is usually swallowed
// by Text::readInset
string id;
lex >> id;
- if (!lex || id != "Box")
- return print_mailer_error("InsetBoxMailer", in, 2, "Box");
+ if (!lex || id != "Box") {
+ LYXERR0("InsetBox::string2params(" << in << ")\n"
+ "Expected arg 2 to be \"Box\"\n");
+ }
params.read(lex);
}
+/////////////////////////////////////////////////////////////////////////
+//
+// InsetBoxParams
+//
+/////////////////////////////////////////////////////////////////////////
+
InsetBoxParams::InsetBoxParams(string const & label)
: type(label),
use_parbox(false),
void InsetBoxParams::read(Lexer & lex)
{
- if (!lex.isOK())
- return;
-
- lex.next();
- type = lex.getString();
-
- if (!lex)
- return;
-
- lex.next();
- string token;
- token = lex.getString();
- if (!lex)
- return;
- if (token == "position") {
- lex.next();
- // The [0] is needed. We need the first and only char in
- // this string -- MV
- pos = lex.getString()[0];
- } else {
- lyxerr << "InsetBox::Read: Missing 'position'-tag!" << token << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "hor_pos") {
- lex.next();
- hor_pos = lex.getString()[0];
- } else {
- lyxerr << "InsetBox::Read: Missing 'hor_pos'-tag!" << token << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "has_inner_box") {
- lex.next();
- inner_box = lex.getInteger();
- } else {
- lyxerr << "InsetBox::Read: Missing 'has_inner_box'-tag!" << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "inner_pos") {
- lex.next();
- inner_pos = lex.getString()[0];
- } else {
- lyxerr << "InsetBox::Read: Missing 'inner_pos'-tag!"
- << token << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "use_parbox") {
- lex.next();
- use_parbox = lex.getInteger();
- } else {
- lyxerr << "InsetBox::Read: Missing 'use_parbox'-tag!" << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "width") {
- lex.next();
- width = Length(lex.getString());
- } else {
- lyxerr << "InsetBox::Read: Missing 'width'-tag!" << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "special") {
- lex.next();
- special = lex.getString();
- } else {
- lyxerr << "InsetBox::Read: Missing 'special'-tag!" << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "height") {
- lex.next();
- height = Length(lex.getString());
- } else {
- lyxerr << "InsetBox::Read: Missing 'height'-tag!" << endl;
- lex.pushToken(token);
- }
-
- lex.next();
- token = lex.getString();
- if (!lex)
- return;
- if (token == "height_special") {
- lex.next();
- height_special = lex.getString();
- } else {
- lyxerr << "InsetBox::Read: Missing 'height_special'-tag!" << endl;
- lex.pushToken(token);
- }
+ lex.setContext("InsetBoxParams::read");
+ lex >> type;
+ lex >> "position" >> pos;
+ lex >> "hor_pos" >> hor_pos;
+ lex >> "has_inner_box" >> inner_box;
+ if (type == "Framed")
+ inner_box = false;
+ lex >> "inner_pos" >> inner_pos;
+ lex >> "use_parbox" >> use_parbox;
+ lex >> "width" >> width;
+ lex >> "special" >> special;
+ lex >> "height" >> height;
+ lex >> "height_special" >> height_special;
}
projects / lyx.git / blobdiff