X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderPreview.h;h=841ffdacdeea2f531339d96974b6a040fe1c5584;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=bad2bff452059bffbd39b504d8c824eb245c5507;hpb=dcc50a24548b3ff46f9060897793ca346befa7e2;p=lyx.git

diff --git a/src/insets/RenderPreview.h b/src/insets/RenderPreview.h
index bad2bff452..841ffdacde 100644
--- a/src/insets/RenderPreview.h
+++ b/src/insets/RenderPreview.h
@@ -21,14 +21,13 @@
 #include "support/docstring.h"
 #include "support/FileMonitor.h"
 
-#include <boost/signal.hpp>
-#include <boost/signals/trackable.hpp>
-#include <boost/signals/connection.hpp>
+#include <boost/signals2.hpp>
+#include <boost/signals2/trackable.hpp>
+#include <boost/signals2/connection.hpp>
 
 namespace lyx {
 
 class Buffer;
-class LyXRC_PreviewStatus;
 class MetricsInfo;
 class PainterInfo;
 
@@ -42,10 +41,12 @@ class PreviewLoader;
 } // namespace graphics
 
 
-class RenderPreview : public RenderBase, public boost::signals::trackable {
+class RenderPreview : public RenderBase, public boost::signals2::trackable {
 public:
-	/// a wrapper for Previews::status()
-	static LyXRC_PreviewStatus status();
+	/// Return true if preview is enabled in text (from LyXRC::preview)
+	static bool previewText();
+	/// Return true if preview is enabled in mathed (from LyXRC::preview)
+	static bool previewMath();
 
 	RenderPreview(Inset const *);
 	RenderPreview(RenderPreview const &, Inset const *);
@@ -59,17 +60,23 @@ public:
 
 	/** Find the PreviewLoader and add a LaTeX snippet to it.
 	 *  Do not start the loading process.
+	 *  \param ignore_lyxrc: generate the preview no matter what LyXRC says
 	 */
-	void addPreview(docstring const & latex_snippet, Buffer const &);
+	void addPreview(docstring const & latex_snippet, Buffer const &,
+			bool ignore_lyxrc = false);
 
 	/** Add a LaTeX snippet to the PreviewLoader.
 	 *  Do not start the loading process.
+	 *  \param ignore_lyxrc: generate the preview no matter what LyXRC says
 	 */
 	void addPreview(docstring const & latex_snippet,
-			graphics::PreviewLoader & ploader);
+			graphics::PreviewLoader & ploader,
+			bool ignore_lyxrc = false);
 
 	/// Begin the loading process.
-	void startLoading(Buffer const & buffer) const;
+	/// \param forexport : whether this is intended for export. if so,
+	/// then we ignore LyXRC and wait for the image to be generated.
+	void startLoading(Buffer const & buffer, bool forexport = false) const;
 
 	/** Remove a snippet from the cache of previews.
 	 *  Useful if previewing the contents of a file that has changed.
@@ -98,7 +105,7 @@ private:
 	/** Store the connection to the preview loader so that we connect
 	 *  only once.
 	 */
-	boost::signals::connection ploader_connection_;
+	boost::signals2::connection ploader_connection_;
 
 	/// Inform the core that the inset has changed.
 	Inset const * parent_;
@@ -119,7 +126,7 @@ public:
 
 	/// Connect and you'll be informed when the file changes.
 	typedef support::FileMonitor::slot_type slot_type;
-	boost::signals::connection fileChanged(slot_type const &);
+	boost::signals2::connection fileChanged(slot_type const &);
 
 	/// equivalent to dynamic_cast
 	virtual RenderMonitoredPreview * asMonitoredPreview() { return this; }