#include "GraphicsTypes.h"
-#include <boost/scoped_ptr.hpp>
-#include <boost/signal.hpp>
+#include "support/signals.h"
namespace lyx {
+
+namespace support { class FileName; }
+
namespace graphics {
class Image;
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(std::string const & file_with_path, DisplayType = ColorDisplay);
+ Loader(support::FileName const & doc_file, 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 & doc_file, 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.
+ Loader(support::FileName const & doc_file, Loader const &);
+ ///
+ Loader(Loader const & other);
+ /// 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.
void startMonitoring() const;
///
bool monitoring() const;
- /** Returns the check sum 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;
/** 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.
- boost::scoped_ptr<Impl> const pimpl_;
+ Impl * pimpl_;
};
} // namespace graphics