Fix bug #7975 following suggestions made by JMarc there.

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index 123af44ea5b9d7025ec3d3399c9a34f2e110668b..38cbfa72fc3b3e6a3eb3a326ce1b5e5bae2464f0 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -755,10 +755,20 @@ void InsetGraphics::latex(otexstream & os,
 
        bool const file_exists = !params().filename.empty()
                        && params().filename.isReadableFile();
-       string const message = file_exists ?
-               string() : string("bb = 0 0 200 100, draft, type=eps");
-       // if !message.empty() then there was no existing file
-       // "filename" found. In this case LaTeX
+       string message;
+       if (!file_exists) {
+               if (params().bb.empty())
+                   message = "bb = 0 0 200 100";
+               if (!params().draft) {
+                       if (!message.empty())
+                               message += ", ";
+                       message += "draft";
+               }
+               if (!message.empty())
+                       message += ", ";
+               message += "type=eps";
+       }
+       // If no existing file "filename" was found LaTeX
        // draws only a rectangle with the above bb and the
        // not found filename in it.
        LYXERR(Debug::GRAPHICS, "\tMessage = \"" << message << '\"');
@@ -1078,6 +1088,12 @@ string InsetGraphics::params2string(InsetGraphicsParams const & params,
        return data.str();
 }
 
+
+docstring InsetGraphics::toolTip(BufferView const &, int, int) const
+{
+       return from_utf8(params().filename.onlyFileName());
+}
+
 namespace graphics {
 
 void getGraphicsGroups(Buffer const & b, set<string> & ids)