Added various inset functions for Jean-Marc (see Changelog). Small fix in

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

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index d0c9925b4703a7dcc866f8852444548efaab0c87..aa9dc9d6cf19fd46101fbe3ea3a0f11e6e8b765a 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 the LyX Team.
+ *           Copyright 1995-2001 the LyX Team.
  *
  * ====================================================== */
 
@@ -17,30 +17,21 @@
 #pragma interface
 #endif 
 
-#include "insets/lyxinset.h"
+#include "insets/inset.h"
 #include "insets/insetgraphicsParams.h"
 #include "graphics/GraphicsCacheItem.h"
+#include <boost/smart_ptr.hpp>
 
 #include "LaTeXFeatures.h"
 
 // We need a signal here to hide an active dialog when we are deleted.
 #include "sigc++/signal_system.h"
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-using SigC::slot;
-using SigC::Object;
-#endif 
 
 class Dialogs;
 class LyXImage;
 
 ///
-#ifdef SIGC_CXX_NAMESPACES
-class InsetGraphics : public Inset, public SigC::Object
-#else
-class InsetGraphics : public Inset, public Object
-#endif
-{
+class InsetGraphics : public Inset, public SigC::Object {
 public:
        ///
        InsetGraphics();
@@ -57,37 +48,37 @@ public:
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
        ///
-       void Edit(BufferView *, int, int, unsigned int);
+       void edit(BufferView *, int, int, unsigned int);
        ///
-       EDITABLE Editable() const;
+       EDITABLE editable() const;
        ///
-       void Write(Buffer const *, std::ostream &) const;
+       void write(Buffer const *, std::ostream &) const;
        ///
-       void Read(Buffer const *, LyXLex & lex);
+       void read(Buffer const *, LyXLex & lex);
 
        /** returns the number of rows (\n's) of generated tex code.
         #fragile == true# means, that the inset should take care about
         fragile commands by adding a #\protect# before.
         */
-       int Latex(Buffer const *, std::ostream &,
+       int latex(Buffer const *, std::ostream &,
                  bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       int docBook(Buffer const *, std::ostream &) const;
 
        /** Tell LyX what the latex features you need i.e. what latex packages
            you need to be included.
         */
-       void Validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const;
 
        /// returns LyX code associated with the inset. Used for TOC, ...)
-       Inset::Code LyxCode() const { return Inset::GRAPHICS_CODE; }
+       Inset::Code lyxCode() const { return Inset::GRAPHICS_CODE; }
 
        ///
-       Inset * Clone(Buffer const &) const;
+       virtual Inset * clone(Buffer const &, bool same_id = false) const;
 
        /** Set the inset parameters, used by the GUIndependent dialog.
            Return true of new params are different from what was so far.
@@ -100,26 +91,22 @@ public:
        /** This signal is connected by our dialog and called when the inset
            is deleted.
        */
-       Signal0 <void> hideDialog;
+       SigC::Signal0<void> hideDialog;
 
 private:
        /// Update the inset after parameter change.
        void updateInset() const;
        /// Get the status message, depends on the image loading status.
-       char const * statusMessage() const;
+       string const statusMessage() const;
        /// 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;
-
        /// The graphics cache handle.
-       mutable GraphicsCacheItem * cacheHandle;
-
-       /// The pixmap
-       mutable LyXImage * pixmap;
+       mutable boost::shared_ptr<GraphicsCacheItem> cacheHandle;
        /// is the pixmap initialized?
-       mutable bool updateImage;
-
+       mutable bool imageLoaded;
+       ///
        InsetGraphicsParams params;
 };