fix #832

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 78f6a73fa74391a65a6bca8a73768c654f251e60..2acaa173d1cef1fdd7752023d47b7ccf055b3501 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -1,35 +1,29 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 the LyX Team.
+/**
+ * \file insetgraphics.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss <voss@lyx.org>
- * ====================================================== */
+ * \author Herbert Voss
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "graphics/GraphicsTypes.h"
 #include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
-// We need a signal here to hide an active dialog when we are deleted.
-#include "sigc++/signal_system.h"
+
+#include <boost/signals/trackable.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class Dialogs;
 class LaTeXFeatures;
 
 ///
-class InsetGraphics : public Inset, public SigC::Object {
+class InsetGraphics : public Inset, public boost::signals::trackable {
 public:
        ///
        InsetGraphics();
@@ -39,17 +33,15 @@ public:
        ///
        ~InsetGraphics();
        ///
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
+       ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
        int descent(BufferView *, LyXFont const &) const;
        ///
        int width(BufferView *, LyXFont const &) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
-       ///
-       void edit(BufferView *, int, int, unsigned int);
-       ///
-       void edit(BufferView * bv, bool front = true);
+       void draw(BufferView *, LyXFont const &, int, float &) const;
        ///
        EDITABLE editable() const;
        ///
@@ -68,7 +60,7 @@ public:
        ///
        int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
@@ -90,24 +82,24 @@ 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.
-       */
-       SigC::Signal0<void> hideDialog;
-
 private:
-       /// Set the cached variables
-       void setCache() const;
+       /// Returns the cached BufferView.
+       BufferView * view() const;
+
+       ///
+       friend class InsetGraphicsMailer;
+
        /// Is the image ready to draw, or should we display a message instead?
-       bool drawImage() const;
+       bool imageIsDrawable() const;
+
+       /** This method is connected to cache_->statusChanged, so we are
+           informed when the image has been loaded.
+        */
+       void statusChanged();
 
        /// Read the inset native format
        void readInsetGraphics(LyXLex & lex);
-       /// Read the FigInset file format
-       void readFigInset(LyXLex & lex);
 
-       /// Update the inset after parameter change.
-       void updateInset(string const & filepath) const;
        /// Get the status message, depends on the image loading status.
        string const statusMessage() const;
        /// Create the options for the latex command.
@@ -122,13 +114,34 @@ private:
        string const graphic_label;
 
        /// The cached variables
-       mutable grfx::ImageStatus cached_status_;
+       class Cache;
+       friend class Cache;
+       /// The pointer never changes although *cache_'s contents may.
+       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_; }
        ///
-       mutable grfx::ImagePtr cached_image_;
+       virtual string const inset2string() const;
+       ///
+       static void string2params(string const &, InsetGraphicsParams &);
+       ///
+       static string const params2string(InsetGraphicsParams const &);
+private:
        ///
-       mutable bool cache_filled_;
+       static string const name_;
        ///
-       mutable int old_asc;
+       InsetGraphics & inset_;
 };
 
 #endif