Loop refactoring

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

diff --git a/src/insets/InsetGraphicsParams.h b/src/insets/InsetGraphicsParams.h
index 172215dd2263cc3293f35c52e00607b78ea5a0dc..315f4c70827bd34b0890d4473122aeaff84ecf1f 100644 (file)
--- a/src/insets/InsetGraphicsParams.h
+++ b/src/insets/InsetGraphicsParams.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.
  */
@@ -14,10 +14,12 @@
 #define INSETGRAPHICSPARAMS_H
 
 
-#include "graphics/GraphicsTypes.h"
-#include "Length.h"
+#include "graphics/GraphicsParams.h"
+
 #include "support/FileName.h"
 
+#include <string>
+
 namespace lyx {
 
 namespace graphics { class Params; }
@@ -34,8 +36,8 @@ public:
        support::DocFileName filename;
        /// Scaling the Screen inside Lyx
        unsigned int lyxscale;
-       /// How to display the image inside LyX
-       graphics::DisplayType display;
+       /// If to display the image inside LyX
+       bool display;
        /// Scaling for output (LaTeX)
        std::string scale;
        /// sizes for output (LaTeX)
@@ -46,13 +48,11 @@ public:
        bool keepAspectRatio;
        /// draft mode
        bool draft;
-       /// what to do with zipped files
-       bool noUnzip;
        /// scale image before rotating
        bool scaleBeforeRotation;
 
-       /// The bounding box with "xLB yLB yRT yRT ", divided by a space!
-       std::string bb;
+       /// The bounding box
+       graphics::BoundingBox bbox;
        /// clip image
        bool clip;
 
@@ -60,10 +60,6 @@ public:
        std::string rotateAngle;
        /// Origin point of rotation
        std::string rotateOrigin;
-       /// Do we have a subcaption?
-       bool subcaption;
-       /// The text of the subcaption.
-       std::string subcaptionText;
        /// any userdefined special command
        std::string special;
 
@@ -77,13 +73,17 @@ public:
        /// Buffer is needed to figure out if a figure is embedded.
        void Write(std::ostream & os, Buffer const & buf) const;
        /// If the token belongs to our parameters, read it.
-       bool Read(Lexer & lex, std::string const & token, std::string const & bufpath);
+       bool Read(Lexer & lex, std::string const & token, Buffer const & buf,
+                 bool allowOrigin);
        /// convert
-  // Only a subset of InsetGraphicsParams is needed for display purposes.
-  // This function also interrogates lyxrc to ascertain whether
-  // to display or not.
+       // Only a subset of InsetGraphicsParams is needed for display purposes.
+       // This function also interrogates lyxrc to ascertain whether
+       // to display or not.
        graphics::Params as_grfxParams() const;
 
+       // FIXME UNICODE. Write functions need to use odostream instead of ostream firstly.
+       /// Identification of the graphics template. No template equals empty string.
+       std::string groupId;
 private:
        /// Initialize the object to a default status.
        void init();