Merge branch 'origin/master' into Weblate.

Currently translated at 100.0% (482 of 482 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/sv/

lang/gpxsee_sv.ts

@@ -1887,12 +1887,12 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="388"/>
         <source>Detect pauses</source>
-        <translation type="unfinished"></translation>
+        <translation>Identifiera pauser</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="539"/>
         <source>Detection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Identifiering:</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="658"/>

src/GUI/markerinfoitem.cpp

@@ -26,7 +26,7 @@ void MarkerInfoItem::setDate(const QDateTime &date)
 
 	QLocale l;
 	_s1 = l.toString(date.date(), QLocale::ShortFormat);
-	_s2 = l.toString(date.time(), QLocale::ShortFormat);
+	_s2 = date.time().toString("h:mm:ss");
 
 	updateBoundingRect();
 }

src/GUI/trackitem.cpp

@@ -23,9 +23,11 @@ ToolTip TrackItem::info() const
 		tt.insert(tr("Total time"), Format::timeSpan(_time));
 	if  (_movingTime > 0)
 		tt.insert(tr("Moving time"), Format::timeSpan(_movingTime));
-	if (!_date.isNull())
+	if (!_date.isNull()) {
-		tt.insert(tr("Date"), l.toString(_date.toTimeZone(_timeZone),
+		QDateTime date(_date.toTimeZone(_timeZone));
-		  QLocale::ShortFormat));
+		tt.insert(tr("Date"), l.toString(date.date(), QLocale::ShortFormat)
+		  + " " + date.time().toString("h:mm:ss"));
+	}
 	if (!_links.isEmpty()) {
 		QString links;
 		for (int i = 0; i < _links.size(); i++) {

src/GUI/waypointitem.cpp

@@ -32,10 +32,12 @@ ToolTip WaypointItem::info() const
 			val += " (" + Format::elevation(elevations.second, _units) + ")";
 		tt.insert(qApp->translate("WaypointItem", "Elevation"), val);
 	}
-	if (_waypoint.timestamp().isValid())
+	if (_waypoint.timestamp().isValid()) {
+		QDateTime date(_waypoint.timestamp().toTimeZone(_timeZone));
 		tt.insert(qApp->translate("WaypointItem", "Date"),
-		  l.toString(_waypoint.timestamp().toTimeZone(_timeZone),
+		  l.toString(date.date(), QLocale::ShortFormat) + " "
-		  QLocale::ShortFormat));
+			+ date.time().toString("h:mm:ss"));
+	}
 	if (!_waypoint.description().isEmpty())
 		tt.insert(qApp->translate("WaypointItem", "Description"),
 		  _waypoint.description());

src/data/fitparser.cpp

@@ -238,6 +238,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 	bool valid;
 	Event event;
 	Waypoint waypoint;
+	int trigger = -1;
 
 	if (!def->fields.size() && !def->devFields.size()) {
 		_errorString = "Undefined data message";
@@ -359,8 +360,8 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 				case 7:
 					waypoint.setDescription(Format::timeSpan(val.toUInt() / 1000));
 					break;
-				case 254:
+				case 24:
-					waypoint.setName("#" + QString::number(val.toUInt()));
+					trigger = val.toInt();
 					break;
 			}
 		}
@@ -384,7 +385,7 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 			ctx.segment.append(ctx.trackpoint);
 			ctx.trackpoint = Trackpoint();
 		}
-	} else if (def->globalId == COURSEPOINT || def->globalId == LAP) {
+	} else if (def->globalId == COURSEPOINT) {
 		if (waypoint.coordinates().isValid())
 			ctx.waypoints.append(waypoint);
 	} else if (def->globalId == LOCATION) {
@@ -393,6 +394,17 @@ bool FITParser::parseData(CTX &ctx, const MessageDefinition *def)
 			  + 631065600, Qt::UTC));
 			ctx.waypoints.append(waypoint);
 		}
+	} else if (def->globalId == LAP && trigger >= 0) {
+		if (waypoint.coordinates().isValid()) {
+			if (trigger == 7)
+				waypoint.setName("Finish");
+			else
+				waypoint.setName("Lap " + QString::number(++ctx.laps));
+			waypoint.setTimestamp(QDateTime::fromSecsSinceEpoch(ctx.timestamp
+			  + 631065600, Qt::UTC));
+			if (trigger != 7 || ctx.laps > 1)
+				ctx.waypoints.append(waypoint);
+		}
 	}
 
 	return true;

src/data/fitparser.h

@@ -52,7 +52,7 @@ private:
 	struct CTX {
 		CTX(QFile *file, QVector<Waypoint> &waypoints)
 		  : file(file), waypoints(waypoints), len(0), endian(0), timestamp(0),
-		  ratio(NAN) {}
+		  ratio(NAN), laps(0) {}
 
 		QFile *file;
 		QVector<Waypoint> &waypoints;
@@ -63,6 +63,7 @@ private:
 		qreal ratio;
 		Trackpoint trackpoint;
 		SegmentData segment;
+		unsigned laps;
 	};
 
 	bool readData(QFile *file, char *data, size_t size);