X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetgraphics.h;h=51ffe31ca274fdd6106ab0c4ee14c00eb876c089;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=99111e565e8b1b867cb57b9857003194010ef0d2;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 99111e565e..51ffe31ca2 100644
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voss
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -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,34 +33,28 @@ 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;
 	///
-	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 &,
-		  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,39 +71,48 @@ 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, string const & bufpath);
+	void readInsetGraphics(LyXLex & lex, std::string const & bufpath);
 
 	/// Get the status message, depends on the image loading status.
-	string const statusMessage() const;
+	std::string const statusMessage() const;
 	/// Create the options for the latex command.
-	string const createLatexOptions() const;
+	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.
-	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).
-	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:
 	///
@@ -117,21 +120,24 @@ public:
 	///
 	virtual InsetBase & inset() const { return inset_; }
 	///
-	virtual string const & name() const { return name_; }
+	virtual std::string const & name() const { return name_; }
 	///
-	virtual string const inset2string(Buffer const &) const;
+	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static void string2params(string const & data,
+	static void string2params(std::string const & data,
 				  Buffer const & buffer,
 				  InsetGraphicsParams &);
 	///
-	static string const params2string(InsetGraphicsParams const &,
+	static std::string const params2string(InsetGraphicsParams const &,
 					  Buffer const &);
 private:
 	///
-	static string const name_;
+	static std::string const name_;
 	///
 	InsetGraphics & inset_;
 };
 
+
+} // namespace lyx
+
 #endif