X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.h;h=a90bd9696357f6f37d69366322cac949652a35c7;hb=a700d657b3b06541b10ddae8cc5847bd46d06aae;hp=b1c82d9067d39fb47f7a8424154d7f09d7882d34;hpb=98ddc514dabfb2556fdfc6c9a8531daf838bebbb;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index b1c82d9067..a90bd96963 100644
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -26,7 +26,7 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 namespace lyx {
 
@@ -42,7 +42,7 @@ public:
 	/// Must use the reset methods to make this instance usable.
 	Loader();
 	/// The image is not transformed, just displayed as-is.
-	Loader(support::FileName const & file_with_path, DisplayType = ColorDisplay);
+	Loader(support::FileName const & file_with_path, bool display = true);
 	/// The image is transformed before display.
 	Loader(support::FileName const & file_with_path, Params const &);
 	///
@@ -53,8 +53,7 @@ public:
 	Loader & operator=(Loader const &);
 
 	/// The file can be changed, or the display params, or both.
-	void reset(support::FileName const & file_with_path,
-		   DisplayType = ColorDisplay) const;
+	void reset(support::FileName const & file_with_path, bool display = true) const;
 	///
 	void reset(support::FileName const & file_with_path, Params const &) const;
 	///
@@ -69,6 +68,10 @@ public:
 	 */
 	void startLoading() const;
 
+	/** Tries to reload the image. 
+	 */
+	void reload() const;
+
 	/** Monitor any changes to the file.
 	 *  There is no point monitoring the file before startLoading() is
 	 *  invoked.
@@ -76,7 +79,7 @@ public:
 	void startMonitoring() const;
 	///
 	bool monitoring() const;
-	/** Returns the check sum of filename() so that, for example, you can
+	/** Returns the check checksum of filename() so that, for example, you can
 	 *  ascertain whether to output a new PostScript version of the file
 	 *  for a LaTeX run.
 	 */
@@ -88,16 +91,19 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  changes.
 	 */
-	typedef boost::signal<void()> sig_type;
+	typedef boost::signals2::signal<void()> sig_type;
 	typedef sig_type::slot_type slot_type;
 	///
-	boost::signals::connection connect(slot_type const &) const;
+	boost::signals2::connection connect(slot_type const &) const;
 
 	/** The loaded image with Pixmap set.
 	 *  If the Pixmap is not yet set (see status() for why...), returns 0.
 	 */
 	Image const * image() const;
 
+	double displayPixelRatio() const;
+	void setDisplayPixelRatio(double scale);
+
 private:
 	/// Use the Pimpl idiom to hide the internals.
 	class Impl;