diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-10-16 15:52:13 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-17 06:12:07 -0400 |
| commit | 884e690049f091f43567d6bf77634463af14cd93 (patch) | |
| tree | 2d59dbb2dfd458f14a4cdc8bdc9d3b3f581789ad /core | |
| parent | ac7830ea9147d23a623eb0c80279d6a6e42c95bc (diff) | |
| download | subsurface-884e690049f091f43567d6bf77634463af14cd93.tar.gz | |
Tags for geo references: Nicer look, translations and warning message
For the geo references tags update the following:
- Nicer look w/o "Tags:" text and brackets when inside location UI
- Translation for "Tags:"
- Warning message when no dive site layout categories are set
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'core')
| -rw-r--r-- | core/divesite.cpp | 27 | ||||
| -rw-r--r-- | core/divesite.h | 3 |
2 files changed, 26 insertions, 4 deletions
diff --git a/core/divesite.cpp b/core/divesite.cpp index 293656c6a..0f0641c28 100644 --- a/core/divesite.cpp +++ b/core/divesite.cpp @@ -2,14 +2,32 @@ #include "divesite.h" #include "pref.h" -QString constructLocationTags(struct dive_site *ds) +QString constructLocationTags(struct dive_site *ds, bool for_maintab) { QString locationTag; if (!ds || !ds->taxonomy.nr) return locationTag; - locationTag = "<small><small>(tags: "; + /* Check if the user set any of the 3 geocoding categories */ + bool prefs_set = false; + for (int i = 0; i < 3; i++) { + if (prefs.geocoding.category[i] != TC_NONE) + prefs_set = true; + } + + if (!prefs_set && !for_maintab) { + locationTag = QString("<small><small>") + QObject::tr("No dive site layout categories set in preferences!") + + QString("</small></small>"); + return locationTag; + } + else if (!prefs_set) + return locationTag; + + if (for_maintab) + locationTag = QString("<small><small>(") + QObject::tr("Tags") + QString(": "); + else + locationTag = QString("<small><small>"); QString connector; for (int i = 0; i < 3; i++) { if (prefs.geocoding.category[i] == TC_NONE) @@ -26,6 +44,9 @@ QString constructLocationTags(struct dive_site *ds) } } - locationTag += ")</small></small>"; + if (for_maintab) + locationTag += ")</small></small>"; + else + locationTag += "</small></small>"; return locationTag; } diff --git a/core/divesite.h b/core/divesite.h index a731f0841..9f6b8f527 100644 --- a/core/divesite.h +++ b/core/divesite.h @@ -8,6 +8,7 @@ #ifdef __cplusplus #include <QString> +#include <QObject> extern "C" { #else #include <stdbool.h> @@ -76,7 +77,7 @@ void merge_dive_sites(uint32_t ref, uint32_t *uuids, int count); #ifdef __cplusplus } -QString constructLocationTags(struct dive_site *ds); +QString constructLocationTags(struct dive_site *ds, bool for_maintab); #endif |