diff --git a/lang/gpxsee_cs.ts b/lang/gpxsee_cs.ts
index d736582d..9ace550e 100644
--- a/lang/gpxsee_cs.ts
+++ b/lang/gpxsee_cs.ts
@@ -391,7 +391,7 @@
-
+
Moving time
Čistý čas
@@ -536,33 +536,33 @@
Offline mapy jsou načítány při startu aplikace z následujícího adresáře:
-
+
Open map file
Otevřít mapový soubor
-
+
No files loaded
Nejsou načteny žádné soubory
-
-
+
+
Date
Datum
-
+
Routes
Trasy
-
+
Error loading map:
Mapu nelze načíst:
-
+
%n files
%n soubor
@@ -591,7 +591,7 @@
Exportovat do PDF...
-
+
Waypoints
Navigační body
@@ -651,12 +651,12 @@
Soubor POI nelze načíst:
-
+
Name
Název
-
+
Tracks
Cesty
@@ -678,14 +678,14 @@
-
+
Distance
Vzdálenost
-
+
Time
Čas
@@ -789,282 +789,286 @@
Posun palety:
-
+
Track width:
Šířka cest:
-
+
Track style:
Styl cest:
-
+
Tracks
Cesty
-
+
Route width:
Šířka tras:
-
+
Route style:
Styl tras:
-
+
Routes
Trasy
-
-
+
+
Use anti-aliasing
Vyhlazovat hrany
-
+
Line width:
Šířka čar:
-
+
Colors
Barvy
-
-
+
+ Background color:
+ Barva pozadí:
+
+
+
Paths
Trasy
-
+
Map opacity:
Neprůhlednost mapy:
-
+
Map
Mapa
-
-
+
+
Graphs
Grafy
-
+
Moving average window size
Velikost okna klouzavého průměru
-
+
Elevation:
Výška:
-
+
Speed:
Rychlost:
-
+
Heart rate:
Tep:
-
+
Cadence:
Kadence:
-
+
Power:
Výkon:
-
+
Smoothing
Vyhlazování
-
+
Eliminate GPS outliers
Odstarnit odlehlé GPS záznamy
-
+
Outlier elimination
Odstranění odlehlých hodnot
-
+
Smoothing:
Vyhlazování:
-
+
mi/h
mi/h
-
+
km/h
km/h
-
+
s
s
-
+
Minimal speed:
Minimální rychlost:
-
+
Minimal duration:
Minimální doba trvání:
-
+
Filtering
Filtrování
-
+
Pause detection
Detekce přestávek
-
+
mi
mi
-
+
km
km
-
+
POI radius:
POI radius:
-
-
+
+
POI
POI
-
+
WYSIWYG
WYSIWYG
-
+
High-Resolution
Vysoké rozlišení
-
+
The printed area is approximately the display area. The map zoom level does not change.
Oblast tisku přibližně odpovídá zobrazované oblasti. Přiblížení mapy se nemění.
-
+
The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution.
Přiblížení mapy bude upraveno tak, aby se celý obsah (trasy/body) vešel do oblasti tisku a rozlišení mapy bylo co nejblíže rozlišení tisku.
-
+
Name
Název
-
+
Date
Datum
-
+
Distance
Vzdálenost
-
+
Time
Čas
-
+
Moving time
Čistý čas
-
+
Item count (>1)
Počet objektů (>1)
-
+
Separate graph page
Samostatná stránka s grafy
-
+
Print mode
Režim tisku
-
+
Header
Záhlaví
-
+
Use OpenGL
Používat OpenGL
-
+
MB
MB
-
+
Image cache size:
Mezipaměť obrázků:
-
-
+
+
System
Systém
-
+
Appearance
Vzhled
-
+
Data
Data
-
+
Print & Export
Tisk a export
-
+
Options
Nastavení
diff --git a/lang/gpxsee_de.ts b/lang/gpxsee_de.ts
index c9552460..545ff1b1 100644
--- a/lang/gpxsee_de.ts
+++ b/lang/gpxsee_de.ts
@@ -391,7 +391,7 @@
-
+
Moving time
Bewegungszeit
@@ -541,22 +541,22 @@
Offlinekarten werden zu Programmstart aus dem folgenden Verzeichnis geladen:
-
+
Open map file
Karte Datei öffnen
-
+
Error loading map:
Fehler beim Laden der Karte-Datei:
-
+
No files loaded
Keine Dateien geladen
-
+
%n files
%n Datei
@@ -564,13 +564,13 @@
-
-
+
+
Date
Datum
-
+
Routes
Routen
@@ -595,7 +595,7 @@
Als PDF exportieren...
-
+
Waypoints
Wegpunkte
@@ -650,12 +650,12 @@
Fehler beim Laden der POI-Datei:
-
+
Name
Name
-
+
Tracks
Strecken
@@ -677,14 +677,14 @@
-
+
Distance
Distanz
-
+
Time
Zeit
@@ -788,282 +788,286 @@
Palettenverschiebung:
-
+
Track width:
Streckenbreite:
-
+
Track style:
Streckenstil:
-
+
Tracks
Strecken
-
+
Route width:
Routenbreite:
-
+
Route style:
Routenstil:
-
+
Routes
Routen
-
-
+
+
Use anti-aliasing
Anti-Aliasing verwenden
-
+
Line width:
Linienbreite:
-
+
Colors
Farben
-
-
+
+ Background color:
+ Hintergrundfarbe:
+
+
+
Paths
Pfade
-
+
Map opacity:
Karte Deckkraft:
-
+
Map
Karte
-
-
+
+
Graphs
Graphen
-
+
Moving average window size
Fensterbreite des gleitenden Mittelwerts
-
+
Elevation:
Höhe:
-
+
Speed:
Geschwindigkeit:
-
+
Heart rate:
Herzfrequenz:
-
+
Cadence:
Frequenz:
-
+
Power:
Leistung:
-
+
Smoothing
Glätten
-
+
Eliminate GPS outliers
GPS Ausreißer entfernen
-
+
Outlier elimination
Ausreißer Entfernung
-
+
Smoothing:
Glätten:
-
+
mi/h
mi/h
-
+
km/h
km/h
-
+
s
sek
-
+
Minimal speed:
Minimale Geschwindigkeit:
-
+
Minimal duration:
Minimale Dauer:
-
+
Filtering
Datenfilterung
-
+
Pause detection
Pausenerkennung
-
+
mi
mi
-
+
km
km
-
+
POI radius:
POI-Radius:
-
-
+
+
POI
POI
-
+
WYSIWYG
WYSIWYG
-
+
High-Resolution
Hohe Auflösung
-
+
The printed area is approximately the display area. The map zoom level does not change.
Der Druckbereich ist circa der Anzeigebereich. Das Karten-Zoom ändert sich nicht.
-
+
The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution.
Das Karten-Zoom ändert sich so, dass der ganze Inhalt (Strecken/Wegpunkte) in den Druckbereich passen und die Kartenauflösung so nah wie möglich an der Druckauflösung ist.
-
+
Name
Name
-
+
Date
Datum
-
+
Distance
Distanz
-
+
Time
Zeit
-
+
Moving time
Bewegungszeit
-
+
Item count (>1)
Elementanzahl (>1)
-
+
Separate graph page
Separate Seite für Graphen
-
+
Print mode
Druckmodus
-
+
Header
Kopfzeile
-
+
Use OpenGL
OpenGL verwenden
-
+
MB
MB
-
+
Image cache size:
Bild-Cache größe:
-
-
+
+
System
System
-
+
Appearance
Erscheinungsbild
-
+
Data
Daten
-
+
Print & Export
Druck & Export
-
+
Options
Einstellungen
diff --git a/lang/gpxsee_sv.ts b/lang/gpxsee_sv.ts
index 14fa7eb4..78cdd27a 100644
--- a/lang/gpxsee_sv.ts
+++ b/lang/gpxsee_sv.ts
@@ -391,7 +391,7 @@
-
+
Moving time
Förflyttningstid
@@ -541,22 +541,22 @@
Offline-kartor läses in från följande mapp vid programstart:
-
+
Open map file
Öppna kartfil
-
+
Error loading map:
Fel vid inläsning av karta:
-
+
No files loaded
Inga filer inlästa
-
+
%n files
%n filer
@@ -564,13 +564,13 @@
-
-
+
+
Date
Datum
-
+
Routes
Rutter
@@ -595,7 +595,7 @@
Exportera till PDF...
-
+
Waypoints
Vägpunkter
@@ -650,12 +650,12 @@
Fel vid inläsning av POI-fil:
-
+
Name
Namn
-
+
Tracks
Spår
@@ -677,14 +677,14 @@
-
+
Distance
Avstånd
-
+
Time
Tid
@@ -788,282 +788,286 @@
Palettskiftning:
-
+
Track width:
Spårtjocklek:
-
+
Track style:
Spårstil:
-
+
Tracks
Spår
-
+
Route width:
Ruttjocklek:
-
+
Route style:
Ruttstil:
-
+
Routes
Rutter
-
-
+
+
Use anti-aliasing
Använd kantutjämning
-
+
Line width:
Linjetjocklek:
-
+
Colors
Färger
-
-
+
+ Background color:
+
+
+
+
Paths
Sökvägar
-
+
Map opacity:
- Kartopacitet
+ Kartopacitet:
-
+
Map
Karta
-
-
+
+
Graphs
Diagram
-
+
Moving average window size
Flyttar vanlig fönsterstorlek
-
+
Elevation:
Höjd:
-
+
Speed:
Hastighet:
-
+
Heart rate:
Hjärtfrekvens:
-
+
Cadence:
Stegfrekvens:
-
+
Power:
Kraft:
-
+
Smoothing
Utjämning
-
+
Eliminate GPS outliers
Eliminera GPS-extremvärden
-
+
Outlier elimination
Extremvärdeseliminering
-
+
Smoothing:
Utjämning:
-
+
mi/h
mi/h
-
+
km/h
km/h
-
+
s
sek
-
+
Minimal speed:
Minsta hastighet:
-
+
Minimal duration:
Kortast varaktighet:
-
+
Filtering
Filtrerar
-
+
Pause detection
Pausa identifiering
-
+
mi
mi
-
+
km
km
-
+
POI radius:
POI-radie:
-
-
+
+
POI
POI
-
+
WYSIWYG
WYSIWYG
-
+
High-Resolution
Högupplösning
-
+
The printed area is approximately the display area. The map zoom level does not change.
Det utskrivna området är ungefär detsamma som synligt område på skärmen. Kartans zoomnivå ändras inte.
-
+
The zoom level will be changed so that the whole content (tracks/waypoints) fits to the printed area and the map resolution is as close as possible to the print resolution.
Zoomnivån kommer att ändras så att hela innehållet (spår/vägpunkter) passar utskriftsområdet och kartresolutionen är så nära som möjligt till utskriftsupplösningen.
-
+
Name
Namn
-
+
Date
Datum
-
+
Distance
Avstånd
-
+
Time
Tid
-
+
Moving time
Förflyttningstid
-
+
Item count (>1)
Objektantal (>1)
-
+
Separate graph page
Separat diagramsida
-
+
Print mode
Utskriftsläge
-
+
Header
-
+
Use OpenGL
Använd OpenGL
-
+
MB
MB
-
+
Image cache size:
Cashe-storlek för bilder:
-
-
+
+
System
System
-
+
Appearance
Utseende
-
+
Data
Data
-
+
Print & Export
Utskrift & Export
-
+
Options
Alternativ
diff --git a/src/gui.cpp b/src/gui.cpp
index 03b93b13..bf0c7a1a 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -871,6 +871,8 @@ void GUI::openOptions()
}
if (options.mapOpacity != _options.mapOpacity)
_pathView->setMapOpacity(options.mapOpacity);
+ if (options.blendColor != _options.blendColor)
+ _pathView->setBlendColor(options.blendColor);
if (options.trackWidth != _options.trackWidth)
_pathView->setTrackWidth(options.trackWidth);
if (options.routeWidth != _options.routeWidth)
@@ -1608,6 +1610,8 @@ void GUI::writeSettings()
settings.setValue(PALETTE_SHIFT_SETTING, _options.palette.shift());
if (_options.mapOpacity != MAP_OPACITY_DEFAULT)
settings.setValue(MAP_OPACITY_SETTING, _options.mapOpacity);
+ if (_options.blendColor != BLEND_COLOR_DEFAULT)
+ settings.setValue(BLEND_COLOR_SETTING, _options.blendColor);
if (_options.trackWidth != TRACK_WIDTH_DEFAULT)
settings.setValue(TRACK_WIDTH_SETTING, _options.trackWidth);
if (_options.routeWidth != ROUTE_WIDTH_DEFAULT)
@@ -1809,6 +1813,8 @@ void GUI::readSettings()
_options.palette = Palette(pc, ps);
_options.mapOpacity = settings.value(MAP_OPACITY_SETTING,
MAP_OPACITY_DEFAULT).toInt();
+ _options.blendColor = settings.value(BLEND_COLOR_SETTING,
+ BLEND_COLOR_DEFAULT).value();
_options.trackWidth = settings.value(TRACK_WIDTH_SETTING,
TRACK_WIDTH_DEFAULT).toInt();
_options.routeWidth = settings.value(ROUTE_WIDTH_SETTING,
@@ -1864,6 +1870,7 @@ void GUI::readSettings()
_pathView->setPalette(_options.palette);
_pathView->setMapOpacity(_options.mapOpacity);
+ _pathView->setBlendColor(_options.blendColor);
_pathView->setTrackWidth(_options.trackWidth);
_pathView->setRouteWidth(_options.routeWidth);
_pathView->setTrackStyle(_options.trackStyle);
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index 8f8e3877..e53d7369 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -37,36 +37,10 @@ QWidget *OptionsDialog::createAppearancePage()
paletteLayout->addRow(tr("Base color:"), _baseColor);
paletteLayout->addRow(tr("Palette shift:"), _colorOffset);
#ifndef Q_OS_MAC
- QGroupBox *pathsBox = new QGroupBox(tr("Paths"));
- pathsBox->setLayout(paletteLayout);
+ QGroupBox *colorBox = new QGroupBox(tr("Colors"));
+ colorBox->setLayout(paletteLayout);
#endif
- _mapOpacity = new PercentSlider();
- _mapOpacity->setValue(_options->mapOpacity);
- QFormLayout *mapLayout = new QFormLayout();
- mapLayout->addRow(tr("Map opacity:"), _mapOpacity);
-#ifndef Q_OS_MAC
- QGroupBox *mapBox = new QGroupBox(tr("Map"));
- mapBox->setLayout(mapLayout);
-#endif
-
- QWidget *colorTab = new QWidget();
- QVBoxLayout *colorTabLayout = new QVBoxLayout();
-#ifdef Q_OS_MAC
- QFrame *l0 = new QFrame();
- l0->setFrameShape(QFrame::HLine);
- l0->setFrameShadow(QFrame::Sunken);
-
- colorTabLayout->addLayout(paletteLayout);
- colorTabLayout->addWidget(l0);
- colorTabLayout->addLayout(mapLayout);
-#else // Q_OS_MAC
- colorTabLayout->addWidget(pathsBox);
- colorTabLayout->addWidget(mapBox);
-#endif // O_OS_MAC
- colorTabLayout->addStretch();
- colorTab->setLayout(colorTabLayout);
-
_trackWidth = new QSpinBox();
_trackWidth->setValue(_options->trackWidth);
_trackWidth->setMinimum(1);
@@ -101,6 +75,9 @@ QWidget *OptionsDialog::createAppearancePage()
QWidget *pathTab = new QWidget();
QVBoxLayout *pathTabLayout = new QVBoxLayout();
#ifdef Q_OS_MAC
+ QFrame *l0 = new QFrame();
+ l0->setFrameShape(QFrame::HLine);
+ l0->setFrameShadow(QFrame::Sunken);
QFrame *l1 = new QFrame();
l1->setFrameShape(QFrame::HLine);
l1->setFrameShadow(QFrame::Sunken);
@@ -108,11 +85,14 @@ QWidget *OptionsDialog::createAppearancePage()
l2->setFrameShape(QFrame::HLine);
l2->setFrameShadow(QFrame::Sunken);
+ pathTabLayout->addLayout(paletteLayout);
+ pathTabLayout->addWidget(l0);
pathTabLayout->addLayout(trackLayout);
pathTabLayout->addWidget(l1);
pathTabLayout->addLayout(routeLayout);
pathTabLayout->addWidget(l2);
#else // Q_OS_MAC
+ pathTabLayout->addWidget(colorBox);
pathTabLayout->addWidget(trackBox);
pathTabLayout->addWidget(routeBox);
#endif // Q_OS_MAC
@@ -139,10 +119,28 @@ QWidget *OptionsDialog::createAppearancePage()
graphTabLayout->addStretch();
graphTab->setLayout(graphTabLayout);
+
+ _mapOpacity = new PercentSlider();
+ _mapOpacity->setValue(_options->mapOpacity);
+ _blendColor = new ColorBox();
+ _blendColor->setColor(_options->blendColor);
+ QFormLayout *mapLayout = new QFormLayout();
+ mapLayout->addRow(tr("Background color:"), _blendColor);
+ mapLayout->addRow(tr("Map opacity:"), _mapOpacity);
+
+
+ QWidget *mapTab = new QWidget();
+ QVBoxLayout *mapTabLayout = new QVBoxLayout();
+ mapTabLayout->addLayout(mapLayout);
+ mapTabLayout->addStretch();
+ mapTab->setLayout(mapTabLayout);
+
+
+
QTabWidget *appearancePage = new QTabWidget();
- appearancePage->addTab(colorTab, tr("Colors"));
appearancePage->addTab(pathTab, tr("Paths"));
appearancePage->addTab(graphTab, tr("Graphs"));
+ appearancePage->addTab(mapTab, tr("Map"));
return appearancePage;
}
@@ -428,6 +426,7 @@ void OptionsDialog::accept()
_options->palette.setColor(_baseColor->color());
_options->palette.setShift(_colorOffset->value());
_options->mapOpacity = _mapOpacity->value();
+ _options->blendColor = _blendColor->color();
_options->trackWidth = _trackWidth->value();
_options->trackStyle = (Qt::PenStyle) _trackStyle->itemData(
_trackStyle->currentIndex()).toInt();
diff --git a/src/optionsdialog.h b/src/optionsdialog.h
index 7a24db6c..1f8be012 100644
--- a/src/optionsdialog.h
+++ b/src/optionsdialog.h
@@ -19,6 +19,7 @@ struct Options {
// Appearance
Palette palette;
int mapOpacity;
+ QColor blendColor;
int trackWidth;
int routeWidth;
Qt::PenStyle trackStyle;
@@ -76,6 +77,7 @@ private:
ColorBox *_baseColor;
QDoubleSpinBox *_colorOffset;
PercentSlider *_mapOpacity;
+ ColorBox *_blendColor;
QSpinBox *_trackWidth;
StyleComboBox *_trackStyle;
QSpinBox *_routeWidth;
diff --git a/src/pathview.cpp b/src/pathview.cpp
index 3ca703b3..8bc17421 100644
--- a/src/pathview.cpp
+++ b/src/pathview.cpp
@@ -47,6 +47,7 @@ PathView::PathView(Map *map, POI *poi, QWidget *parent)
_units = Metric;
_opacity = 1.0;
+ _blendColor = Qt::white;
_showMap = true;
_showTracks = true;
@@ -685,11 +686,17 @@ void PathView::setMapOpacity(int opacity)
resetCachedContent();
}
+void PathView::setBlendColor(const QColor &color)
+{
+ _blendColor = color;
+ resetCachedContent();
+}
+
void PathView::drawBackground(QPainter *painter, const QRectF &rect)
{
if (_showMap) {
if (_opacity < 1.0) {
- painter->fillRect(rect, Qt::white);
+ painter->fillRect(rect, _blendColor);
painter->setOpacity(_opacity);
}
_map->draw(painter, rect);
diff --git a/src/pathview.h b/src/pathview.h
index 1ec3a3f6..82637223 100644
--- a/src/pathview.h
+++ b/src/pathview.h
@@ -64,6 +64,7 @@ public slots:
void setTrackStyle(Qt::PenStyle style);
void setRouteStyle(Qt::PenStyle style);
void setMapOpacity(int opacity);
+ void setBlendColor(const QColor &color);
private slots:
void updatePOI();
@@ -108,6 +109,7 @@ private:
Palette _palette;
Units _units;
qreal _opacity;
+ QColor _blendColor;
bool _showMap;
bool _showTracks;
diff --git a/src/settings.h b/src/settings.h
index 8a7dec82..6fcca459 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -80,6 +80,8 @@
#define PALETTE_SHIFT_DEFAULT 0.62
#define MAP_OPACITY_SETTING "mapOpacity"
#define MAP_OPACITY_DEFAULT 100
+#define BLEND_COLOR_SETTING "blendColor"
+#define BLEND_COLOR_DEFAULT QColor(Qt::white)
#define TRACK_WIDTH_SETTING "trackWidth"
#define TRACK_WIDTH_DEFAULT 3
#define ROUTE_WIDTH_SETTING "routeWidth"