X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetExternal.h;h=f124445f5eea4723d50612b0f6abb2bf361365d9;hb=f24bb4a91980a17c00c12ec0bbb457e0f182215f;hp=2e28c6115a974eb9f8b29eb4a20741005e686e5c;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git diff --git a/src/insets/InsetExternal.h b/src/insets/InsetExternal.h index 2e28c6115a..f124445f5e 100644 --- a/src/insets/InsetExternal.h +++ b/src/insets/InsetExternal.h @@ -17,10 +17,12 @@ #include "ExternalTemplate.h" #include "support/FileName.h" +#include "support/unique_ptr.h" -#include -#include +namespace lyx { + +namespace external { /** No two InsetExternalParams variables can have the same temporary file. * This class has copy-semantics but the copy constructor @@ -29,17 +31,13 @@ * copy constructor and assignment operator for the * InsetExternalParams class. */ -namespace lyx { - -namespace external { - class TempName { public: TempName(); TempName(TempName const &); ~TempName(); TempName & operator=(TempName const &); - support::FileName const & operator()() const { return tempname_; } + support::FileName operator()() const; private: support::FileName tempname_; }; @@ -56,7 +54,7 @@ public: bool read(Buffer const &, Lexer &); /// The name of the tempfile used for manipulations. - support::FileName const & tempname() const { return tempname_(); } + support::FileName tempname() const { return tempname_(); } /// The template currently in use. void settemplate(std::string const &); @@ -90,10 +88,13 @@ private: class RenderBase; /// -class InsetExternal : public Inset, public boost::signals::trackable +class InsetExternal : public Inset { + // Disable assignment operator, since it is not used, and it is too + // complicated to implement it consistently with the copy constructor + InsetExternal & operator=(InsetExternal const &); public: - InsetExternal(Buffer *); + explicit InsetExternal(Buffer *); /// ~InsetExternal(); /// @@ -107,62 +108,80 @@ public: /// void setParams(InsetExternalParams const &); /// Update not loaded previews - void updatePreview(); + void updatePreview() const; /// \returns the number of rows (\n's) of generated code. - int latex(otexstream &, OutputParams const &) const; + void latex(otexstream &, OutputParams const &) const override; /// - docstring contextMenuName() const; + std::string contextMenuName() const override; /// - bool setMouseHover(BufferView const * bv, bool mouse_hover); + bool setMouseHover(BufferView const * bv, bool mouse_hover) const override; /// - bool clickable(int, int) const { return true; } -private: + bool clickable(BufferView const &, int, int) const override { return true; } /// - InsetExternal(InsetExternal const &); + void addToToc(DocIterator const & di, bool output_active, + UpdateType utype, TocBackend & backend) const override; + /// + InsetCode lyxCode() const override { return EXTERNAL_CODE; } + /// + bool hasSettings() const override { return true; } + + /// + int topOffset(BufferView const *) const override { return 0; } + /// + int bottomOffset(BufferView const *) const override { return 0; } /// - InsetCode lyxCode() const { return EXTERNAL_CODE; } + int leftOffset(BufferView const *) const override { return 0; } /// - bool hasSettings() const { return true; } + int rightOffset(BufferView const *) const override { return 0; } + + /// + void metrics(MetricsInfo &, Dimension &) const override; /// - void metrics(MetricsInfo &, Dimension &) const; + void draw(PainterInfo & pi, int x, int y) const override; /// - void draw(PainterInfo & pi, int x, int y) const; + void write(std::ostream &) const override; /// - void write(std::ostream &) const; + void read(Lexer & lex) override; /// - void read(Lexer & lex); + int plaintext(odocstringstream & ods, OutputParams const & op, + size_t max_length = INT_MAX) const override; /// - int plaintext(odocstream &, OutputParams const &) const; + void generateXML(XMLStream &, OutputParams const &, std::string const &) const; /// - int docbook(odocstream &, OutputParams const &) const; + void docbook(XMLStream &, OutputParams const &) const override; /// For now, this does nothing. Someone who knows about this /// should see what needs doing for XHTML output. - docstring xhtml(XHTMLStream &, OutputParams const &) const; + docstring xhtml(XMLStream &, OutputParams const &) const override; /// Update needed features for this inset. - void validate(LaTeXFeatures & features) const; + void validate(LaTeXFeatures & features) const override; /// - void addPreview(DocIterator const &, graphics::PreviewLoader &) const; + void addPreview(DocIterator const &, graphics::PreviewLoader &) const override; /// - bool showInsetDialog(BufferView * bv) const; + bool showInsetDialog(BufferView * bv) const override; /// - bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const; + bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const override; /// - void doDispatch(Cursor & cur, FuncRequest & cmd); + void doDispatch(Cursor & cur, FuncRequest & cmd) override; /// - Inset * clone() const { return new InsetExternal(*this); } - /** This method is connected to the graphics loader, so we are - * informed when the image has been loaded. - */ - void statusChanged() const; + Inset * clone() const override { return new InsetExternal(*this); } /** Slot receiving a signal that the external file has changed * and the preview should be regenerated. */ void fileChanged() const; +private: + /// + InsetExternal(InsetExternal const &); + + /// Is this inset using (instant or graphics) preview? + bool isPreviewed() const; + /// Do we have the right renderer (button, graphic or monitored preview)? + bool isRendererValid() const; + /// The current params InsetExternalParams params_; /// The thing that actually draws the image on LyX's screen. - boost::scoped_ptr renderer_; + mutable unique_ptr renderer_; /// changes color of the button when mouse enters/leaves this inset mutable std::map mouse_hover_; };