Cleanup mouse/selection/context-menu interactions.

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

diff --git a/src/insets/InsetGraphicsParams.cpp b/src/insets/InsetGraphicsParams.cpp
index c9a01e5ca420d8653b2173a537633aa07d42af61..16130e7c6a1c73977a98945479d4337c58380558 100644 (file)
--- a/src/insets/InsetGraphicsParams.cpp
+++ b/src/insets/InsetGraphicsParams.cpp
@@ -13,7 +13,6 @@
 
 #include "InsetGraphicsParams.h"
 
-#include "debug.h"
 #include "LyX.h" // for use_gui
 #include "Lexer.h"
 #include "LyXRC.h"
@@ -23,21 +22,18 @@
 #include "graphics/GraphicsTypes.h"
 
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
 #include "support/Translator.h"
 
+#include <ostream>
 
-namespace lyx {
-
-using support::float_equal;
-using support::readBB_from_PSFile;
-using support::token;
-using support::DocFileName;
+using namespace std;
+using namespace lyx::support;
 
-using std::string;
-using std::ostream;
+namespace lyx {
 
 
 InsetGraphicsParams::InsetGraphicsParams()
@@ -55,14 +51,12 @@ InsetGraphicsParams::InsetGraphicsParams(InsetGraphicsParams const & igp)
 }
 
 
-InsetGraphicsParams &
-InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
+void InsetGraphicsParams::operator=(InsetGraphicsParams const & params)
 {
        // Are we assigning the object into itself?
        if (this == &params)
-               return *this;
+               return;
        copy(params);
-       return *this;
 }
 
 
@@ -84,8 +78,6 @@ void InsetGraphicsParams::init()
 
        rotateAngle = "0";              // angle of rotation in degrees
        rotateOrigin.erase();           // Origin of rotation
-       subcaption = false;             // subfigure
-       subcaptionText.erase();         // subfigure caption
        special.erase();                // additional userdefined stuff
 }
 
@@ -108,8 +100,6 @@ void InsetGraphicsParams::copy(InsetGraphicsParams const & igp)
 
        rotateAngle = igp.rotateAngle;
        rotateOrigin = igp.rotateOrigin;
-       subcaption = igp.subcaption;
-       subcaptionText = igp.subcaptionText;
        special = igp.special;
 }
 
@@ -133,8 +123,6 @@ bool operator==(InsetGraphicsParams const & left,
 
            left.rotateAngle == right.rotateAngle &&
            left.rotateOrigin == right.rotateOrigin &&
-           left.subcaption == right.subcaption &&
-           left.subcaptionText == right.subcaptionText &&
            left.special == right.special;
 }
 
@@ -151,8 +139,7 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
        // Do not write the default values
        if (!filename.empty()) {
                os << "\tfilename " << filename.outputFilename(buffer.filePath()) << '\n';
-               os << "\tinzipName " << filename.inzipName() << '\n';
-               os << "\tembed " << (filename.embedded() ? "true" : "false") << '\n';
+               os << "\tembed " << (filename.embedded() ? filename.inzipName() : "\"\"") << '\n';
        }
        if (lyxscale != 100)
                os << "\tlyxscale " << lyxscale << '\n';
@@ -187,10 +174,6 @@ void InsetGraphicsParams::Write(ostream & os, Buffer const & buffer) const
                os << "\trotateAngle " << rotateAngle << '\n';
        if (!rotateOrigin.empty())
                os << "\trotateOrigin " << rotateOrigin << '\n';
-       if (subcaption)
-               os << "\tsubcaption\n";
-       if (!subcaptionText.empty())
-               os << "\tsubcaptionText \"" << subcaptionText << '\"' << '\n';
        if (!special.empty())
                os << "\tspecial " << special << '\n';
 }
@@ -201,12 +184,11 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        if (token == "filename") {
                lex.eatLine();
                filename.set(lex.getString(), bufpath);
-       } else if (token == "inzipName") {
-               lex.eatLine();
-               filename.setInzipName(lex.getString());
        } else if (token == "embed") {
                lex.next();
-               filename.setEmbed(lex.getBool());               
+               string const name = lex.getString();
+               filename.setInzipName(name);
+               filename.setEmbed(!name.empty());
        } else if (token == "lyxscale") {
                lex.next();
                lyxscale = lex.getInteger();
@@ -249,13 +231,6 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
        } else if (token == "rotateOrigin") {
                lex.next();
                rotateOrigin=lex.getString();
-       } else if (token == "subcaption") {
-               subcaption = true;
-       } else if (token == "subcaptionText") {
-               lex.eatLine();
-               string sub = lex.getString();
-               // strip surrounding " "
-               subcaptionText = sub.substr(1, sub.length() - 2);
        } else if (token == "special") {
                lex.eatLine();
                special = lex.getString();
@@ -278,7 +253,8 @@ bool InsetGraphicsParams::Read(Lexer & lex, string const & token, string const &
 graphics::Params InsetGraphicsParams::as_grfxParams() const
 {
        graphics::Params pars;
-       pars.filename = filename;
+       pars.filename = filename.availableFile();
+       pars.icon = filename.embedded() ? "pin.png" : "";
        pars.scale = lyxscale;
        pars.angle = convert<double>(rotateAngle);
 
@@ -287,7 +263,7 @@ graphics::Params InsetGraphicsParams::as_grfxParams() const
 
                // Get the original Bounding Box from the file
                string const tmp = readBB_from_PSFile(filename);
-               LYXERR(Debug::GRAPHICS) << "BB_from_File: " << tmp << std::endl;
+               LYXERR(Debug::GRAPHICS, "BB_from_File: " << tmp);
                if (!tmp.empty()) {
                        // FIXME: why not convert to unsigned int? (Lgb)
                        unsigned int const bb_orig_xl = convert<int>(token(tmp, ' ', 0));