Merge branch 'master' into biblatex2

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index 92363d435d2a6e111e341d09b5b715d38072533c..e985d290a27391427a44df676147d0f8b4c56b95 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -39,9 +39,33 @@ using namespace lyx::support;
 namespace lyx {
 
 
-LyXRC_PreviewStatus RenderPreview::status()
+bool RenderPreview::previewText()
 {
-       return lyxrc.preview;
+       // Use a switch to trigger a warning if the enum is changed.
+       switch(lyxrc.preview) {
+       case LyXRC::PREVIEW_ON:
+       case LyXRC::PREVIEW_NO_MATH:
+               return true;
+       case LyXRC::PREVIEW_OFF:
+               break;
+       }
+
+       return false;
+}
+
+
+bool RenderPreview::previewMath()
+{
+       // Use a switch to trigger a warning if the enum is changed.
+       switch(lyxrc.preview) {
+       case LyXRC::PREVIEW_ON:
+               return true;
+       case LyXRC::PREVIEW_NO_MATH:
+       case LyXRC::PREVIEW_OFF:
+               break;
+       }
+
+       return false;
 }
 
 
@@ -53,7 +77,7 @@ RenderPreview::RenderPreview(Inset const * inset)
 RenderPreview::RenderPreview(RenderPreview const & other,
                             Inset const * inset)
        : RenderBase(other),
-         boost::signals::trackable(),
+         boost::signals2::trackable(),
          snippet_(other.snippet_),
          parent_(inset)
 {}
@@ -80,6 +104,9 @@ docstring const statusMessage(BufferView const * bv, string const & snippet)
 
        Buffer const & buffer = bv->buffer();
        graphics::PreviewLoader const * loader = buffer.loader();
+       // please coverity (probably worth the check anyway)
+       if (!loader)
+               return docstring();
        graphics::PreviewLoader::Status const status = loader->status(snippet);
 
        docstring message;
@@ -148,7 +175,6 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
        if (image) {
                pi.pain.image(x, y - dim_.asc, dim_.wid, dim_.height(),
                              *image);
-
        } else {
                int const offset = Inset::TEXT_TO_INSET_OFFSET;
 
@@ -167,12 +193,14 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                             y - theFontMetrics(font).maxAscent() - 4,
                             stat, font);
        }
+       pi.change_.paintCue(pi, x, y - dim_.asc,
+                           x + dim_.width(), y - dim_.asc + dim_.height());
 }
 
 
 void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
 {
-       if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
+       if (!forexport && (lyxrc.preview == LyXRC::PREVIEW_OFF || snippet_.empty()))
                return;
 
        graphics::PreviewLoader * loader = buffer.loader();
@@ -185,7 +213,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
                                Buffer const & buffer, 
                                bool ignore_lyxrc)
 {
-       if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+       if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
                return;
 
        graphics::PreviewLoader * loader = buffer.loader();
@@ -198,7 +226,7 @@ void RenderPreview::addPreview(docstring const & latex_snippet,
                                graphics::PreviewLoader & ploader, 
                                bool ignore_lyxrc)
 {
-       if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
+       if (lyxrc.preview == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
                return;
 
        // FIXME UNICODE
@@ -261,7 +289,7 @@ void RenderMonitoredPreview::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-boost::signals::connection
+boost::signals2::connection
 RenderMonitoredPreview::fileChanged(slot_type const & slot)
 {
        return monitor_.connect(slot);