X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetwrap.C;h=570802c50d70b6371f71452d6cf531b577cd2b32;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=59e8f57aa69dc7aeaee13715a0b423c238e7b859;hpb=3e80b0b318343341c230b3fd828a5b8597c636d5;p=lyx.git diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C index 59e8f57aa6..570802c50d 100644 --- a/src/insets/insetwrap.C +++ b/src/insets/insetwrap.C @@ -21,17 +21,20 @@ #include "Floating.h" #include "FloatList.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" #include "LaTeXFeatures.h" #include "LColor.h" #include "lyxlex.h" #include "outputparams.h" #include "paragraph.h" +#include "TocBackend.h" -#include "support/std_sstream.h" -#include "support/tostr.h" +#include "support/convert.h" +namespace lyx { + using std::string; using std::endl; using std::auto_ptr; @@ -40,26 +43,10 @@ using std::ostream; using std::ostringstream; -namespace { - -// this should not be hardcoded, but be part of the definition -// of the float (JMarc) -string const caplayout("Caption"); - -string floatname(string const & type, BufferParams const & bp) -{ - FloatList const & floats = bp.getLyXTextClass().floats(); - FloatList::const_iterator it = floats[type]; - return (it == floats.end()) ? type : _(it->second.name()); -} - -} // namespace anon - - InsetWrap::InsetWrap(BufferParams const & bp, string const & type) : InsetCollapsable(bp) { - setLabel(_("wrap: ") + floatname(type, bp)); + setLabel(_("wrap: ") + floatName(type, bp)); LyXFont font(LyXFont::ALL_SANE); font.decSize(); font.decSize(); @@ -67,10 +54,7 @@ InsetWrap::InsetWrap(BufferParams const & bp, string const & type) setLabelFont(font); params_.type = type; params_.width = LyXLength(50, LyXLength::PCW); - setInsetName(type); - LyXTextClass const & tclass = bp.getLyXTextClass(); - if (tclass.hasLayout(caplayout)) - paragraphs().begin()->layout(tclass[caplayout]); + setInsetName(from_utf8(type)); } @@ -80,15 +64,14 @@ InsetWrap::~InsetWrap() } -void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd) +void InsetWrap::doDispatch(LCursor & cur, FuncRequest & cmd) { switch (cmd.action) { case LFUN_INSET_MODIFY: { InsetWrapParams params; - InsetWrapMailer::string2params(cmd.argument, params); + InsetWrapMailer::string2params(to_utf8(cmd.argument()), params); params_.placement = params.placement; params_.width = params.width; - cur.bv().update(); break; } @@ -96,13 +79,37 @@ void InsetWrap::priv_dispatch(LCursor & cur, FuncRequest & cmd) InsetWrapMailer(*this).updateDialog(&cur.bv()); 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::priv_dispatch(cur, cmd); + InsetCollapsable::doDispatch(cur, cmd); break; } } +bool InsetWrap::getStatus(LCursor & cur, FuncRequest const & cmd, + FuncStatus & flag) const +{ + switch (cmd.action) { + case LFUN_INSET_MODIFY: + case LFUN_INSET_DIALOG_UPDATE: + flag.enabled(true); + return true; + + default: + return InsetCollapsable::getStatus(cur, cmd, flag); + } +} + + void InsetWrapParams::write(ostream & os) const { os << "Wrap " << type << '\n'; @@ -116,29 +123,25 @@ void InsetWrapParams::write(ostream & os) const void InsetWrapParams::read(LyXLex & lex) { - if (lex.isOK()) { - lex.next(); - string token = lex.getString(); - if (token == "placement") { - lex.next(); - placement = lex.getString(); - } else { - // take countermeasures - lex.pushToken(token); - } + string token; + lex >> token; + if (token == "placement") + lex >> placement; + else { + // take countermeasures + lex.pushToken(token); } - if (lex.isOK()) { + if (!lex) + return; + lex >> token; + if (token == "width") { lex.next(); - string token = lex.getString(); - if (token == "width") { - lex.next(); - width = LyXLength(lex.getString()); - } else { - lyxerr << "InsetWrap::Read:: Missing 'width'-tag!" - << endl; - // take countermeasures - lex.pushToken(token); - } + width = LyXLength(lex.getString()); + } else { + lyxerr << "InsetWrap::Read:: Missing 'width'-tag!" + << endl; + // take countermeasures + lex.pushToken(token); } } @@ -164,42 +167,43 @@ void InsetWrap::validate(LaTeXFeatures & features) const } -auto_ptr InsetWrap::clone() const +auto_ptr InsetWrap::doClone() const { return auto_ptr(new InsetWrap(*this)); } -string const InsetWrap::editMessage() const +docstring const InsetWrap::editMessage() const { return _("Opened Wrap Inset"); } -int InsetWrap::latex(Buffer const & buf, ostream & os, +int InsetWrap::latex(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { - os << "\\begin{floating" << params_.type << '}'; + os << "\\begin{floating" << from_ascii(params_.type) << '}'; if (!params_.placement.empty()) - os << '[' << params_.placement << ']'; - os << '{' << params_.width.asLatexString() << "}%\n"; + os << '[' << from_ascii(params_.placement) << ']'; + os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n"; int const i = InsetText::latex(buf, os, runparams); - os << "\\end{floating" << params_.type << "}%\n"; + os << "\\end{floating" << from_ascii(params_.type) << "}%\n"; return i + 2; } -int InsetWrap::docbook(Buffer const & buf, ostream & os, +int InsetWrap::docbook(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { - os << '<' << params_.type << '>'; + // FIXME UNICODE + os << '<' << from_ascii(params_.type) << '>'; int const i = InsetText::docbook(buf, os, runparams); - os << "'; + os << "'; return i; } -bool InsetWrap::insetAllowed(InsetOld::Code code) const +bool InsetWrap::insetAllowed(InsetBase::Code code) const { switch(code) { case FLOAT_CODE: @@ -220,20 +224,19 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const } -void InsetWrap::addToToc(lyx::toc::TocList & toclist, Buffer const & buf) const +void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const { - // Now find the caption in the float... - ParagraphList::const_iterator tmp = paragraphs().begin(); - ParagraphList::const_iterator end = paragraphs().end(); - - for (; tmp != end; ++tmp) { - if (tmp->layout()->name() == caplayout) { - string const name = floatname(params_.type, buf.params()); - string const str = - tostr(toclist[name].size() + 1) - + ". " + tmp->asString(buf, false); - lyx::toc::TocItem const item(tmp->id(), 0 , str); - toclist[name].push_back(item); + ParConstIterator pit = par_const_iterator_begin(*this); + ParConstIterator end = par_const_iterator_end(*this); + + // Find a caption layout in one of the (child inset's) pars + for (; pit != end; ++pit) { + if (pit->layout()->labeltype == LABEL_SENSITIVE) { + Toc & toc = toclist[params_.type]; + docstring const str = + convert(toc.size() + 1) + + ". " + pit->asString(buf, false); + toc.push_back(TocItem(pit, 0, str)); } } } @@ -274,6 +277,8 @@ void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params) if (!lex || id != "Wrap") return print_mailer_error("InsetBoxMailer", in, 2, "Wrap"); + // We have to read the type here! + lex >> params.type; params.read(lex); } @@ -285,3 +290,6 @@ string const InsetWrapMailer::params2string(InsetWrapParams const & params) params.write(data); return data.str(); } + + +} // namespace lyx