Find Google maps in Subsurface's source tree

This way the user doesn't need to move the two folders googlemaps and
googlesat around in the filesystem.

This only works if Subsurface is started from the build directory - it
doesn't work when Subsurface is installed (and it doesn't at all address
the need to install these files and bundle them as well).

I'd consider this a hack to show how the real solution should work.

There is one more part of this that is a hack: Marble no longer searches
its default data directory; the path we set replaces the Marble system
search path. Sadly, Marble doesn't support paths the way Unix thinks of
them with multiple directories, separated by ':'. So this means that
Marble no longer finds any of its default icons. For most of them that
seems fine as I don't think lacking the icons for "manned_landing",
"robotic_rover", "unmanned_hard_landing" or the various types of places of
worship that Marble supports is necessarily a big issues for Subsurface,
but at least the default_location icon seemed important. And since we now
need to carry our own, I replaced the boring circle with a tiny dive flag.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

10 files changed, 4 insertions, 0 deletions

diff --git a/marbledata/bitmaps/default_location.png b/marbledata/bitmaps/default_location.png
new file mode 100644
index 000000000..3d4f3b5c3
--- /dev/null
+++ b/marbledata/bitmaps/default_location.png
diff --git a/googlemaps/0/0/0.png b/marbledata/maps/earth/googlemaps/0/0/0.png
index f7ab669ca..f7ab669ca 100644
--- a/googlemaps/0/0/0.png
+++ b/marbledata/maps/earth/googlemaps/0/0/0.png
diff --git a/googlemaps/googlemaps.dgml b/marbledata/maps/earth/googlemaps/googlemaps.dgml
index 01a63864b..01a63864b 100644
--- a/googlemaps/googlemaps.dgml
+++ b/marbledata/maps/earth/googlemaps/googlemaps.dgml
diff --git a/googlemaps/preview.png b/marbledata/maps/earth/googlemaps/preview.png
index aa3181d29..aa3181d29 100644
--- a/googlemaps/preview.png
+++ b/marbledata/maps/earth/googlemaps/preview.png
diff --git a/googlesat/0/0/0.jpg b/marbledata/maps/earth/googlesat/0/0/0.jpg
index 4b9b73295..4b9b73295 100644
--- a/googlesat/0/0/0.jpg
+++ b/marbledata/maps/earth/googlesat/0/0/0.jpg
diff --git a/googlesat/bicycle/0/0/0.png b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
index febf01a9c..febf01a9c 100644
--- a/googlesat/bicycle/0/0/0.png
+++ b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
diff --git a/googlesat/googlesat.dgml b/marbledata/maps/earth/googlesat/googlesat.dgml
index 0b70f14da..0b70f14da 100644
--- a/googlesat/googlesat.dgml
+++ b/marbledata/maps/earth/googlesat/googlesat.dgml
diff --git a/googlesat/preview.png b/marbledata/maps/earth/googlesat/preview.png
index 5048d0a0f..5048d0a0f 100644
--- a/googlesat/preview.png
+++ b/marbledata/maps/earth/googlesat/preview.png
diff --git a/googlesat/streets/0/0/0.png b/marbledata/maps/earth/googlesat/streets/0/0/0.png
index febf01a9c..febf01a9c 100644
--- a/googlesat/streets/0/0/0.png
+++ b/marbledata/maps/earth/googlesat/streets/0/0/0.png
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 0bd8f3d83..014a84a09 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -8,6 +8,7 @@
 #include <marble/GeoDataPlacemark.h>
 #include <marble/GeoDataDocument.h>
 #include <marble/MarbleModel.h>
+#include <marble/MarbleDirs.h>
 #if INCOMPLETE_MARBLE
 #include "marble/GeoDataTreeModel.h"
 #else
@@ -18,6 +19,9 @@
 
 GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0)
 {
+	// this will find the Google maps when running from your build directory
+	// TODO: all the magic to find the install path (and actually install/bundle these files)
+	MarbleDirs::setMarbleDataPath(QDir("./marbledata").absolutePath());
 	messageWidget = new KMessageWidget(this);
 	messageWidget->setCloseButtonVisible(false);
 	messageWidget->setHidden(true);