root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-25 16:04:23 +02:00
Code Issues Projects Releases Activity

Compare commits

base: root:7.27
Branches Tags
root:master root:gh-pages root:android-latest
root:13.45 root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0
...
compare: root:7.28
Branches Tags
root:master root:gh-pages root:android-latest
root:13.45 root:13.44 root:13.43 root:13.42 root:13.41 root:13.40 root:13.39 root:13.38 root:13.37 root:13.36 root:13.35 root:13.34 root:13.33 root:13.32 root:13.31 root:13.30 root:13.29 root:13.28 root:13.27 root:13.26 root:13.25 root:13.24 root:13.23 root:13.22 root:13.21 root:13.20 root:13.19 root:13.18 root:13.17 root:13.16 root:13.15 root:13.14 root:13.13 root:13.12 root:13.11 root:13.10 root:13.9 root:13.8 root:13.7 root:13.6 root:13.5 root:13.4 root:13.3 root:13.2 root:13.1 root:13.0 root:12.4 root:12.3 root:12.2 root:12.1 root:12.0 root:11.12 root:11.11 root:11.10 root:11.9 root:11.8 root:11.7 root:11.6 root:11.5 root:11.4 root:11.3 root:11.2 root:11.1 root:11.0 root:10.7 root:10.6 root:10.5 root:10.4 root:10.3 root:10.2 root:10.1 root:10.0 root:9.12 root:9.11 root:9.10 root:9.9 root:9.8 root:9.7 root:9.6 root:9.5 root:9.4 root:9.3 root:9.2 root:9.1 root:9.0 root:8.9 root:8.8 root:8.7 root:8.6 root:8.5 root:8.4 root:8.3 root:8.2 root:8.1 root:8.0 root:7.38 root:7.37 root:7.36 root:7.35 root:7.34 root:7.33 root:7.32 root:7.31 root:7.30 root:7.29 root:7.28 root:7.27 root:7.26 root:7.25 root:7.24 root:7.23 root:7.22 root:7.21 root:7.20 root:7.19 root:7.18 root:7.17 root:7.16 root:7.15 root:7.14 root:7.13 root:7.12 root:7.11 root:7.10 root:7.9 root:7.8 root:7.7 root:7.6 root:7.5 root:7.4 root:7.3 root:7.2 root:7.1 root:7.0 root:6.3 root:6.2 root:6.1 root:6.0 root:5.18 root:5.17 root:5.16 root:5.15 root:5.14 root:5.13 root:5.12 root:5.11 root:5.10 root:5.9 root:5.8 root:5.7 root:5.6 root:5.5 root:5.4 root:5.3 root:5.2 root:5.1 root:5.0 root:4.19 root:4.18 root:4.17 root:4.16 root:4.15 root:4.14 root:4.13 root:4.12 root:4.11 root:4.10 root:4.9 root:4.8 root:4.7 root:4.6 root:4.5 root:4.4 root:4.3 root:4.2 root:4.1 root:4.0 root:3.10 root:3.9 root:3.8 root:3.7 root:3.6 root:3.5 root:3.4 root:3.3 root:3.2 root:3.1 root:3.0 root:2.20 root:2.19 root:2.18 root:2.17 root:2.16 root:2.15 root:2.14 root:2.13 root:2.12 root:2.11 root:2.10 root:2.9 root:2.8 root:2.7 root:2.6 root:2.5 root:2.4 root:2.3 root:2.2 root:2.1 root:2.0 root:1.1 root:1.0

10 Commits
7.27 ... 7.28

Author SHA1 Message Date
Martin Tůma
e26d1abd5a Version++ 2020-04-05 10:50:24 +02:00
Hosted Weblate
e80d16bec5 Merge branch 'origin/master' into Weblate. 2020-04-05 10:39:16 +02:00
Martin Tůma
412ae74bfa Fixed broken map enable condition 
(falsly enabled map can crash)
 2020-04-05 10:38:16 +02:00
99 efi
1c472e47b9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (356 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/hu/
 2020-04-04 20:09:37 +02:00
Nikolay Korotkiy
4a725375e2 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (356 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/uk/
 2020-04-02 12:09:36 +02:00
Nikolay Korotkiy
383a196414 Translated using Weblate (Russian) 
Currently translated at 100.0% (356 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
 2020-04-02 12:09:36 +02:00
Nikolay Korotkiy
f05b51efa6 Translated using Weblate (Finnish) 
Currently translated at 100.0% (356 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/
 2020-04-02 12:09:36 +02:00
Allan Nordhøy
a56c02953f Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.4% (354 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/nb_NO/
 2020-03-29 20:05:00 +02:00
Nathan
00d3849e4f Translated using Weblate (French) 
Currently translated at 100.0% (356 of 356 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fr/
 2020-03-29 20:05:00 +02:00
Martin Tůma
c9244c0684 Fixed broken graph color change when secondary graphs present 2020-03-28 23:28:39 +01:00
13 changed files with 45 additions and 29 deletions
Expand all files Collapse all files

2
.appveyor.yml
View File

@ -1,4 +1,4 @@
version: 7.27.{build} version: 7.28.{build}
configuration: configuration:
- Release - Release

2
gpxsee.pro
View File

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

4
lang/gpxsee_fi.ts
View File

@ -1327,7 +1327,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Näytä molemmat samanaikaisesti</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1342,7 +1342,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Näytä molemmat samanaikaisesti</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="462"/> <location filename="../src/GUI/optionsdialog.cpp" line="462"/>

10
lang/gpxsee_fr.ts
View File

@ -1327,7 +1327,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Afficher la vitesse secondaire</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1342,7 +1342,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Afficher l’élévation secondaire</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="462"/> <location filename="../src/GUI/optionsdialog.cpp" line="462"/>
@ -1628,7 +1628,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="19"/> <location filename="../src/GUI/routeitem.cpp" line="19"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Commentaire</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="20"/> <location filename="../src/GUI/routeitem.cpp" line="20"/>
@ -1849,7 +1849,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="17"/> <location filename="../src/GUI/trackitem.cpp" line="17"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Commentaire</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="18"/> <location filename="../src/GUI/trackitem.cpp" line="18"/>
@ -1907,7 +1907,7 @@
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="39"/> <location filename="../src/GUI/waypointitem.cpp" line="39"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Commentaire</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="52"/> <location filename="../src/GUI/waypointitem.cpp" line="52"/>

11
lang/gpxsee_hu.ts
View File

@ -864,6 +864,7 @@
<source>%n files</source> <source>%n files</source>
<translation> <translation>
<numerusform>%n fájl</numerusform> <numerusform>%n fájl</numerusform>
<numerusform>%n fájl</numerusform>
</translation> </translation>
</message> </message>
</context> </context>
@ -1366,7 +1367,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Másodlagos sebesség mutatása</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1381,7 +1382,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Másodlagos emelkedés mutatása</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="455"/> <location filename="../src/GUI/optionsdialog.cpp" line="455"/>
@ -1627,7 +1628,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="19"/> <location filename="../src/GUI/routeitem.cpp" line="19"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Megjegyzés</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="20"/> <location filename="../src/GUI/routeitem.cpp" line="20"/>
@ -1848,7 +1849,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="17"/> <location filename="../src/GUI/trackitem.cpp" line="17"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Megjegyzés</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="18"/> <location filename="../src/GUI/trackitem.cpp" line="18"/>
@ -1906,7 +1907,7 @@
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="39"/> <location filename="../src/GUI/waypointitem.cpp" line="39"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Megjegyzés</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="52"/> <location filename="../src/GUI/waypointitem.cpp" line="52"/>

10
lang/gpxsee_nb.ts
View File

@ -1362,7 +1362,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Vis sekundær hastighet</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1377,7 +1377,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Vis sekundær høyde</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="462"/> <location filename="../src/GUI/optionsdialog.cpp" line="462"/>
@ -1628,7 +1628,7 @@
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="19"/> <location filename="../src/GUI/routeitem.cpp" line="19"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation>Kommentar</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/routeitem.cpp" line="20"/> <location filename="../src/GUI/routeitem.cpp" line="20"/>
@ -1849,7 +1849,7 @@
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="17"/> <location filename="../src/GUI/trackitem.cpp" line="17"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation type="unfinished">Kommentar</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/trackitem.cpp" line="18"/> <location filename="../src/GUI/trackitem.cpp" line="18"/>
@ -1907,7 +1907,7 @@
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="39"/> <location filename="../src/GUI/waypointitem.cpp" line="39"/>
<source>Comment</source> <source>Comment</source>
<translation type="unfinished"></translation> <translation type="unfinished">Kommentar</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/waypointitem.cpp" line="52"/> <location filename="../src/GUI/waypointitem.cpp" line="52"/>

4
lang/gpxsee_ru.ts
View File

@ -1328,7 +1328,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Показывать обе одновременно</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1343,7 +1343,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Показывать обе одновременно</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="462"/> <location filename="../src/GUI/optionsdialog.cpp" line="462"/>

4
lang/gpxsee_uk.ts
View File

@ -1368,7 +1368,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="410"/> <location filename="../src/GUI/optionsdialog.cpp" line="410"/>
<source>Show secondary speed</source> <source>Show secondary speed</source>
<translation type="unfinished"></translation> <translation>Показувати обидві одночасно</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="413"/> <location filename="../src/GUI/optionsdialog.cpp" line="413"/>
@ -1383,7 +1383,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="419"/> <location filename="../src/GUI/optionsdialog.cpp" line="419"/>
<source>Show secondary elevation</source> <source>Show secondary elevation</source>
<translation type="unfinished"></translation> <translation>Показувати обидві одночасно</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="455"/> <location filename="../src/GUI/optionsdialog.cpp" line="455"/>

2
pkg/gpxsee.nsi
View File

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

2
pkg/gpxsee64.nsi
View File

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

20
src/GUI/graphview.cpp
View File

@ -1,3 +1,4 @@
#include <QSet>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QEvent> #include <QEvent>
#include <QMouseEvent> #include <QMouseEvent>
@ -494,8 +495,23 @@ void GraphView::setPalette(const Palette &palette)
_palette = palette; _palette = palette;
_palette.reset(); _palette.reset();
for (int i = 0; i < _graphs.count(); i++) QSet<GraphItem*> secondary;
_graphs.at(i)->setColor(_palette.nextColor()); for (int i = 0; i < _graphs.count(); i++) {
GraphItem *g = _graphs[i];
if (g->secondaryGraph())
secondary.insert(g->secondaryGraph());
}
for (int i = 0; i < _graphs.count(); i++) {
GraphItem *g = _graphs[i];
if (secondary.contains(g))
continue;
QColor color(_palette.nextColor());
g->setColor(color);
if (g->secondaryGraph())
g->secondaryGraph()->setColor(color);
}
} }
void GraphView::setGraphWidth(int width) void GraphView::setGraphWidth(int width)

1
src/GUI/graphview.h
View File

@ -3,7 +3,6 @@
#include <QGraphicsView> #include <QGraphicsView>
#include <QList> #include <QList>
#include <QSet>
#include "data/graph.h" #include "data/graph.h"
#include "palette.h" #include "palette.h"
#include "units.h" #include "units.h"

2
src/GUI/mapaction.h
View File

@ -13,7 +13,7 @@ public:
{ {
map->setParent(this); map->setParent(this);
setData(QVariant::fromValue(map)); setData(QVariant::fromValue(map));
setEnabled(map->isValid()); setEnabled(map->isReady());
connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded())); connect(map, SIGNAL(mapLoaded()), this, SLOT(mapLoaded()));
} }