Rename LatexRunParams::fragile as moving_arg.

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 412c1dcafc99c2fb5528d2061bfe5e9093407fc2..507dd08ccb373337d4fd198b039fe45e27a9e59c 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -13,13 +13,9 @@
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
-
-
 #include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
 
-// We need a signal here to hide an active dialog when we are deleted.
-#include <boost/signals/signal0.hpp>
 #include <boost/signals/trackable.hpp>
 #include <boost/scoped_ptr.hpp>
 
@@ -37,17 +33,11 @@ public:
        ///
        ~InsetGraphics();
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       int width(BufferView *, LyXFont const &) const;
+       void dimension(BufferView *, LyXFont const &, Dimension &) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
-       ///
-       void edit(BufferView *, int, int, mouse_button::state);
-       ///
-       void edit(BufferView * bv, bool front = true);
+       void draw(BufferView *, LyXFont const &, int, float &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -60,7 +50,7 @@ public:
         fragile commands by adding a #\protect# before.
         */
        int latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+                 LatexRunParams const &) const;
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
@@ -88,12 +78,13 @@ public:
        /// Get the inset parameters, used by the GUIndependent dialog.
        InsetGraphicsParams const & params() const;
 
-       /** This signal is connected by our dialog and called when the inset
-           is deleted.
-       */
-       boost::signal0<void> hideDialog;
-
 private:
+       /// Returns the cached BufferView.
+       BufferView * view() const;
+
+       ///
+       friend class InsetGraphicsMailer;
+
        /// Is the image ready to draw, or should we display a message instead?
        bool imageIsDrawable() const;
 
@@ -110,7 +101,7 @@ private:
        /// Create the options for the latex command.
        string const createLatexOptions() const;
        /// Convert the file if needed, and return the location of the file.
-       string const prepareFile(Buffer const * buf) const;
+       string const prepareFile(Buffer const * buf, LatexRunParams const &) const;
 
        ///
        InsetGraphicsParams params_;
@@ -125,4 +116,28 @@ private:
        boost::scoped_ptr<Cache> const cache_;
 };
 
+
+#include "mailinset.h"
+
+class InsetGraphicsMailer : public MailInset {
+public:
+       ///
+       InsetGraphicsMailer(InsetGraphics & inset);
+       ///
+       virtual InsetBase & inset() const { return inset_; }
+       ///
+       virtual string const & name() const { return name_; }
+       ///
+       virtual string const inset2string() const;
+       ///
+       static void string2params(string const &, InsetGraphicsParams &);
+       ///
+       static string const params2string(InsetGraphicsParams const &);
+private:
+       ///
+       static string const name_;
+       ///
+       InsetGraphics & inset_;
+};
+
 #endif