diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp
index 8db43163..f0b29592 100644
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@@ -640,20 +640,20 @@ void GUI::paths()
msgBox.setWindowTitle(tr("Paths"));
msgBox.setText("
" + tr("Paths") + "
");
- msgBox.setInformativeText(
- ""
- "" + tr("Map directory:") + " | "
+ msgBox.setInformativeText("" + tr("Global")
+ + ""
+ + "" + tr("Map directory:") + " | "
+ QDir::cleanPath(GLOBAL_MAP_DIR) + " | "
+ tr("POI directory:") + " | "
+ QDir::cleanPath(GLOBAL_POI_DIR) + " | "
- + tr("GCS file:") + " | " + QDir::cleanPath(GLOBAL_GCS_FILE)
- + " | " + tr("PCS file:") + " | "
- + QDir::cleanPath(GLOBAL_PCS_FILE) + " | "
- + tr("Ellipsoids file:") + " | "
- + QDir::cleanPath(GLOBAL_ELLIPSOID_FILE) + " | "
- + " | |
"
- + tr("User override directory:") + " | "
- + QDir::cleanPath(USER_DIR) + " |
"
+ + tr("GCS/PCS CSV directory:") + " | "
+ + QDir::cleanPath(GLOBAL_CSV_DIR) + " |
"
+ + "" + tr("User-specific") + "
"
+ + tr("Map directory:") + " | " + QDir::cleanPath(USER_MAP_DIR)
+ + " |
" + tr("POI directory:") + " | "
+ + QDir::cleanPath(USER_POI_DIR) + " |
"
+ + tr("GCS/PCS CSV directory:") + " | "
+ + QDir::cleanPath(USER_CSV_DIR) + " |
"
);
msgBox.exec();
diff --git a/src/config.h b/src/config.h
index 97bafefe..f6d5dafe 100644
--- a/src/config.h
+++ b/src/config.h
@@ -12,11 +12,12 @@
#define FONT_FAMILY "Arial"
#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 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)
#define USER_DIR QDir::homePath() + QString("/GPXSee")
@@ -30,14 +31,16 @@
#define GLOBAL_DIR QString("/usr/share/gpxsee")
#endif
-#define USER_ELLIPSOID_FILE USER_DIR + QString("/") + ELLIPSOID_FILE
-#define USER_GCS_FILE USER_DIR + QString("/") + GCS_FILE
-#define USER_PCS_FILE USER_DIR + QString("/") + PCS_FILE
+#define USER_CSV_DIR USER_DIR + QString("/") + CSV_DIR
+#define USER_ELLIPSOID_FILE USER_CSV_DIR + QString("/") + ELLIPSOID_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_POI_DIR USER_DIR + QString("/") + POI_DIR
-#define GLOBAL_ELLIPSOID_FILE GLOBAL_DIR + QString("/") + ELLIPSOID_FILE
-#define GLOBAL_GCS_FILE GLOBAL_DIR + QString("/") + GCS_FILE
-#define GLOBAL_PCS_FILE GLOBAL_DIR + QString("/") + PCS_FILE
+#define GLOBAL_CSV_DIR GLOBAL_DIR + QString("/") + CSV_DIR
+#define GLOBAL_ELLIPSOID_FILE GLOBAL_CSV_DIR + QString("/") + ELLIPSOID_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_POI_DIR GLOBAL_DIR + QString("/") + POI_DIR
#define TILES_DIR USER_DIR + QString("/tiles")