X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgraphics%2FGraphicsLoader.h;h=57328107085b7f86f9927fb93d0f84d83c372e16;hb=17a033c15a305cc6e2e22acdee891ee44e3b4556;hp=3d41d9c136ddd150e82b4f83c24fa02b3f5283a5;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/graphics/GraphicsLoader.h b/src/graphics/GraphicsLoader.h
index 3d41d9c136..5732810708 100644
--- a/src/graphics/GraphicsLoader.h
+++ b/src/graphics/GraphicsLoader.h
@@ -26,12 +26,12 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/signals/signal0.hpp>
-#include <boost/scoped_ptr.hpp>
-
-class InsetOld;
+#include <boost/signal.hpp>
 
 namespace lyx {
+
+namespace support { class FileName; }
+
 namespace graphics {
 
 class Image;
@@ -42,35 +42,36 @@ public:
 	/// Must use the reset methods to make this instance usable.
 	Loader();
 	/// The image is not transformed, just displayed as-is.
-	Loader(std::string const & file_with_path, DisplayType = ColorDisplay);
+	Loader(support::FileName const & file_with_path, bool display = true);
 	/// The image is transformed before display.
-	Loader(std::string const & file_with_path, Params const &);
+	Loader(support::FileName const & file_with_path, Params const &);
 	///
 	Loader(Loader const &);
-
-	/// Define an empty d-tor out-of-line to keep boost::scoped_ptr happy.
+	/// Needed for the pimpl
 	~Loader();
 
 	Loader & operator=(Loader const &);
 
 	/// The file can be changed, or the display params, or both.
-	void reset(std::string const & file_with_path,
-		   DisplayType = ColorDisplay) const;
+	void reset(support::FileName const & file_with_path, bool display = true) const;
 	///
-	void reset(std::string const & file_with_path, Params const &) const;
+	void reset(support::FileName const & file_with_path, Params const &) const;
 	///
 	void reset(Params const &) const;
 
 	/// Returns the absolute path of the loaded (loading?) file.
-	std::string const & filename() const;
+	support::FileName const & filename() const;
 	///
-	bool empty() const { return filename().empty(); }
 
 	/** starting loading of the image is done by a urgency-based
 	 *  decision. Here we only call LoaderQueue::touch to request it.
 	 */
 	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.
@@ -78,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.
 	 */
@@ -90,7 +91,8 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  changes.
 	 */
-	typedef boost::signal0<void>::slot_type slot_type;
+	typedef boost::signal<void()> sig_type;
+	typedef sig_type::slot_type slot_type;
 	///
 	boost::signals::connection connect(slot_type const &) const;
 
@@ -99,11 +101,14 @@ public:
 	 */
 	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.
-	boost::scoped_ptr<Impl> const pimpl_;
+	Impl * const pimpl_;
 };
 
 } // namespace graphics