X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetPhantom.cpp;h=19e05700230583c00abc817865004914091da473;hb=705302f6dee4e4be9ea46213aa1b0cc18be0cfb0;hp=3ba99b11332a3f6a1a48d258a74f159785217e0c;hpb=9b111ea5a6b245464f77a095b050d846e807a21a;p=lyx.git diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp index 3ba99b1133..19e0570023 100644 --- a/src/insets/InsetPhantom.cpp +++ b/src/insets/InsetPhantom.cpp @@ -28,10 +28,12 @@ #include "Lexer.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "texstream.h" #include "TextClass.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/lstrings.h" #include "support/Translator.h" #include "frontends/Application.h" @@ -70,18 +72,20 @@ PhantomTranslatorLoc const init_phantomtranslator_loc() PhantomTranslator const & phantomtranslator() { - static PhantomTranslator translator = init_phantomtranslator(); + static PhantomTranslator const translator = + init_phantomtranslator(); return translator; } PhantomTranslatorLoc const & phantomtranslator_loc() { - static PhantomTranslatorLoc translator = init_phantomtranslator_loc(); + static PhantomTranslatorLoc const translator = + init_phantomtranslator_loc(); return translator; } -} // anon +} // namespace InsetPhantomParams::InsetPhantomParams() @@ -111,8 +115,8 @@ void InsetPhantomParams::read(Lexer & lex) // ///////////////////////////////////////////////////////////////////// -InsetPhantom::InsetPhantom(Buffer const & buf, string const & label) - : InsetCollapsable(buf) +InsetPhantom::InsetPhantom(Buffer * buf, string const & label) + : InsetCollapsible(buf) { setDrawFrame(false); params_.type = phantomtranslator().find(label); @@ -125,35 +129,20 @@ InsetPhantom::~InsetPhantom() } -docstring InsetPhantom::editMessage() const -{ - return _("Opened Phantom Inset"); -} - - -docstring InsetPhantom::name() const +docstring InsetPhantom::layoutName() const { return from_ascii("Phantom:" + phantomtranslator().find(params_.type)); } -void InsetPhantom::metrics(MetricsInfo & mi, Dimension & dim) const -{ - InsetCollapsable::metrics(mi, dim); - - // cache the inset dimension - setDimCache(mi, dim); -} - - void InsetPhantom::draw(PainterInfo & pi, int x, int y) const { // draw the text - InsetCollapsable::draw(pi, x, y); + InsetCollapsible::draw(pi, x, y); // draw the inset marker drawMarkers(pi, x, y); - + // draw the arrow(s) static int const arrow_size = 4; ColorCode const origcol = pi.base.font.color(); @@ -233,14 +222,14 @@ void InsetPhantom::draw(PainterInfo & pi, int x, int y) const void InsetPhantom::write(ostream & os) const { params_.write(os); - InsetCollapsable::write(os); + InsetCollapsible::write(os); } void InsetPhantom::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCollapsible::read(lex); } @@ -261,11 +250,13 @@ bool InsetPhantom::showInsetDialog(BufferView * bv) const void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: + cur.recordUndoInset(this); string2params(to_utf8(cmd.argument()), params_); - setLayout(buffer().params()); + setButtonLabel(); + cur.forceBufferUpdate(); break; case LFUN_INSET_DIALOG_UPDATE: @@ -273,7 +264,7 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd) break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -282,10 +273,14 @@ void InsetPhantom::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: - case LFUN_INSET_SETTINGS: + if (cmd.getArg(0) == "phantom") { + InsetPhantomParams params; + string2params(to_utf8(cmd.argument()), params); + flag.setOnOff(params_.type == params.type); + } flag.setEnabled(true); return true; @@ -294,52 +289,60 @@ bool InsetPhantom::getStatus(Cursor & cur, FuncRequest const & cmd, return true; default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); } } docstring InsetPhantom::toolTip(BufferView const &, int, int) const { - OutputParams rp(&buffer().params().encoding()); - odocstringstream ods; - InsetCollapsable::plaintext(ods, rp); - docstring content_tip = ods.str(); - // shorten it if necessary - if (content_tip.size() > 200) - content_tip = content_tip.substr(0, 200) + "..."; - docstring res = phantomtranslator_loc().find(params_.type); - if (!content_tip.empty()) - res += from_ascii(": ") + content_tip; - return res; + docstring const res = phantomtranslator_loc().find(params_.type); + return toolTipText(res + from_ascii(": ")); } -int InsetPhantom::latex(odocstream & os, OutputParams const & runparams) const +void InsetPhantom::latex(otexstream & os, OutputParams const & runparams) const { - if (params_.type == InsetPhantomParams::Phantom) + if (runparams.moving_arg) + os << "\\protect"; + + switch (params_.type) { + case InsetPhantomParams::Phantom: os << "\\phantom{"; - else if (params_.type == InsetPhantomParams::HPhantom) + break; + case InsetPhantomParams::HPhantom: os << "\\hphantom{"; - else if (params_.type == InsetPhantomParams::VPhantom) + break; + case InsetPhantomParams::VPhantom: os << "\\vphantom{"; - int const i = InsetCollapsable::latex(os, runparams); + break; + default: + os << "\\phantom{"; + break; + } + InsetCollapsible::latex(os, runparams); os << "}"; - - return i; } -int InsetPhantom::plaintext(odocstream & os, - OutputParams const & runparams) const +int InsetPhantom::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t max_length) const { - if (params_.type == InsetPhantomParams::Phantom) + switch (params_.type) { + case InsetPhantomParams::Phantom: os << '[' << buffer().B_("phantom") << ":"; - else if (params_.type == InsetPhantomParams::HPhantom) + break; + case InsetPhantomParams::HPhantom: os << '[' << buffer().B_("hphantom") << ":"; - else if (params_.type == InsetPhantomParams::VPhantom) + break; + case InsetPhantomParams::VPhantom: os << '[' << buffer().B_("vphantom") << ":"; - InsetCollapsable::plaintext(os, runparams); + break; + default: + os << '[' << buffer().B_("phantom") << ":"; + break; + } + InsetCollapsible::plaintext(os, runparams, max_length); os << "]"; return PLAINTEXT_NEWLINE; @@ -348,24 +351,31 @@ int InsetPhantom::plaintext(odocstream & os, int InsetPhantom::docbook(odocstream & os, OutputParams const & runparams) const { - string cmdname; - if (params_.type == InsetPhantomParams::Phantom) - cmdname = "phantom"; - else if (params_.type == InsetPhantomParams::HPhantom) - cmdname = "phantom"; - else if (params_.type == InsetPhantomParams::VPhantom) - cmdname = "phantom"; + docstring cmdname; + switch (params_.type) { + case InsetPhantomParams::Phantom: + case InsetPhantomParams::HPhantom: + case InsetPhantomParams::VPhantom: + default: + cmdname = from_ascii("phantom"); + break; + } os << "<" + cmdname + ">"; - int const i = InsetCollapsable::docbook(os, runparams); + int const i = InsetCollapsible::docbook(os, runparams); os << ""; return i; } -docstring InsetPhantom::contextMenu(BufferView const &, int, int) const +docstring InsetPhantom::xhtml(XHTMLStream &, OutputParams const &) const +{ + return docstring(); +} + +string InsetPhantom::contextMenuName() const { - return from_ascii("context-phantom"); + return "context-phantom"; }