X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=f1b49923e3742b58986f86fd3c43a9f34ec36c32;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=8fcadf9458b71e12a0bf85a4adb5c8622fae2495;hpb=75999ba650ec5cb40ae31aae4ea1eb817929d09b;p=lyx.git diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp index 8fcadf9458..f1b49923e3 100644 --- a/src/insets/InsetWrap.cpp +++ b/src/insets/InsetWrap.cpp @@ -12,6 +12,7 @@ #include #include "InsetWrap.h" +#include "InsetCaption.h" #include "Buffer.h" #include "BufferParams.h" @@ -23,24 +24,26 @@ #include "FloatList.h" #include "FuncRequest.h" #include "FuncStatus.h" +#include "InsetList.h" #include "LaTeXFeatures.h" #include "Lexer.h" -#include "OutputParams.h" #include "TextClass.h" #include "TocBackend.h" #include "support/convert.h" -#include "support/docstream.h" #include "support/debug.h" +#include "support/docstream.h" #include "support/gettext.h" +#include "frontends/Application.h" + using namespace std; -namespace lyx { +namespace lyx { InsetWrap::InsetWrap(Buffer const & buf, string const & type) - : InsetCollapsable(buf), name_(from_utf8(type)) + : InsetCollapsable(buf) { setLabel(_("wrap: ") + floatName(type, buf.params())); params_.type = type; @@ -53,7 +56,24 @@ InsetWrap::InsetWrap(Buffer const & buf, string const & type) InsetWrap::~InsetWrap() { - InsetWrapMailer(*this).hideDialog(); + hideDialogs("wrap", this); +} + + +docstring InsetWrap::name() const +{ + return from_utf8(params_.type); +} + + +docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const +{ + OutputParams rp(&buffer().params().encoding()); + docstring default_tip = InsetCollapsable::toolTip(bv, x, y); + docstring caption_tip = getCaptionText(rp); + if (!isOpen() && !caption_tip.empty()) + return caption_tip + '\n' + default_tip; + return default_tip; } @@ -62,7 +82,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) switch (cmd.action) { case LFUN_INSET_MODIFY: { InsetWrapParams params; - InsetWrapMailer::string2params(to_utf8(cmd.argument()), params); + InsetWrap::string2params(to_utf8(cmd.argument()), params); params_.lines = params.lines; params_.placement = params.placement; params_.overhang = params.overhang; @@ -71,18 +91,9 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_INSET_DIALOG_UPDATE: - InsetWrapMailer(*this).updateDialog(&cur.bv()); + cur.bv().updateDialog("wrap", params2string(params())); break; - case LFUN_MOUSE_RELEASE: { - if (cmd.button() == mouse_button::button3 && hitButton(cmd)) { - InsetWrapMailer(*this).showDialog(&cur.bv()); - break; - } - InsetCollapsable::doDispatch(cur, cmd); - break; - } - default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -96,7 +107,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: - flag.enabled(true); + flag.setEnabled(true); return true; default: @@ -124,58 +135,20 @@ void InsetWrap::updateLabels(ParIterator const & it) void InsetWrapParams::write(ostream & os) const { os << "Wrap " << type << '\n'; - os << "lines " << lines << "\n"; - os << "placement " << placement << "\n"; - os << "overhang " << overhang.asString() << "\n"; + os << "lines " << lines << '\n'; + os << "placement " << placement << '\n'; + os << "overhang " << overhang.asString() << '\n'; os << "width \"" << width.asString() << "\"\n"; } void InsetWrapParams::read(Lexer & lex) { - string token; - - lex >> token; - if (token == "lines") - lex >> lines; - else { - lyxerr << "InsetWrap::Read:: Missing 'lines'-tag!" - << endl; - // take countermeasures - lex.pushToken(token); - } - if (!lex) - return; - lex >> token; - if (token == "placement") - lex >> placement; - else { - lyxerr << "InsetWrap::Read:: Missing 'placement'-tag!" - << endl; - lex.pushToken(token); - } - if (!lex) - return; - lex >> token; - if (token == "overhang") { - lex.next(); - overhang = Length(lex.getString()); - } else { - lyxerr << "InsetWrap::Read:: Missing 'overhang'-tag!" - << endl; - lex.pushToken(token); - } - if (!lex) - return; - lex >> token; - if (token == "width") { - lex.next(); - width = Length(lex.getString()); - } else { - lyxerr << "InsetWrap::Read:: Missing 'width'-tag!" - << endl; - lex.pushToken(token); - } + lex.setContext("InsetWrapParams::read"); + lex >> "lines" >> lines; + lex >> "placement" >> placement; + lex >> "overhang" >> overhang; + lex >> "width" >> width; } @@ -248,7 +221,7 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const bool InsetWrap::insetAllowed(InsetCode code) const { switch(code) { - case FLOAT_CODE: + case WRAP_CODE: case FOOT_CODE: case MARGIN_CODE: return false; @@ -261,56 +234,53 @@ bool InsetWrap::insetAllowed(InsetCode code) const bool InsetWrap::showInsetDialog(BufferView * bv) const { if (!InsetText::showInsetDialog(bv)) - InsetWrapMailer(const_cast(*this)).showDialog(bv); + bv->showDialog("wrap", params2string(params()), + const_cast(this)); return true; } -string const InsetWrapMailer::name_("wrap"); - -InsetWrapMailer::InsetWrapMailer(InsetWrap & inset) - : inset_(inset) -{} - - -string const InsetWrapMailer::inset2string(Buffer const &) const +docstring InsetWrap::getCaptionText(OutputParams const & runparams) const { - return params2string(inset_.params()); + if (paragraphs().empty()) + return docstring(); + + ParagraphList::const_iterator pit = paragraphs().begin(); + for (; pit != paragraphs().end(); ++pit) { + InsetList::const_iterator it = pit->insetList().begin(); + for (; it != pit->insetList().end(); ++it) { + Inset & inset = *it->inset; + if (inset.lyxCode() == CAPTION_CODE) { + odocstringstream ods; + InsetCaption * ins = + static_cast(it->inset); + ins->getCaptionText(ods, runparams); + return ods.str(); + } + } + } + return docstring(); } -void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params) +void InsetWrap::string2params(string const & in, InsetWrapParams & params) { params = InsetWrapParams(); - 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("InsetWrapMailer", in, 1, name_); - - // This is part of the inset proper that is usually swallowed - // by Text::readInset - string id; - lex >> id; - if (!lex || id != "Wrap") - return print_mailer_error("InsetBoxMailer", in, 2, "Wrap"); - - // We have to read the type here! - lex >> params.type; + lex.setContext("InsetWrap::string2params"); + lex >> "wrap"; + lex >> "Wrap"; // Part of the inset proper, swallowed by Text::readInset + lex >> params.type; // We have to read the type here! params.read(lex); } -string const InsetWrapMailer::params2string(InsetWrapParams const & params) +string InsetWrap::params2string(InsetWrapParams const & params) { ostringstream data; - data << name_ << ' '; + data << "wrap" << ' '; params.write(data); return data.str(); }