root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-28 05:34:47 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' of https://github.com/tumic0/GPXSee

Browse Source
This commit is contained in:
Martin Tůma 2018-01-08 23:49:00 +01:00
commit 02ad65461c
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -1,4 +1,4 @@
version: 4.17.{build} version: 4.19.{build}
configuration: Release configuration: Release
platform: Any CPU platform: Any CPU
environment: environment:

2
gpxsee.pro
View File

@ -1,5 +1,5 @@
TARGET = GPXSee TARGET = GPXSee
VERSION = 4.17 VERSION = 4.19
QT += core \ QT += core \
gui \ gui \
network network

8
lang/gpxsee_sv.ts
View File

@ -918,12 +918,12 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="40"/> <location filename="../src/GUI/optionsdialog.cpp" line="40"/>
<source>Always show the map</source> <source>Always show the map</source>
<translation type="unfinished"></translation> <translation>Visa alltid kartan</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="43"/> <location filename="../src/GUI/optionsdialog.cpp" line="43"/>
<source>Show the map even when no files are loaded.</source> <source>Show the map even when no files are loaded.</source>
<translation type="unfinished"></translation> <translation>Visa kartan även utan inlästa filer.</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="212"/> <location filename="../src/GUI/optionsdialog.cpp" line="212"/>
@ -955,7 +955,7 @@
<location filename="../src/GUI/optionsdialog.cpp" line="55"/> <location filename="../src/GUI/optionsdialog.cpp" line="55"/>
<location filename="../src/GUI/optionsdialog.cpp" line="460"/> <location filename="../src/GUI/optionsdialog.cpp" line="460"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation>Allmänt</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="88"/> <location filename="../src/GUI/optionsdialog.cpp" line="88"/>
@ -1014,7 +1014,7 @@
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="190"/> <location filename="../src/GUI/optionsdialog.cpp" line="190"/>
<source>Slider color:</source> <source>Slider color:</source>
<translation type="unfinished"></translation> <translation>Skjutreglagefärg:</translation>
</message> </message>
<message> <message>
<location filename="../src/GUI/optionsdialog.cpp" line="224"/> <location filename="../src/GUI/optionsdialog.cpp" line="224"/>

2
pkg/gpxsee.nsi
View File

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

2
pkg/gpxsee64.nsi
View File

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

3
src/GUI/mapview.cpp
View File

@ -566,6 +566,9 @@ void MapView::clear()
_wr = RectC(); _wr = RectC();
digitalZoom(0); digitalZoom(0);
// If not reset, causes huge redraw areas (and system memory exhaustion)
resetCachedContent();
} }
void MapView::showTracks(bool show) void MapView::showTracks(bool show)