Extended links support + popup fixes

src/GUI/areaitem.cpp

@@ -2,12 +2,13 @@
 #include <QApplication>
 #include <QCursor>
 #include <QPainter>
+#include <QGraphicsSceneMouseEvent>
 #include "map/map.h"
-#include "tooltip.h"
+#include "popup.h"
 #include "areaitem.h"
 
 
-QString AreaItem::toolTip() const
+ToolTip AreaItem::toolTip() const
 {
 	ToolTip tt;
 
@@ -17,7 +18,7 @@ QString AreaItem::toolTip() const
 		tt.insert(qApp->translate("PolygonItem", "Description"),
 		  _area.description());
 
-	return tt.toString();
+	return tt;
 }
 
 AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
@@ -35,8 +36,6 @@ AreaItem::AreaItem(const Area &area, Map *map, QGraphicsItem *parent)
 
 	setCursor(Qt::ArrowCursor);
 	setAcceptHoverEvents(true);
-
-	setToolTip(toolTip());
 }
 
 
@@ -171,3 +170,9 @@ void AreaItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 	setZValue(zValue() - 1.0);
 	update();
 }
+
+void AreaItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+	Popup::show(event->screenPos(), toolTip().toString(), event->widget());
+	QGraphicsItem::mousePressEvent(event);
+}

src/GUI/areaitem.h

@@ -3,6 +3,7 @@
 
 #include <QGraphicsItem>
 #include "data/area.h"
+#include "tooltip.h"
 
 class Map;
 
@@ -26,13 +27,15 @@ public:
 	void setStyle(Qt::PenStyle style);
 	void setDigitalZoom(int zoom);
 
-private:
+protected:
 	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
 	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+	void mousePressEvent(QGraphicsSceneMouseEvent *event);
 
+private:
 	QPainterPath painterPath(const Polygon &polygon);
 	void updatePainterPath();
-	QString toolTip() const;
+	ToolTip toolTip() const;
 
 	Area _area;
 	Map *_map;

src/GUI/mapview.cpp

@@ -215,12 +215,12 @@ QList<PathItem *> MapView::loadData(const Data &data)
 	QList<PathItem *> paths;
 	int zoom = _map->zoom();
 
+	for (int i = 0; i < data.areas().count(); i++)
+		addArea(data.areas().at(i));
 	for (int i = 0; i < data.tracks().count(); i++)
 		paths.append(addTrack(data.tracks().at(i)));
 	for (int i = 0; i < data.routes().count(); i++)
 		paths.append(addRoute(data.routes().at(i)));
-	for (int i = 0; i < data.areas().count(); i++)
-		addArea(data.areas().at(i));
 	addWaypoints(data.waypoints());
 
 	if (_tracks.empty() && _routes.empty() && _waypoints.empty()

src/GUI/routeitem.cpp

@@ -17,6 +17,13 @@ QString RouteItem::toolTip(Units units) const
 		tt.insert(tr("Description"), _desc);
 	tt.insert(tr("Distance"), Format::distance(path().last().last().distance(),
 	  units));
+	for (int i = 0; i < _links.size(); i++) {
+		const Link &link = _links.at(i);
+		if (!link.URL().isEmpty()) {
+			tt.insert(tr("Link"), QString("<a href=\"%0\">%1</a>").arg(
+			  link.URL(), link.text().isEmpty() ? link.URL() : link.text()));
+		}
+	}
 
 	return tt.toString();
 }
@@ -32,6 +39,7 @@ RouteItem::RouteItem(const Route &route, Map *map, QGraphicsItem *parent)
 
 	_name = route.name();
 	_desc = route.description();
+	_links = route.links();
 	_coordinatesFormat = DecimalDegrees;
 }
 

src/GUI/routeitem.h

@@ -28,6 +28,7 @@ public:
 private:
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 	CoordinatesFormat _coordinatesFormat;
 
 	QVector<WaypointItem*> _waypoints;

src/GUI/trackitem.cpp

@@ -21,6 +21,13 @@ QString TrackItem::toolTip(Units units) const
 		tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
 	if (!_date.isNull())
 		tt.insert(tr("Date"), _date.toString(Qt::SystemLocaleShortDate));
+	for (int i = 0; i < _links.size(); i++) {
+		const Link &link = _links.at(i);
+		if (!link.URL().isEmpty()) {
+			tt.insert(tr("Link"), QString("<a href=\"%0\">%1</a>").arg(
+			  link.URL(), link.text().isEmpty() ? link.URL() : link.text()));
+		}
+	}
 
 	return tt.toString();
 }
@@ -30,6 +37,7 @@ TrackItem::TrackItem(const Track &track, Map *map, QGraphicsItem *parent)
 {
 	_name = track.name();
 	_desc = track.description();
+	_links = track.links();
 	_date = track.date();
 	_time = track.time();
 	_movingTime = track.movingTime();

src/GUI/trackitem.h

@@ -21,6 +21,7 @@ public:
 private:
 	QString _name;
 	QString _desc;
+	QVector<Link> _links;
 	QDateTime _date;
 	qreal _time;
 	qreal _movingTime;

src/GUI/waypointitem.cpp

@@ -30,11 +30,14 @@ ToolTip WaypointItem::toolTip(Units units, CoordinatesFormat format)
 	if (!_waypoint.description().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Description"),
 		  _waypoint.description());
-	if (!_waypoint.link().URL().isEmpty())
-		tt.insert(qApp->translate("WaypointItem", "Link"),
-		  QString("<a href=\"%0\">%1</a>").arg(_waypoint.link().URL(),
-		  _waypoint.link().text().isEmpty() ? _waypoint.link().URL()
-		  : _waypoint.link().text()));
+	for (int i = 0; i < _waypoint.links().size(); i++) {
+		const Link &link = _waypoint.links().at(i);
+		if (!link.URL().isEmpty()) {
+			tt.insert(qApp->translate("WaypointItem", "Link"),
+			  QString("<a href=\"%0\">%1</a>").arg(link.URL(),
+			  link.text().isEmpty() ? link.URL() : link.text()));
+		}
+	}
 	tt.setImage(_waypoint.image());
 
 	return tt;
@@ -164,5 +167,6 @@ void WaypointItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
 	ToolTip tt(toolTip(_units, _format));
 	Popup::show(event->screenPos(), tt.toString(), event->widget());
-	QGraphicsItem::mousePressEvent(event);
+	/* Do not propagate the event any further as lower stacked items (path
+	   items) would replace the popup with their own popup */
 }