X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FinsetgraphicsParams.h;h=130e530646a10d7fe611887922295b4f79752c6b;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=7cf32bf02c144d821ab40ee389ac24386d4624c1;hpb=e173216d0aed9ea76bbd0d2916d77259a4b93223;p=lyx.git

diff --git a/src/insets/insetgraphicsParams.h b/src/insets/insetgraphicsParams.h
index 7cf32bf02c..130e530646 100644
--- a/src/insets/insetgraphicsParams.h
+++ b/src/insets/insetgraphicsParams.h
@@ -22,8 +22,6 @@
 #include "buffer.h"
 #include "lyxlex.h"
 
-using std::ostream;
-
 /// This struct holds all the parameters needed by insetGraphics.
 struct InsetGraphicsParams
 {
@@ -36,7 +34,7 @@ struct InsetGraphicsParams
 	    NONE		// only keep a frame in place.
 	};
 	///
-	enum sizeType {
+	enum sizeType {		// for latex and/or lyx
 	    DEFAULT_SIZE,	// like none
 	    WH,			// width/height values
 	    SCALE		// percentage value
@@ -47,34 +45,42 @@ struct InsetGraphicsParams
 	bool subcaption;
 	/// The text of the subcaption.
 	string subcaptionText;
-	/// The bounding box with "xLB yLB yRT yRT ", divided by a space!
-	string bb;
+	/// Do we rotate?
+	bool rotate;
+	/// Origin point of rotation
+	string rotateOrigin;
+	/// Rotation angle.
+	float rotateAngle;
 	/// clip image 
 	bool clip;
 	/// draft mode
 	bool draft;
-	/// How to display the image
-	DisplayType display;
-	/// any userdefined special command
-	string special;
-	/// three possible values for rescaling
+	/// what to do with zipped files
+	bool noUnzip;
+	/// The bounding box with "xLB yLB yRT yRT ", divided by a space!
+	string bb;
+	/// Type of rescaling 
+	sizeType size_type;
+	/// three possible values for rescaling (latex)
 	LyXLength width;
 	///
 	LyXLength height;
 	///
 	int scale;
-	/// Type of rescaling
-	sizeType size_type;
 	/// Keep the ratio between height and width when resizing.
 	bool keepAspectRatio;
+	/// any userdefined special command
+	string special;
+	/// How to display the image inside lyx
+	DisplayType display;
 	/// the size for the view inside lyx
+	/// Typ of the LyXView, same as for latex
+	sizeType lyxsize_type;
 	LyXLength lyxwidth;
 	///
 	LyXLength lyxheight;
-	/// Origin point of rotation
-	string rotateOrigin;
-	/// Rotation angle.
-	float rotateAngle;
+	/// Typ of rescaling the Screen inside lyx
+	int lyxscale;
 	///
 	InsetGraphicsParams();
 	///
@@ -82,11 +88,9 @@ struct InsetGraphicsParams
 	///
 	InsetGraphicsParams & operator=(InsetGraphicsParams const &);
 	/// Save the parameters in the LyX format stream.
-	void Write(Buffer const * buf, ostream & os) const;
+	void Write(Buffer const * buf, std::ostream & os) const;
 	/// If the token belongs to our parameters, read it.
 	bool Read(Buffer const * buf, LyXLex & lex, string const & token);
-	/// Test the struct to make sure that all the options have legal values.
-	void testInvariant() const;
 
 private:
 	/// Initialize the object to a default status.