#include "insets/RenderPreview.h"
#include "insets/Inset.h"
+#include "Buffer.h"
#include "BufferView.h"
#include "Dimension.h"
#include "LyX.h"
#include "graphics/PreviewImage.h"
#include "graphics/PreviewLoader.h"
-#include "graphics/Previews.h"
#include "support/FileName.h"
#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
using namespace std;
using namespace lyx::support;
LyXRC_PreviewStatus RenderPreview::status()
{
- return graphics::Previews::status();
+ return lyxrc.preview;
}
namespace {
-graphics::PreviewLoader & getPreviewLoader(Buffer const & buffer)
-{
- graphics::Previews const & previews = graphics::Previews::get();
- return previews.loader(buffer);
-}
-
-
docstring const statusMessage(BufferView const * bv, string const & snippet)
{
LASSERT(bv, /**/);
Buffer const & buffer = bv->buffer();
- graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
- graphics::PreviewLoader::Status const status = loader.status(snippet);
+ graphics::PreviewLoader const * loader = buffer.loader();
+ graphics::PreviewLoader::Status const status = loader->status(snippet);
docstring message;
switch (status) {
graphics::PreviewImage const *
RenderPreview::getPreviewImage(Buffer const & buffer) const
{
- graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
- return loader.preview(snippet_);
+ graphics::PreviewLoader const * loader = buffer.loader();
+ LASSERT(loader, return 0);
+ return loader->preview(snippet_);
}
getPreviewImage(mi.base.bv->buffer());
if (pimage) {
+ // If prepared, load the picture before dim calculation. See bug #5627.
+ pimage->image();
dim = pimage->dim();
} else {
dim.asc = 50;
}
-void RenderPreview::startLoading(Buffer const & buffer) const
+void RenderPreview::startLoading(Buffer const & buffer, bool forexport) const
{
- if (status() == LyXRC::PREVIEW_OFF || snippet_.empty())
+ if (!forexport && (status() == LyXRC::PREVIEW_OFF || snippet_.empty()))
return;
- graphics::PreviewLoader const & loader = getPreviewLoader(buffer);
- loader.startLoading();
+ graphics::PreviewLoader * loader = buffer.loader();
+ LASSERT(loader, return);
+ loader->startLoading(forexport);
}
void RenderPreview::addPreview(docstring const & latex_snippet,
- Buffer const & buffer)
+ Buffer const & buffer,
+ bool ignore_lyxrc)
{
- if (status() == LyXRC::PREVIEW_OFF)
+ if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
return;
- graphics::PreviewLoader & loader = getPreviewLoader(buffer);
- addPreview(latex_snippet, loader);
+ graphics::PreviewLoader * loader = buffer.loader();
+ LASSERT(loader, return);
+ addPreview(latex_snippet, *loader, ignore_lyxrc);
}
void RenderPreview::addPreview(docstring const & latex_snippet,
- graphics::PreviewLoader & ploader)
+ graphics::PreviewLoader & ploader,
+ bool ignore_lyxrc)
{
- if (status() == LyXRC::PREVIEW_OFF)
+ if (status() == LyXRC::PREVIEW_OFF && !ignore_lyxrc)
return;
// FIXME UNICODE
// is ready for loading.
if (!ploader_connection_.connected()) {
ploader_connection_ = ploader.connect(
- boost::bind(&RenderPreview::imageReady, this, _1));
+ bind(&RenderPreview::imageReady, this, _1));
}
ploader.add(snippet_);
if (snippet_.empty())
return;
- graphics::PreviewLoader & loader = getPreviewLoader(buffer);
- loader.remove(snippet_);
+ graphics::PreviewLoader * loader = buffer.loader();
+ LASSERT(loader, return);
+ loader->remove(snippet_);
snippet_.erase();
}