From c535632eb6c55b19c21a199f01092285953dec3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Sun, 14 Jan 2018 23:33:13 +0100
Subject: [PATCH] Updated map info text Deleted obsolete stuff

---
 src/GUI/gui.cpp | 31 ++++++++++++++-----------------
 src/config.h    |  2 --
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp
index 5a5457f2..e37e98d7 100644
--- a/src/GUI/gui.cpp
+++ b/src/GUI/gui.cpp
@@ -626,29 +626,26 @@ void GUI::dataSources()
 	QMessageBox msgBox(this);
 
 	msgBox.setWindowTitle(tr("Data sources"));
-	msgBox.setText("<h3>" + tr("Data sources") + "</h3>");
+	msgBox.setText("<h3>" + tr("Maps") + "</h3>");
 	msgBox.setInformativeText(
-	  "<h4>" + tr("Online maps") + "</h4><p>"
-	  + tr("Online map URLs are read on program startup from the "
-		"following file:")
-	  + "</p><p><code>" + USER_MAP_FILE + "</code></p><p>"
-	  + tr("The file format is one map entry per line, consisting of the map "
-		"name, tiles URL and an optional maximal zoom level delimited by "
-	    "a TAB character. The tile X and Y coordinates are replaced with $x "
-	    "and $y in the URL and the zoom level is replaced with $z. An example "
-	    "map file could look like:")
+	  + "<p>" + tr("Maps are loaded on program startup from the following "
+		"directory:")
+	  + "</p><p><code>" + USER_MAP_DIR + "</code></p>"
+
+	  + "<h4>" + tr("Online maps") + "</h4><p>"
+	  + tr("The online map list file format is one map entry per line, "
+	    "consisting of the map name, tiles URL and an optional maximal zoom "
+	    "level delimited by a TAB character. The tile X and Y coordinates are "
+	    "replaced with $x and $y in the URL and the zoom level is replaced "
+	    "with $z. An example online map list file could look like:")
 	  + "</p><p><code>Map1	http://tile.server.com/map/$z/$x/$y.png	15"
 		  "<br/>Map2	http://mapserver.org/map/$z-$x-$y</code></p>"
 
 	  + "<h4>" + tr("Offline maps") + "</h4><p>"
-	  + tr("Offline maps are loaded on program startup from the following "
-		"directory:")
-	  + "</p><p><code>" + USER_MAP_DIR + "</code></p><p>"
-	  + tr("The expected structure is one map/atlas in a separate subdirectory."
-		" Supported map formats are OziExplorer maps and TrekBuddy maps/atlases"
-		" (tared and non-tared).") + "</p>"
+		" Supported map formats are OziExplorer maps, TrekBuddy maps/atlases "
+		" (tared and non-tared) and GeoTIFF images." + "</p>"
 
-	  + "<h4>" + tr("POIs") + "</h4><p>"
+	  + "<h3>" + tr("POIs") + "</h3><p>"
 	  + tr("To make GPXSee load a POI file automatically on startup, add "
 		"the file to the following directory:")
 		+ "</p><p><code>" + USER_POI_DIR + "</code></p>"
diff --git a/src/config.h b/src/config.h
index bf67bea4..13138555 100644
--- a/src/config.h
+++ b/src/config.h
@@ -35,13 +35,11 @@
 #define USER_DATUM_FILE        USER_DIR + QString("/") + DATUM_FILE
 #define USER_PCS_FILE          USER_DIR + QString("/") + PCS_FILE
 #define USER_MAP_DIR           USER_DIR + QString("/") + MAP_DIR
-#define USER_MAP_FILE          USER_DIR + QString("/") + MAP_FILE
 #define USER_POI_DIR           USER_DIR + QString("/") + POI_DIR
 #define GLOBAL_ELLIPSOID_FILE  GLOBAL_DIR + QString("/") + ELLIPSOID_FILE
 #define GLOBAL_DATUM_FILE      GLOBAL_DIR + QString("/") + DATUM_FILE
 #define GLOBAL_PCS_FILE        GLOBAL_DIR + QString("/") + PCS_FILE
 #define GLOBAL_MAP_DIR         GLOBAL_DIR + QString("/") + MAP_DIR
-#define GLOBAL_MAP_FILE        GLOBAL_DIR + QString("/") + MAP_FILE
 #define GLOBAL_POI_DIR         GLOBAL_DIR + QString("/") + POI_DIR
 #define TILES_DIR              USER_DIR + QString("/tiles")