X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.h;h=0a299cba1a6e89870d40e2e8251d297da110e2f8;hb=acba847649f89b63a7762a227a3aac2a12fd6b75;hp=43fd85e69590f48493f23c9664317df9f1333f8e;hpb=4a1be58591ea5a7431d9426abb27d8b946c634cb;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index 43fd85e695..0a299cba1a 100644
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -26,7 +26,7 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/signal.hpp>
+#include "support/signals.h"
 
 namespace lyx {
 
@@ -40,13 +40,15 @@ class Params;
 class Loader {
 public:
 	/// Must use the reset methods to make this instance usable.
-	Loader();
+	Loader(support::FileName const & doc_file);
 	/// The image is not transformed, just displayed as-is.
-	Loader(support::FileName const & file_with_path, bool display = true);
+	Loader(support::FileName const & doc_file, support::FileName const & file_with_path, bool display = true);
 	/// The image is transformed before display.
-	Loader(support::FileName const & file_with_path, Params const &);
+	Loader(support::FileName const & doc_file, support::FileName const & file_with_path, Params const &);
 	///
-	Loader(Loader const &);
+	Loader(support::FileName const & doc_file, Loader const &);
+	///
+	Loader(Loader const & other);
 	/// Needed for the pimpl
 	~Loader();
 
@@ -68,6 +70,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.
@@ -75,11 +81,8 @@ public:
 	void startMonitoring() const;
 	///
 	bool monitoring() const;
-	/** 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.
-	 */
-	unsigned long checksum() const;
+	///
+	void checkModifiedAsync() const;
 
 	/// How far have we got in loading the image?
 	ImageStatus status() const;
@@ -87,21 +90,24 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  changes.
 	 */
-	typedef boost::signal<void()> sig_type;
-	typedef sig_type::slot_type slot_type;
+	typedef signals2::signal<void()> sig;
+	typedef sig::slot_type slot;
 	///
-	boost::signals::connection connect(slot_type const &) const;
+	signals2::connection connect(slot 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;
 	/// The pointer never changes although *pimpl_'s contents may.
-	Impl * const pimpl_;
+	Impl * pimpl_;
 };
 
 } // namespace graphics