Rotate JPEG thumbnails acording to EXIF data

fixes #385

gpxsee.pro

@@ -20,6 +20,7 @@ INCLUDEPATH += ./src
 HEADERS += src/common/config.h \
     src/GUI/axislabelitem.h \
     src/GUI/dirselectwidget.h \
+    src/GUI/flowlayout.h \
     src/GUI/graphicsscene.h \
     src/GUI/mapaction.h \
     src/GUI/mapitem.h \
@@ -28,6 +29,7 @@ HEADERS += src/common/config.h \
     src/GUI/planeitem.h \
     src/GUI/poiaction.h \
     src/GUI/popup.h \
+    src/GUI/thumbnail.h \
     src/common/garmin.h \
     src/common/coordinates.h \
     src/common/range.h \
@@ -230,10 +232,12 @@ HEADERS += src/common/config.h \
 SOURCES += src/main.cpp \
     src/GUI/axislabelitem.cpp \
     src/GUI/dirselectwidget.cpp \
+    src/GUI/flowlayout.cpp \
     src/GUI/mapitem.cpp \
     src/GUI/marginswidget.cpp \
     src/GUI/markerinfoitem.cpp \
     src/GUI/popup.cpp \
+    src/GUI/thumbnail.cpp \
     src/common/coordinates.cpp \
     src/common/rectc.cpp \
     src/common/range.cpp \
@@ -261,7 +265,6 @@ SOURCES += src/main.cpp \
     src/GUI/fileselectwidget.cpp \
     src/GUI/temperaturegraph.cpp \
     src/GUI/trackitem.cpp \
-    src/GUI/tooltip.cpp \
     src/GUI/routeitem.cpp \
     src/GUI/graphitem.cpp \
     src/GUI/pathitem.cpp \

src/GUI/areaitem.cpp

@@ -9,7 +9,7 @@
 #include "areaitem.h"
 
 
-QString AreaItem::info() const
+ToolTip AreaItem::info() const
 {
 	ToolTip tt;
 
@@ -19,7 +19,7 @@ QString AreaItem::info() const
 		tt.insert(qApp->translate("PolygonItem", "Description"),
 		  _area.description());
 
-	return tt.toString();
+	return tt;
 }
 
 AreaItem::AreaItem(const Area &area, Map *map, GraphicsItem *parent)

src/GUI/areaitem.h

@@ -25,7 +25,7 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
-	QString info() const;
+	ToolTip info() const;
 
 protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);

src/GUI/cadencegraphitem.cpp

@@ -9,7 +9,7 @@ CadenceGraphItem::CadenceGraphItem(const Graph &graph, GraphType type,
 {
 }
 
-QString CadenceGraphItem::info() const
+ToolTip CadenceGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());
@@ -19,5 +19,5 @@ QString CadenceGraphItem::info() const
 	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
 	  + UNIT_SPACE + tr("rpm"));
 
-	return tt.toString();
+	return tt;
 }

src/GUI/cadencegraphitem.h

@@ -11,7 +11,7 @@ public:
 	CadenceGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	QString info() const;
+	ToolTip info() const;
 };
 
 #endif // CADENCEGRAPHITEM_H

src/GUI/elevationgraphitem.cpp

@@ -26,7 +26,7 @@ ElevationGraphItem::ElevationGraphItem(const Graph &graph, GraphType type,
 	}
 }
 
-QString ElevationGraphItem::info() const
+ToolTip ElevationGraphItem::info() const
 {
 	ToolTip tt;
 	qreal scale = (_units == Metric) ? 1.0 : M2FT;
@@ -42,6 +42,5 @@ QString ElevationGraphItem::info() const
 	tt.insert(tr("Minimum"), l.toString(min() * scale, 'f', 0)
 	  + UNIT_SPACE + su);
 
-
+	return tt;
-	return tt.toString();
 }

src/GUI/elevationgraphitem.h

@@ -18,7 +18,7 @@ public:
 	qreal max() const {return _max;}
 	qreal min() const {return _min;}
 
-	QString info() const;
+	ToolTip info() const;
 
 private:
 	qreal _ascent, _descent, _min, _max;

src/GUI/flowlayout.cpp

@@ -0,0 +1,181 @@
+#include <QtWidgets>
+#include "flowlayout.h"
+
+struct FlowLayoutItem
+{
+	FlowLayoutItem() : item(0) {}
+	FlowLayoutItem(QLayoutItem *item, int x, int y) : item(item), pos(x, y) {}
+
+	QLayoutItem *item;
+	QPoint pos;
+};
+
+FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
+    : QLayout(parent), _hSpace(hSpacing), _vSpace(vSpacing)
+{
+	setContentsMargins(margin, margin, margin, margin);
+}
+
+FlowLayout::FlowLayout(int margin, int hSpacing, int vSpacing)
+    : _hSpace(hSpacing), _vSpace(vSpacing)
+{
+	setContentsMargins(margin, margin, margin, margin);
+}
+
+FlowLayout::~FlowLayout()
+{
+	qDeleteAll(_items);
+}
+
+void FlowLayout::addItem(QLayoutItem *item)
+{
+	_items.append(item);
+}
+
+int FlowLayout::horizontalSpacing() const
+{
+	return (_hSpace >= 0)
+	  ? _hSpace
+	  : smartSpacing(QStyle::PM_LayoutHorizontalSpacing);
+}
+
+int FlowLayout::verticalSpacing() const
+{
+	return (_vSpace >= 0)
+	  ? _vSpace
+	  : smartSpacing(QStyle::PM_LayoutVerticalSpacing);
+}
+
+int FlowLayout::count() const
+{
+	return _items.size();
+}
+
+QLayoutItem *FlowLayout::itemAt(int index) const
+{
+	return _items.value(index);
+}
+
+QLayoutItem *FlowLayout::takeAt(int index)
+{
+	if (index >= 0 && index < _items.size())
+		return _items.takeAt(index);
+
+	return 0;
+}
+
+Qt::Orientations FlowLayout::expandingDirections() const
+{
+	return {};
+}
+
+bool FlowLayout::hasHeightForWidth() const
+{
+	return true;
+}
+
+int FlowLayout::heightForWidth(int width) const
+{
+	int height = doLayout(QRect(0, 0, width, 0), true);
+	return height;
+}
+
+void FlowLayout::setGeometry(const QRect &rect)
+{
+	QLayout::setGeometry(rect);
+	doLayout(rect, false);
+}
+
+QSize FlowLayout::sizeHint() const
+{
+	return minimumSize();
+}
+
+QSize FlowLayout::minimumSize() const
+{
+	QSize size;
+
+	for (int i = 0; i < _items.size(); i++)
+		size = size.expandedTo(_items.at(i)->minimumSize());
+
+	const QMargins margins = contentsMargins();
+	size += QSize(margins.left() + margins.right(), margins.top()
+	  + margins.bottom());
+
+	return size;
+}
+
+int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
+{
+	int left, top, right, bottom;
+	getContentsMargins(&left, &top, &right, &bottom);
+	QRect effectiveRect = rect.adjusted(+left, +top, -right, -bottom);
+	int x = effectiveRect.x();
+	int y = effectiveRect.y();
+	int lineHeight = 0;
+	QVector<QVector<FlowLayoutItem>> rows;
+
+	if (!_items.isEmpty())
+		rows.append(QVector<FlowLayoutItem>());
+
+	for (int i = 0; i < _items.size(); i++) {
+		QLayoutItem *item = _items.at(i);
+		const QWidget *wid = item->widget();
+		int spaceX = horizontalSpacing();
+		if (spaceX == -1)
+			spaceX = wid->style()->layoutSpacing(QSizePolicy::PushButton,
+			  QSizePolicy::PushButton, Qt::Horizontal);
+		int spaceY = verticalSpacing();
+		if (spaceY == -1)
+			spaceY = wid->style()->layoutSpacing(QSizePolicy::PushButton,
+			  QSizePolicy::PushButton, Qt::Vertical);
+
+		int nextX = x + item->sizeHint().width() + spaceX;
+		if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
+			x = effectiveRect.x();
+			y = y + lineHeight + spaceY;
+			nextX = x + item->sizeHint().width() + spaceX;
+			lineHeight = 0;
+			rows.append(QVector<FlowLayoutItem>());
+		}
+
+		rows.last().append(FlowLayoutItem(item, x, y));
+
+		x = nextX;
+		lineHeight = qMax(lineHeight, item->sizeHint().height());
+	}
+
+	if (!testOnly) {
+		for (int i = 0; i < rows.size(); i++) {
+			const FlowLayoutItem &li = rows.at(i).last();
+			int width = li.item->sizeHint().width() + li.pos.x();
+			int offset = (rect.width() - width) / 2;
+
+			int height = 0;
+			for (int j = 0; j < rows.at(i).size(); j++)
+				height = qMax(rows.at(i).at(j).item->sizeHint().height(), height);
+
+			for (int j = 0; j < rows.at(i).size(); j++) {
+				QLayoutItem *item = rows.at(i).at(j).item;
+				const QPoint &p = rows.at(i).at(j).pos;
+				QSize sh(item->sizeHint());
+				item->setGeometry(QRect(QPoint(p.x() + offset, p.y() + height
+				  - sh.height()), sh));
+			}
+		}
+	}
+
+	return y + lineHeight - rect.y() + bottom;
+}
+
+int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
+{
+	QObject *parent = this->parent();
+	if (!parent)
+		return -1;
+	else if (parent->isWidgetType()) {
+		QWidget *pw = static_cast<QWidget *>(parent);
+		return pw->style()->pixelMetric(pm, 0, pw);
+	} else
+		return static_cast<QLayout *>(parent)->spacing();
+}

src/GUI/flowlayout.h

@@ -0,0 +1,38 @@
+#ifndef FLOWLAYOUT_H
+#define FLOWLAYOUT_H
+
+#include <QLayout>
+#include <QRect>
+#include <QStyle>
+
+class FlowLayout : public QLayout
+{
+public:
+	FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1,
+	  int vSpacing = -1);
+	FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1);
+	~FlowLayout();
+
+	void addItem(QLayoutItem *item);
+	int horizontalSpacing() const;
+	int verticalSpacing() const;
+	Qt::Orientations expandingDirections() const;
+	bool hasHeightForWidth() const;
+	int heightForWidth(int) const;
+	int count() const;
+	QLayoutItem *itemAt(int index) const;
+	QSize minimumSize() const;
+	void setGeometry(const QRect &rect);
+	QSize sizeHint() const;
+	QLayoutItem *takeAt(int index);
+
+private:
+	int doLayout(const QRect &rect, bool testOnly) const;
+	int smartSpacing(QStyle::PixelMetric pm) const;
+
+	QList<QLayoutItem *> _items;
+	int _hSpace;
+	int _vSpace;
+};
+
+#endif // FLOWLAYOUT_H

src/GUI/gearratiographitem.cpp

@@ -27,7 +27,7 @@ GearRatioGraphItem::GearRatioGraphItem(const Graph &graph, GraphType type,
 	_top = key;
 }
 
-QString GearRatioGraphItem::info() const
+ToolTip GearRatioGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());
@@ -36,5 +36,5 @@ QString GearRatioGraphItem::info() const
 	tt.insert(tr("Maximum"), l.toString(max(), 'f', 2));
 	tt.insert(tr("Most used"), l.toString(top(), 'f', 2));
 
-	return tt.toString();
+	return tt;
 }

src/GUI/gearratiographitem.h

@@ -15,7 +15,7 @@ public:
 	qreal top() const {return _top;}
 	const QMap<qreal, qreal> &map() const {return _map;}
 
-	QString info() const;
+	ToolTip info() const;
 
 private:
 	QMap<qreal, qreal> _map;

src/GUI/graphicsscene.h

@@ -3,13 +3,14 @@
 
 #include <QGraphicsScene>
 #include <QGraphicsItem>
+#include "tooltip.h"
 
 class GraphicsItem : public QGraphicsItem
 {
 public:
 	GraphicsItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent) {}
 
-	virtual QString info() const = 0;
+	virtual ToolTip info() const = 0;
 	int type() const {return QGraphicsItem::UserType + 1;}
 };
 

src/GUI/graphitem.h

@@ -16,7 +16,7 @@ public:
 	  const QColor &color, Qt::PenStyle style, QGraphicsItem *parent = 0);
 	virtual ~GraphItem() {}
 
-	virtual QString info() const = 0;
+	virtual ToolTip info() const = 0;
 
 	QPainterPath shape() const {return _shape;}
 	QRectF boundingRect() const {return _shape.boundingRect();}

src/GUI/heartrategraphitem.cpp

@@ -9,7 +9,7 @@ HeartRateGraphItem::HeartRateGraphItem(const Graph &graph, GraphType type,
 {
 }
 
-QString HeartRateGraphItem::info() const
+ToolTip HeartRateGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());
@@ -19,5 +19,5 @@ QString HeartRateGraphItem::info() const
 	tt.insert(tr("Average"), l.toString(avg(), 'f', 0)
 	  + UNIT_SPACE + tr("bpm"));
 
-	return tt.toString();
+	return tt;
 }

src/GUI/heartrategraphitem.h

@@ -11,7 +11,7 @@ public:
 	HeartRateGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	QString info() const;
+	ToolTip info() const;
 };
 
 #endif // HEARTRATEGRAPHITEM_H

src/GUI/infoitem.cpp

@@ -56,17 +56,25 @@ void InfoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	//painter->drawRect(boundingRect());
 }
 
+int InfoItem::indexOf(const QString &key) const
+{
+	for (int i = 0; i < _list.size(); i++)
+		if (_list.at(i).key() == key)
+			return i;
+
+	return -1;
+}
+
 void InfoItem::insert(const QString &key, const QString &value)
 {
-	KV<QString, QString> kv(key, value);
 	int i;
 
 	prepareGeometryChange();
 
-	if ((i = _list.indexOf(kv)) < 0)
+	if ((i = indexOf(key)) < 0)
-		_list.append(kv);
+		_list.append(KV<QString, QString>(key, value));
 	else
-		_list[i] = kv;
+		_list[i] = KV<QString, QString>(key, value);
 
 	updateBoundingRect();
 	update();

src/GUI/infoitem.h

@@ -22,6 +22,7 @@ public:
 
 private:
 	void updateBoundingRect();
+	int indexOf(const QString &key) const;
 
 	QList<KV<QString, QString> > _list;
 	QRectF _boundingRect;

src/GUI/mapitem.cpp

@@ -69,7 +69,7 @@ static QRectF bbox(const RectC &rect, Map *map, int samples = 100)
 	return prect;
 }
 
-QString MapItem::info() const
+ToolTip MapItem::info() const
 {
 	ToolTip tt;
 
@@ -78,7 +78,7 @@ QString MapItem::info() const
 	if (!_fileName.isEmpty())
 		tt.insert(tr("File"), _fileName);
 
-	return tt.toString();
+	return tt;
 }
 
 MapItem::MapItem(MapAction *action, Map *map, GraphicsItem *parent)

src/GUI/mapitem.h

@@ -26,7 +26,7 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
-	QString info() const;
+	ToolTip info() const;
 
 signals:
 	void triggered();

src/GUI/pathtickitem.h

@@ -19,7 +19,10 @@ public:
 	void setDigitalZoom(int zoom) {setScale(pow(2, -zoom));}
 
 	int type() const {return parentItem()->type();}
-	QString info() const {return static_cast<GraphicsItem*>(parentItem())->info();}
+	ToolTip info() const
+	{
+		return static_cast<GraphicsItem*>(parentItem())->info();
+	}
 
 	static QRect tickRect(int value);
 

src/GUI/popup.cpp

@@ -6,25 +6,31 @@
 #include <QMouseEvent>
 #include <QBasicTimer>
 #include <QScreen>
+#include <QVBoxLayout>
 #include <QApplication>
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 #include <QDesktopWidget>
 #endif // QT 5.15
+#include "tooltip.h"
+#include "thumbnail.h"
+#include "flowlayout.h"
 #include "popup.h"
 
 
-class PopupLabel : public QLabel
+class PopupFrame : public QFrame
 {
 public:
-	PopupLabel(const QString &text, QWidget *parent = 0);
+	PopupFrame(const ToolTip &toolTip, QWidget *parent = 0);
-	~PopupLabel();
+	~PopupFrame();
+
+	const ToolTip &toolTip() const {return _toolTip;}
 
 	bool eventFilter(QObject *o, QEvent *ev);
 	void place(const QPoint &pos, QWidget *w);
 	void deleteAfterTimer();
 	void stopTimer() {_timer.stop();}
 
-	static PopupLabel *_instance;
+	static PopupFrame *_instance;
 
 protected:
 	void paintEvent(QPaintEvent *event);
@@ -32,14 +38,17 @@ protected:
 	void contextMenuEvent(QContextMenuEvent *) {}
 
 private:
+	void createLayout(const ToolTip &content);
+
 	QBasicTimer _timer;
+	ToolTip _toolTip;
 };
 
-PopupLabel *PopupLabel::_instance = 0;
+PopupFrame *PopupFrame::_instance = 0;
 
-PopupLabel::PopupLabel(const QString &text, QWidget *parent)
+PopupFrame::PopupFrame(const ToolTip &toolTip, QWidget *parent)
-  : QLabel(text, parent, Qt::ToolTip | Qt::BypassGraphicsProxyWidget
+  : QFrame(parent, Qt::ToolTip | Qt::BypassGraphicsProxyWidget
-	| Qt::WindowDoesNotAcceptFocus)
+    | Qt::WindowDoesNotAcceptFocus), _toolTip(toolTip)
 {
 	delete _instance;
 	_instance = this;
@@ -48,39 +57,73 @@ PopupLabel::PopupLabel(const QString &text, QWidget *parent)
 	setBackgroundRole(QPalette::ToolTipBase);
 	setPalette(QToolTip::palette());
 	ensurePolished();
-	setMargin(1 + style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, 0,
+
-	  this));
 	setFrameStyle(QFrame::NoFrame);
-	setAlignment(Qt::AlignLeft);
-	setIndent(1);
 	setWindowOpacity(style()->styleHint(QStyle::SH_ToolTipLabel_Opacity, 0,
 	  this) / 255.0);
 
-	setTextInteractionFlags(Qt::TextBrowserInteraction);
+	createLayout(toolTip);
-	setOpenExternalLinks(true);
-	setWordWrap(true);
 
 	setMouseTracking(true);
 
 	qApp->installEventFilter(this);
 }
 
-PopupLabel::~PopupLabel()
+PopupFrame::~PopupFrame()
 {
 	_instance = 0;
 }
 
-void PopupLabel::paintEvent(QPaintEvent *event)
+void PopupFrame::createLayout(const ToolTip &content)
+{
+	QVBoxLayout *layout = new QVBoxLayout();
+	int margin = 1 + style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, 0,
+	  this);
+	layout->setContentsMargins(margin, margin, margin, margin);
+	layout->setSpacing(0);
+
+	if (!content.images().isEmpty()) {
+		FlowLayout *imagesLayout = new FlowLayout(0, 2, 2);
+		int size = qMin(960/content.images().size(), 240);
+
+		for (int i = 0; i < content.images().size(); i++)
+			imagesLayout->addWidget(new Thumbnail(content.images().at(i), size));
+
+		layout->addLayout(imagesLayout);
+	}
+
+	if (!content.list().isEmpty()) {
+		QString html = "<table>";
+		for (int i = 0; i < content.list().count(); i++)
+			html += "<tr><td align=\"right\"><b>" + content.list().at(i).key()
+			  + ":&nbsp;</b></td><td>" + content.list().at(i).value()
+			  + "</td></tr>";
+		html += "</table>";
+
+		QLabel *label = new QLabel(html);
+		label->setAlignment(Qt::AlignLeft);
+		label->setIndent(1);
+		label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+		label->setOpenExternalLinks(true);
+		label->setWordWrap(true);
+
+		layout->addWidget(label);
+	}
+
+	setLayout(layout);
+}
+
+void PopupFrame::paintEvent(QPaintEvent *event)
 {
 	QStylePainter p(this);
 	QStyleOptionFrame opt;
 	opt.initFrom(this);
 	p.drawPrimitive(QStyle::PE_PanelTipLabel, opt);
 	p.end();
-	QLabel::paintEvent(event);
+	QFrame::paintEvent(event);
 }
 
-void PopupLabel::timerEvent(QTimerEvent *event)
+void PopupFrame::timerEvent(QTimerEvent *event)
 {
 	if (event->timerId() == _timer.timerId()) {
 		_timer.stop();
@@ -88,7 +131,7 @@ void PopupLabel::timerEvent(QTimerEvent *event)
 	}
 }
 
-bool PopupLabel::eventFilter(QObject *o, QEvent *ev)
+bool PopupFrame::eventFilter(QObject *o, QEvent *ev)
 {
 	Q_UNUSED(o);
 
@@ -123,7 +166,7 @@ bool PopupLabel::eventFilter(QObject *o, QEvent *ev)
 	return false;
 }
 
-void PopupLabel::place(const QPoint &pos, QWidget *w)
+void PopupFrame::place(const QPoint &pos, QWidget *w)
 {
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	QRect screen = QApplication::desktop()->screenGeometry(w);
@@ -148,31 +191,34 @@ void PopupLabel::place(const QPoint &pos, QWidget *w)
 	this->move(p);
 }
 
-void PopupLabel::deleteAfterTimer()
+void PopupFrame::deleteAfterTimer()
 {
 	if (!_timer.isActive())
 		_timer.start(300, this);
 }
 
-
+void Popup::show(const QPoint &pos, const ToolTip &toolTip, QWidget *w)
-void Popup::show(const QPoint &pos, const QString &text, QWidget *w)
 {
-	if (text.isEmpty())
+	if (toolTip.isEmpty())
 		return;
 
-	if (PopupLabel::_instance) {
+	if (PopupFrame::_instance) {
-		PopupLabel::_instance->stopTimer();
+		if (toolTip == PopupFrame::_instance->toolTip())
-		PopupLabel::_instance->setText(text);
+			PopupFrame::_instance->stopTimer();
+		else {
+			delete PopupFrame::_instance;
+			PopupFrame::_instance = new PopupFrame(toolTip);
+		}
 	} else
-		PopupLabel::_instance = new PopupLabel(text);
+		PopupFrame::_instance = new PopupFrame(toolTip);
 
-	PopupLabel::_instance->resize(PopupLabel::_instance->sizeHint());
+	PopupFrame::_instance->resize(PopupFrame::_instance->sizeHint());
-	PopupLabel::_instance->place(pos, w);
+	PopupFrame::_instance->place(pos, w);
-	PopupLabel::_instance->showNormal();
+	PopupFrame::_instance->showNormal();
 }
 
 void Popup::clear()
 {
-	if (PopupLabel::_instance)
+	if (PopupFrame::_instance)
-		delete PopupLabel::_instance;
+		delete PopupFrame::_instance;
 }

src/GUI/popup.h

@@ -2,13 +2,13 @@
 #define POPUP_H
 
 class QPoint;
-class QString;
 class QWidget;
+class ToolTip;
 
 class Popup
 {
 public:
-	static void show(const QPoint &pos, const QString &text, QWidget *w);
+	static void show(const QPoint &pos, const ToolTip &toolTip, QWidget *w);
 	static void clear();
 };
 

src/GUI/powergraphitem.cpp

@@ -9,7 +9,7 @@ PowerGraphItem::PowerGraphItem(const Graph &graph, GraphType type, int width,
 {
 }
 
-QString PowerGraphItem::info() const
+ToolTip PowerGraphItem::info() const
 {
 	ToolTip tt;
 	QLocale l(QLocale::system());
@@ -19,5 +19,5 @@ QString PowerGraphItem::info() const
 	tt.insert(tr("Average"), l.toString(avg(), 'f', 1)
 	  + UNIT_SPACE + tr("W"));
 
-	return tt.toString();
+	return tt;
 }

src/GUI/powergraphitem.h

@@ -11,7 +11,7 @@ public:
 	PowerGraphItem(const Graph &graph, GraphType type, int width,
 	  const QColor &color, QGraphicsItem *parent = 0);
 
-	QString info() const;
+	ToolTip info() const;
 };
 
 #endif // POWERGRAPHITEM_H

src/GUI/routeitem.cpp

@@ -8,7 +8,7 @@
 #include "routeitem.h"
 
 
-QString RouteItem::info() const
+ToolTip RouteItem::info() const
 {
 	ToolTip tt;
 
@@ -32,7 +32,7 @@ QString RouteItem::info() const
 		tt.insert(tr("Links"), links);
 	}
 
-	return tt.toString();
+	return tt;
 }
 
 RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)

src/GUI/routeitem.h

@@ -21,7 +21,7 @@ public:
 	void showWaypoints(bool show);
 	void showWaypointLabels(bool show);
 
-	QString info() const;
+	ToolTip info() const;
 	QDateTime date() const {return QDateTime();}
 
 private:

src/GUI/speedgraphitem.cpp

@@ -15,7 +15,7 @@ SpeedGraphItem::SpeedGraphItem(const Graph &graph, GraphType type, int width,
 	_mavg = graph.last().last().s() / movingTime;
 }
 
-QString SpeedGraphItem::info() const
+ToolTip SpeedGraphItem::info() const
 {
 	ToolTip tt;
 	qreal scale = (_units == Imperial) ? MS2MIH : (_units == Nautical)
@@ -34,7 +34,7 @@ QString SpeedGraphItem::info() const
 	  ? avg() * scale : mavg() * scale, 'f', 1) + UNIT_SPACE + su);
 	tt.insert(tr("Pace"), pace + UNIT_SPACE + pu);
 
-	return tt.toString();
+	return tt;
 }
 
 void SpeedGraphItem::setTimeType(TimeType type)

src/GUI/speedgraphitem.h

@@ -17,7 +17,7 @@ public:
 	qreal mavg() const {return _mavg;}
 	qreal max() const {return _max;}
 
-	QString info() const;
+	ToolTip info() const;
 
 	void setTimeType(TimeType type);
 

src/GUI/temperaturegraphitem.cpp

@@ -12,7 +12,7 @@ TemperatureGraphItem::TemperatureGraphItem(const Graph &graph, GraphType type,
 	_avg = GraphItem::avg();
 }
 
-QString TemperatureGraphItem::info() const
+ToolTip TemperatureGraphItem::info() const
 {
 	ToolTip tt;
 	qreal scale = (_units == Metric) ? 1.0 : C2FS;
@@ -28,5 +28,5 @@ QString TemperatureGraphItem::info() const
 	tt.insert(tr("Minimum"), l.toString(min() * scale + offset, 'f', 1)
 	  + UNIT_SPACE + su);
 
-	return tt.toString();
+	return tt;
 }

src/GUI/temperaturegraphitem.h

@@ -15,7 +15,7 @@ public:
 	qreal min() const {return _min;}
 	qreal avg() const {return _avg;}
 
-	QString info() const;
+	ToolTip info() const;
 
 private:
 	qreal _min, _max, _avg;

src/GUI/thumbnail.cpp

@@ -0,0 +1,43 @@
+#include <QImageReader>
+#include <QDesktopServices>
+#include <QFileInfo>
+#include <QMouseEvent>
+#include "data/imageinfo.h"
+#include "thumbnail.h"
+
+static QSize thumbnailSize(const ImageInfo &img, int limit)
+{
+	int width, height;
+	if (img.size().width() > img.size().height()) {
+		width = qMin(img.size().width(), limit);
+		qreal ratio = img.size().width() / (qreal)img.size().height();
+		height = (int)(width / ratio);
+	} else {
+		height = qMin(img.size().height(), limit);
+		qreal ratio = img.size().height() / (qreal)img.size().width();
+		width = (int)(height / ratio);
+	}
+
+	return QSize(width, height);
+}
+
+Thumbnail::Thumbnail(const ImageInfo &img, int size, QWidget *parent)
+  : QLabel(parent)
+{
+	QImageReader reader(img.path());
+	reader.setAutoTransform(true);
+	reader.setScaledSize(thumbnailSize(img, size));
+	setPixmap(QPixmap::fromImage(reader.read()));
+
+	setCursor(Qt::PointingHandCursor);
+
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+	_path = QFileInfo(img.path()).absoluteFilePath();
+}
+
+void Thumbnail::mousePressEvent(QMouseEvent *event)
+{
+	if (event->button() == Qt::LeftButton)
+		QDesktopServices::openUrl(QUrl::fromLocalFile(_path));
+}

src/GUI/thumbnail.h

@@ -0,0 +1,20 @@
+#ifndef THUMBNAIL_H
+#define THUMBNAIL_H
+
+#include <QLabel>
+
+class ImageInfo;
+
+class Thumbnail : public QLabel
+{
+public:
+	Thumbnail(const ImageInfo &img, int size, QWidget *parent = 0);
+
+protected:
+	void mousePressEvent(QMouseEvent *event);
+
+private:
+	QString _path;
+};
+
+#endif // THUMBNAIL_H

src/GUI/tooltip.cpp

@@ -1,52 +0,0 @@
-#include "popup.h"
-#include "tooltip.h"
-
-static QSize thumbnailSize(const ImageInfo &img, int limit)
-{
-	int width, height;
-	if (img.size().width() > img.size().height()) {
-		width = qMin(img.size().width(), limit);
-		qreal ratio = img.size().width() / (qreal)img.size().height();
-		height = (int)(width / ratio);
-	} else {
-		height = qMin(img.size().height(), limit);
-		qreal ratio = img.size().height() / (qreal)img.size().width();
-		width = (int)(height / ratio);
-	}
-
-	return QSize(width, height);
-}
-
-void ToolTip::insert(const QString &key, const QString &value)
-{
-	_list.append(KV<QString, QString>(key, value));
-}
-
-QString ToolTip::toString() const
-{
-	QString html;
-
-	if (_images.size()) {
-		html = "<div align=\"center\">";
-		for (int i = 0; i < _images.size(); i++) {
-			const ImageInfo &img = _images.at(i);
-			QSize size(thumbnailSize(img, qMin(960/_images.size(), 240)));
-
-			html += QString("<a href=\"file:%0\">"
-			  "<img src=\"%0\" width=\"%1\" height=\"%2\"/></a>")
-			  .arg(img.path(), QString::number(size.width()),
-			  QString::number(size.height()));
-		}
-		html += "</div>";
-	}
-
-	if (!_list.isEmpty()) {
-		html += "<table>";
-		for (int i = 0; i < _list.count(); i++)
-			html += "<tr><td align=\"right\"><b>" + _list.at(i).key()
-			  + ":&nbsp;</b></td><td>" + _list.at(i).value() + "</td></tr>";
-		html += "</table>";
-	}
-
-	return html;
-}

src/GUI/tooltip.h

@@ -10,9 +10,31 @@
 class ToolTip
 {
 public:
-	void insert(const QString &key, const QString &value);
+	const QList<KV<QString, QString> > &list() const {return _list;}
-	void setImages(const QVector<ImageInfo> &images) {_images = images;}
+	const QVector<ImageInfo> &images() const {return _images;}
-	QString toString() const;
+
+	bool isEmpty() const
+	{
+		return _list.isEmpty() && _images.isEmpty();
+	}
+
+	bool operator==(const ToolTip &other) const
+	{
+		return (_list == other._list && _images == other._images);
+	}
+	bool operator!=(const ToolTip &other) const
+	{
+		return (_list != other._list || _images != other._images);
+	}
+
+	void insert(const QString &key, const QString &value)
+	{
+		_list.append(KV<QString, QString>(key, value));
+	}
+	void setImages(const QVector<ImageInfo> &images)
+	{
+		_images = images;
+	}
 
 private:
 	QList<KV<QString, QString> > _list;

src/GUI/trackitem.cpp

@@ -6,7 +6,7 @@
 #include "trackitem.h"
 
 
-QString TrackItem::info() const
+ToolTip TrackItem::info() const
 {
 	ToolTip tt;
 	QLocale l;
@@ -37,7 +37,7 @@ QString TrackItem::info() const
 		tt.insert(tr("Links"), links);
 	}
 
-	return tt.toString();
+	return tt;
 }
 
 TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)

src/GUI/trackitem.h

@@ -15,7 +15,7 @@ class TrackItem : public PathItem
 public:
 	TrackItem(const Track &track, Map *map, QGraphicsItem *parent = 0);
 
-	QString info() const;
+	ToolTip info() const;
 	QDateTime date() const {return _date;}
 
 private:

src/GUI/waypointitem.cpp

@@ -3,7 +3,6 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QLabel>
 #include "font.h"
-#include "tooltip.h"
 #include "popup.h"
 #include "waypointitem.h"
 
@@ -18,7 +17,7 @@ Units WaypointItem::_units = Metric;
 CoordinatesFormat WaypointItem::_format = DecimalDegrees;
 QTimeZone WaypointItem::_timeZone = QTimeZone::utc();
 
-QString WaypointItem::info() const
+ToolTip WaypointItem::info() const
 {
 	ToolTip tt;
 	QLocale l;
@@ -66,7 +65,7 @@ QString WaypointItem::info() const
 	}
 	tt.setImages(_waypoint.images());
 
-	return tt.toString();
+	return tt;
 }
 
 WaypointItem::WaypointItem(const Waypoint &waypoint, Map *map,

src/GUI/waypointitem.h

@@ -30,7 +30,7 @@ public:
 	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 	  QWidget *widget);
 
-	QString info() const;
+	ToolTip info() const;
 
 	static void setUnits(Units units) {_units = units;}
 	static void setCoordinatesFormat(CoordinatesFormat format)

src/common/kv.h

@@ -9,8 +9,19 @@ public:
 	const KEY &key() const {return _key;}
 	const VALUE &value() const {return _value;}
 
-	bool operator==(const KV &other) const {return _key == other._key;}
+	bool operator==(const KV &other) const
-	bool operator<(const KV &other) const {return _key < other._key;}
+	{
+		return (_key == other._key && _value == other._value);
+	}
+	bool operator<(const KV &other) const
+	{
+		if (_key < other._key)
+			return true;
+		else if (_key > other._key)
+			return false;
+		else
+			return _value < other._value;
+	}
 
 private:
 	KEY _key;

src/data/imageinfo.h

@@ -16,6 +16,11 @@ public:
 
 	bool isValid() const {return _size.isValid() && !_path.isEmpty();}
 
+	bool operator==(const ImageInfo &other) const
+	{
+		return (_path == other._path);
+	}
+
 private:
 	QString _path;
 	QSize _size;