Merge branch 'origin/master' into Weblate.

Currently translated at 98.1% (414 of 422 strings)

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

.appveyor.yml

@@ -1,4 +1,4 @@
-version: 9.8.{build}
+version: 9.9.{build}
 
 configuration:
   - Release

gpxsee.pro

@@ -3,7 +3,7 @@ unix:!macx {
 } else {
     TARGET = GPXSee
 }
-VERSION = 9.8
+VERSION = 9.9
 
 QT += core \
     gui \

lang/gpxsee_fi.ts

@@ -697,7 +697,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="808"/>
         <source>Symbols directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Symbolien hakemisto:</translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="1180"/>

pkg/gpxsee.nsi

@@ -9,7 +9,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "9.8"
+!define VERSION "9.9"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}.exe"

pkg/gpxsee64.nsi

@@ -9,7 +9,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "9.8"
+!define VERSION "9.9"
 
 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"

src/GUI/graphview.cpp

@@ -350,12 +350,12 @@ void GraphView::mousePressEvent(QMouseEvent *e)
 
 void GraphView::wheelEvent(QWheelEvent *e)
 {
-	static int deg = 0;
+	static int deg8 = 0;
 
-	deg += e->angleDelta().y() / 8;
+	deg8 += e->angleDelta().y();
-	if (qAbs(deg) < 15)
+	if (qAbs(deg8) < (15 * 8))
 		return;
-	deg = 0;
+	deg8 = deg8 % (15 * 8);
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	QPointF pos = mapToScene(e->pos());

src/GUI/mapview.cpp

@@ -586,17 +586,17 @@ void MapView::zoom(int zoom, const QPoint &pos, bool shift)
 
 void MapView::wheelEvent(QWheelEvent *event)
 {
-	static int deg = 0;
+	static int deg8 = 0;
 	bool shift = (event->modifiers() & MODIFIER) ? true : false;
 	// Shift inverts the wheel axis on OS X, so use scrolling in both axes for
 	// the zoom.
 	int delta = event->angleDelta().y()
 	  ? event->angleDelta().y() : event->angleDelta().x();
 
-	deg += delta / 8;
+	deg8 += delta;
-	if (qAbs(deg) < 15)
+	if (qAbs(deg8) < (15 * 8))
 		return;
-	deg = 0;
+	deg8 = deg8 % (15 * 8);
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
 	zoom((delta > 0) ? 1 : -1, event->pos(), shift);