Load images with search mode check_hidpi to read images with double size when present.
QStringList imagedirs;
imagedirs << "images/" << "images/ipa/";
- for (int i = 0; i < imagedirs.size(); ++i) {
+ search_mode mode = theGuiApp()->imageSearchMode();
+ for (int i = 0; i < imagedirs.size(); ++i) {
QString imagedir = imagedirs.at(i) + path;
- FileName fname = imageLibFileSearch(imagedir, name1, "png");
+ FileName fname = imageLibFileSearch(imagedir, name1, "png", mode);
if (fname.exists())
return toqstr(fname.absFileName());
- fname = imageLibFileSearch(imagedir, name2, "png");
+ fname = imageLibFileSearch(imagedir, name2, "png", mode);
if (fname.exists())
return toqstr(fname.absFileName());
}
if (unknown) {
QString imagedir = "images/";
- FileName fname = imageLibFileSearch(imagedir, "unknown", "png");
+ FileName fname = imageLibFileSearch(imagedir, "unknown", "png", mode);
if (fname.exists())
return toqstr(fname.absFileName());
return QString(":/images/unknown.png");
{
QPixmap pixmap;
QString imagedir = path;
- FileName fname = imageLibFileSearch(imagedir, name, ext);
+ FileName fname = imageLibFileSearch(imagedir, name, ext, theGuiApp()->imageSearchMode());
QString path1 = toqstr(fname.absFileName());
QString path2 = ":/" + path + name + "." + ext;
double GuiApplication::pixelRatio() const
{
-#if QT_VERSION > 0x050000
+#if QT_VERSION >= 0x050000
return devicePixelRatio();
#else
return 1.0;
#define GUIAPPLICATION_H
#include "frontends/Application.h"
+#include "support/filetools.h"
#include <QApplication>
#include <QList>
/// Current ratio between physical pixels and device-independent pixels
double pixelRatio() const;
-
+
+ /// How to load image files
+ support::search_mode imageSearchMode() const {
+#if QT_VERSION >= 0x050000
+ return support::check_hidpi;
+#else
+ return support::must_exist;
+#endif
+ }
+
void processKeySym(KeySymbol const & key, KeyModifier state);
/// return the status bar state string
docstring viewStatusMessage();
QString const name = toqstr(tbitem_.name_);
QStringList imagedirs;
imagedirs << "images/math/" << "images/";
- for (int i = 0; i < imagedirs.size(); ++i) {
+ for (int i = 0; i < imagedirs.size(); ++i) {
QString imagedir = imagedirs.at(i);
- FileName const fname = imageLibFileSearch(imagedir, name, "png");
+ FileName const fname = imageLibFileSearch(imagedir, name, "png",
+ theGuiApp()->imageSearchMode());
if (fname.exists()) {
setIcon(QIcon(getPixmap(imagedir, name, "png")));
break;
void paintEvent(QPaintEvent *)
{
QRectF r = splash_.rect();
-#if QT_VERSION > 0x050000
+#if QT_VERSION >= 0x050000
r.setWidth(r.width() / splash_.devicePixelRatio());
r.setHeight(r.height() / splash_.devicePixelRatio());
#endif
// add busy indicator to statusbar
QLabel * busylabel = new QLabel(statusBar());
statusBar()->addPermanentWidget(busylabel);
- QString fn = toqstr(lyx::libFileSearch("images", "busy.gif").absFileName());
+ search_mode mode = theGuiApp()->imageSearchMode();
+ QString fn = toqstr(lyx::libFileSearch("images", "busy", "gif", mode).absFileName());
QMovie * busyanim = new QMovie(fn, QByteArray(), busylabel);
busylabel->setMovie(busyanim);
busyanim->start();
double GuiView::pixelRatio() const
{
-#if QT_VERSION > 0x050000
+#if QT_VERSION >= 0x050000
return devicePixelRatio();
#else
return 1.0;