* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetgraphics.h

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 6ac5f21424e8aa62e9d98875aeef0bf76f7ff2c4..51ffe31ca274fdd6106ab0c4ee14c00eb876c089 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -15,13 +15,16 @@
 
 #include "inset.h"
 #include "insetgraphicsParams.h"
+#include "mailinset.h"
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/signals/trackable.hpp>
 
 
+namespace lyx {
+
 class Dialogs;
-class GraphicRenderer;
+class RenderGraphic;
 class LaTeXFeatures;
 
 ///
@@ -30,15 +33,9 @@ public:
        ///
        InsetGraphics();
        ///
-       InsetGraphics(InsetGraphics const &);
-       ///
        ~InsetGraphics();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
-       ///
-       void metrics(MetricsInfo &, Dimension &) const;
-       ///
-       void draw(PainterInfo & pi, int x, int y) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -50,14 +47,14 @@ public:
         #fragile == true# means, that the inset should take care about
         fragile commands by adding a #\protect# before.
         */
-       int latex(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
-       ///
-       int ascii(Buffer const &, std::ostream &, int linelen) const;
+       int latex(Buffer const &, odocstream &,
+                 OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int plaintext(Buffer const &, odocstream &,
+                 OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, odocstream &,
+                   OutputParams const &) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
@@ -65,10 +62,7 @@ public:
        void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       InsetOld::Code lyxCode() const { return InsetOld::GRAPHICS_CODE; }
-
-       ///
-       virtual std::auto_ptr<InsetBase> clone() const;
+       InsetBase::Code lyxCode() const { return InsetBase::GRAPHICS_CODE; }
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
@@ -77,15 +71,22 @@ public:
 
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
-
-private:
        ///
+       void draw(PainterInfo & pi, int x, int y) const;
+       ///
+       void edit(LCursor & cur, bool left);
+       ///
+       void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+protected:
+       InsetGraphics(InsetGraphics const &);
+       ///
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+private:
        friend class InsetGraphicsMailer;
 
-       /** This method is connected to the graphics loader, so we are
-        *  informed when the image has been loaded.
-        */
-       void statusChanged();
+       virtual std::auto_ptr<InsetBase> doClone() const;
 
        /// Read the inset native format
        void readInsetGraphics(LyXLex & lex, std::string const & bufpath);
@@ -94,22 +95,24 @@ private:
        std::string const statusMessage() const;
        /// Create the options for the latex command.
        std::string const createLatexOptions() const;
+       /// Create length values for docbook export.
+       docstring const toDocbookLength(LyXLength const & len) const;
+       /// Create the atributes for docbook export.
+       docstring const createDocBookAttributes() const;
        /// Convert the file if needed, and return the location of the file.
-       std::string const prepareFile(Buffer const & buf, LatexRunParams const &) const;
+       std::string const prepareFile(Buffer const & buf, OutputParams const &) const;
 
        ///
        InsetGraphicsParams params_;
 
        /// holds the entity name that defines the graphics location (SGML).
-       std::string const graphic_label;
+       docstring const graphic_label;
 
        /// The thing that actually draws the image on LyX's screen.
-       boost::scoped_ptr<GraphicRenderer> const graphic_;
+       boost::scoped_ptr<RenderGraphic> const graphic_;
 };
 
 
-#include "mailinset.h"
-
 class InsetGraphicsMailer : public MailInset {
 public:
        ///
@@ -134,4 +137,7 @@ private:
        InsetGraphics & inset_;
 };
 
+
+} // namespace lyx
+
 #endif