root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-12-01 07:01:16 +01:00
Code Issues Projects Releases Activity

Improved path info dialogue

Browse Source
This commit is contained in:
Martin Tůma 2018-07-21 12:24:08 +02:00
parent 90473300e0
commit 796e61ada4
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/GUI/gui.cpp
View File

@ -640,20 +640,20 @@ void GUI::paths()
msgBox.setWindowTitle(tr("Paths")); msgBox.setWindowTitle(tr("Paths"));
msgBox.setText("<h3>" + tr("Paths") + "</h3>"); msgBox.setText("<h3>" + tr("Paths") + "</h3>");
msgBox.setInformativeText( msgBox.setInformativeText("<h4>" + tr("Global")
"<style>td {white-space: pre; padding-right: 1em;}</style>" + "</h4><style>td {white-space: pre; padding-right: 1em;}</style>"
"<div><table><tr><td>" + tr("Map directory:") + "</td><td><code>" + "<div><table><tr><td>" + tr("Map directory:") + "</td><td><code>"
+ QDir::cleanPath(GLOBAL_MAP_DIR) + "</code></td></tr><tr><td>" + QDir::cleanPath(GLOBAL_MAP_DIR) + "</code></td></tr><tr><td>"
+ tr("POI directory:") + "</td><td><code>" + tr("POI directory:") + "</td><td><code>"
+ QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>" + QDir::cleanPath(GLOBAL_POI_DIR) + "</code></td></tr><tr><td>"
+ tr("GCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_GCS_FILE) + tr("GCS/PCS CSV directory:") + "</td><td><code>"
+ "</code></td></tr><tr><td>" + tr("PCS file:") + "</td><td><code>" + QDir::cleanPath(GLOBAL_CSV_DIR) + "</code></td></tr></table></div>"
+ QDir::cleanPath(GLOBAL_PCS_FILE) + "</code></td></tr><tr><td>" + "<h4>" + tr("User-specific") + "</h4><div><table><tr><td>"
+ tr("Ellipsoids file:") + "</td><td><code>" + tr("Map directory:") + "</td><td><code>" + QDir::cleanPath(USER_MAP_DIR)
+ QDir::cleanPath(GLOBAL_ELLIPSOID_FILE) + "</code></td></tr>" + "</code></td></tr><tr><td>" + tr("POI directory:") + "</td><td><code>"
+ "<tr><td></td><td></td></tr></table></div><div><table><tr><td>" + QDir::cleanPath(USER_POI_DIR) + "</code></td></tr><tr><td>"
+ tr("User override directory:") + "</td><td><code>" + tr("GCS/PCS CSV directory:") + "</td><td><code>"
+ QDir::cleanPath(USER_DIR) + "</td></tr></table></div>" + QDir::cleanPath(USER_CSV_DIR) + "</code></td></tr></table></div>"
); );
msgBox.exec(); msgBox.exec();

21
src/config.h
View File

@ -12,11 +12,12 @@
#define FONT_FAMILY "Arial" #define FONT_FAMILY "Arial"
#define FONT_SIZE 12 // px #define FONT_SIZE 12 // px
#define ELLIPSOID_FILE QString("csv/ellipsoids.csv")
#define GCS_FILE QString("csv/gcs.csv")
#define PCS_FILE QString("csv/pcs.csv")
#define MAP_DIR QString("maps") #define MAP_DIR QString("maps")
#define POI_DIR QString("POI") #define POI_DIR QString("POI")
#define CSV_DIR QString("csv")
#define ELLIPSOID_FILE QString("ellipsoids.csv")
#define GCS_FILE QString("gcs.csv")
#define PCS_FILE QString("pcs.csv")
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
#define USER_DIR QDir::homePath() + QString("/GPXSee") #define USER_DIR QDir::homePath() + QString("/GPXSee")
@ -30,14 +31,16 @@
#define GLOBAL_DIR QString("/usr/share/gpxsee") #define GLOBAL_DIR QString("/usr/share/gpxsee")
#endif #endif
#define USER_ELLIPSOID_FILE USER_DIR + QString("/") + ELLIPSOID_FILE #define USER_CSV_DIR USER_DIR + QString("/") + CSV_DIR
#define USER_GCS_FILE USER_DIR + QString("/") + GCS_FILE #define USER_ELLIPSOID_FILE USER_CSV_DIR + QString("/") + ELLIPSOID_FILE
#define USER_PCS_FILE USER_DIR + QString("/") + PCS_FILE #define USER_GCS_FILE USER_CSV_DIR + QString("/") + GCS_FILE
#define USER_PCS_FILE USER_CSV_DIR + QString("/") + PCS_FILE
#define USER_MAP_DIR USER_DIR + QString("/") + MAP_DIR #define USER_MAP_DIR USER_DIR + QString("/") + MAP_DIR
#define USER_POI_DIR USER_DIR + QString("/") + POI_DIR #define USER_POI_DIR USER_DIR + QString("/") + POI_DIR
#define GLOBAL_ELLIPSOID_FILE GLOBAL_DIR + QString("/") + ELLIPSOID_FILE #define GLOBAL_CSV_DIR GLOBAL_DIR + QString("/") + CSV_DIR
#define GLOBAL_GCS_FILE GLOBAL_DIR + QString("/") + GCS_FILE #define GLOBAL_ELLIPSOID_FILE GLOBAL_CSV_DIR + QString("/") + ELLIPSOID_FILE
#define GLOBAL_PCS_FILE GLOBAL_DIR + QString("/") + PCS_FILE #define GLOBAL_GCS_FILE GLOBAL_CSV_DIR + QString("/") + GCS_FILE
#define GLOBAL_PCS_FILE GLOBAL_CSV_DIR + QString("/") + PCS_FILE
#define GLOBAL_MAP_DIR GLOBAL_DIR + QString("/") + MAP_DIR #define GLOBAL_MAP_DIR GLOBAL_DIR + QString("/") + MAP_DIR
#define GLOBAL_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR #define GLOBAL_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR
#define TILES_DIR USER_DIR + QString("/tiles") #define TILES_DIR USER_DIR + QString("/tiles")