X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.h;h=1846c4a4e62ab655494cbef343951a608d24ae3e;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=cca885784f2814d76c9d779a6b88824466dea220;hpb=c32f7c377e17673cf97f10173f6f14077f073813;p=lyx.git

diff --git a/src/insets/InsetGraphics.h b/src/insets/InsetGraphics.h
index cca885784f..1846c4a4e6 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 Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,13 +13,10 @@
 #ifndef INSET_GRAPHICS_H
 #define INSET_GRAPHICS_H
 
-#include <set>
 #include "Inset.h"
 #include "InsetGraphicsParams.h"
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/signals/trackable.hpp>
-
+#include <set>
 
 namespace lyx {
 
@@ -33,11 +30,11 @@ class LaTeXFeatures;
 /////////////////////////////////////////////////////////////////////////
 
 /// Used for images etc.
-class InsetGraphics : public Inset, public boost::signals::trackable
+class InsetGraphics : public Inset
 {
 public:
 	///
-	InsetGraphics(Buffer & buf);
+	InsetGraphics(Buffer * buf);
 	///
 	~InsetGraphics();
 
@@ -48,16 +45,6 @@ public:
 	///
 	static std::string params2string(InsetGraphicsParams const &,
 					  Buffer const &);
-	/// Saves the list of currently used groups in the document.
-	static void getGraphicsGroups(Buffer const &, std::set<std::string> &);
-	/// Returns parameters of a given graphics group (except filename).
-	static std::string getGroupParams(Buffer const &,
-						std::string const &);
-	/** Synchronize all Graphics insets of the group.
-	    Both groupId and params are taken from argument.
-	*/
-	static void unifyGraphicsGroups(Buffer const &,	std::string const &);
-	static InsetGraphics * getCurrentGraphicsInset(Cursor const &);
 
 	/** Set the inset parameters, used by the GUIndependent dialog.
 	    Return true of new params are different from what was so far.
@@ -65,6 +52,8 @@ public:
 	bool setParams(InsetGraphicsParams const & params);
 
 	InsetGraphicsParams getParams() const { return params_;}
+	///
+	bool clickable(int, int) const { return true; }
 
 private:
 	///
@@ -74,7 +63,7 @@ private:
 	bool isLabeled() const { return true; }
 	void metrics(MetricsInfo &, Dimension &) const;
 	///
-	EDITABLE editable() const;
+	bool hasSettings() const { return true; }
 	///
 	void write(std::ostream &) const;
 	///
@@ -88,6 +77,8 @@ private:
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
+	///
+	docstring xhtml(XHTMLStream & os, OutputParams const &) const;
 	/** Tell LyX what the latex features you need i.e. what latex packages
 	    you need to be included.
 	 */
@@ -99,16 +90,16 @@ private:
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void edit(Cursor & cur, bool front, EntryDirection entry_from);
+	bool showInsetDialog(BufferView * bv) const;
 	///
-	void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
+	void editGraphics(InsetGraphicsParams const &) const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///
-	void addToToc(ParConstIterator const &) const;
+	void addToToc(DocIterator const &);
 	///
 	docstring contextMenu(BufferView const & bv, int x, int y) const;
-	/// Force inset into LTR environment if surroundings are RTL?
+	/// Force inset into LTR environment if surroundings are RTL
 	bool forceLTR() const { return true; }
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
@@ -123,16 +114,41 @@ private:
 	/// Create the atributes for docbook export.
 	docstring createDocBookAttributes() const;
 	/// Convert the file if needed, and return the location of the file.
+	/// This version is for use with LaTeX-style output.
 	std::string prepareFile(OutputParams const &) const;
+	/// Convert the file if needed, and return the location of the file.
+	/// This version is for use with HTML-style output.
+	/// \return the new filename, relative to the location of the HTML file,
+	/// or an empty string on error.
+	std::string prepareHTMLFile(OutputParams const & runparams) const;
 
 	///
 	InsetGraphicsParams params_;
 	/// holds the entity name that defines the graphics location (SGML).
 	docstring const graphic_label;
 	/// The thing that actually draws the image on LyX's screen.
-	boost::scoped_ptr<RenderGraphic> const graphic_;
+	RenderGraphic * graphic_;
 };
 
+namespace graphics {
+
+	/// Saves the list of currently used groups in the document.
+	void getGraphicsGroups(Buffer const &, std::set<std::string> &);
+
+	/// how many members has the current group?
+	int countGroupMembers(Buffer const &, std::string const &);
+
+	/// Returns parameters of a given graphics group (except filename).
+	std::string getGroupParams(Buffer const &, std::string const &);
+
+	/** Synchronize all Graphics insets of the group.
+	    Both groupId and params are taken from argument.
+	*/
+	void unifyGraphicsGroups(Buffer &, std::string const &);
+	InsetGraphics * getCurrentGraphicsInset(Cursor const &);
+
+}
+
 } // namespace lyx
 
 #endif // INSET_GRAPHICS_H