diff options
| -rw-r--r-- | marbledata/bitmaps/default_location.png | bin | 0 -> 400 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlemaps/0/0/0.png (renamed from googlemaps/0/0/0.png) | bin | 159 -> 159 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlemaps/googlemaps.dgml (renamed from googlemaps/googlemaps.dgml) | 0 | ||||
| -rw-r--r-- | marbledata/maps/earth/googlemaps/preview.png (renamed from googlemaps/preview.png) | bin | 22138 -> 22138 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlesat/0/0/0.jpg (renamed from googlesat/0/0/0.jpg) | bin | 10036 -> 10036 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlesat/bicycle/0/0/0.png (renamed from googlesat/bicycle/0/0/0.png) | bin | 191 -> 191 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlesat/googlesat.dgml (renamed from googlesat/googlesat.dgml) | 0 | ||||
| -rw-r--r-- | marbledata/maps/earth/googlesat/preview.png (renamed from googlesat/preview.png) | bin | 28358 -> 28358 bytes | |||
| -rw-r--r-- | marbledata/maps/earth/googlesat/streets/0/0/0.png (renamed from googlesat/streets/0/0/0.png) | bin | 191 -> 191 bytes | |||
| -rw-r--r-- | qt-ui/globe.cpp | 4 |
10 files changed, 4 insertions, 0 deletions
diff --git a/marbledata/bitmaps/default_location.png b/marbledata/bitmaps/default_location.png Binary files differnew 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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); |
