X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetgraphics.h;h=0fe0c6daff43712ada94c14974f578ae933ff2ed;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=070a096e9acd0ba48157bf15388fee8756428752;hpb=15c913fe5a896f6d53dd50a64ed83be3ed1d8dc4;p=lyx.git

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 070a096e9a..0fe0c6daff 100644
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -29,8 +29,6 @@ public:
 	///
 	InsetGraphics();
 	///
-	InsetGraphics(InsetGraphics const &);
-	///
 	~InsetGraphics();
 	///
 	void metrics(MetricsInfo &, Dimension &) const;
@@ -46,16 +44,16 @@ public:
 	 fragile commands by adding a #\protect# before.
 	 */
 	int latex(Buffer const &, std::ostream &,
-		  LatexRunParams const &) const;
+		  OutputParams const &) const;
 	///
-	int ascii(Buffer const &, std::ostream &,
-		  LatexRunParams const &) const;
+	int plaintext(Buffer const &, std::ostream &,
+		  OutputParams const &) const;
 	///
 	int linuxdoc(Buffer const &, std::ostream &,
-		     LatexRunParams const &) const;
+		     OutputParams const &) const;
 	///
 	int docbook(Buffer const &, std::ostream &,
-		    LatexRunParams const &) const;
+		    OutputParams const &) const;
 
 	/** Tell LyX what the latex features you need i.e. what latex packages
 	    you need to be included.
@@ -65,9 +63,6 @@ public:
 	/// 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;
-
 	/** Set the inset parameters, used by the GUIndependent dialog.
 	    Return true of new params are different from what was so far.
 	*/
@@ -77,19 +72,18 @@ public:
 	InsetGraphicsParams const & params() const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
+	///
+	void edit(LCursor & cur, bool left);
+	///
+	void editGraphics(InsetGraphicsParams const &, Buffer const &) const;
 protected:
+	InsetGraphics(InsetGraphics const &);
 	///
-	virtual
-	DispatchResult
-	priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
+	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() const;
+	virtual std::auto_ptr<InsetBase> doClone() const;
 
 	/// Read the inset native format
 	void readInsetGraphics(LyXLex & lex, std::string const & bufpath);
@@ -98,8 +92,12 @@ private:
 	std::string const statusMessage() const;
 	/// Create the options for the latex command.
 	std::string const createLatexOptions() const;
+	/// Create length values for docbook export.
+	std::string const toDocbookLength(LyXLength const & len) const;
+	/// Create the atributes for docbook export.
+	std::string const createDocBookAttributes() const;
 	/// Convert the file if needed, and return the location of the file.
-	std::string const prepareFile(Buffer const & buf, LatexRunParams const &) const;
+	std::string const prepareFile(Buffer const & buf, OutputParams const &) const;
 
 	///
 	InsetGraphicsParams params_;