diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-29 11:46:41 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-29 11:46:41 -0800 |
| commit | d936c55a015789f61f7e93426b11218ebb4312af (patch) | |
| tree | 66facd26941b9e21a13589860a5b4a37c30248b3 | |
| parent | 766b6b3e52478abd22a54fdcfe569e8dcca534e7 (diff) | |
| download | subsurface-d936c55a015789f61f7e93426b11218ebb4312af.tar.gz | |
Make sure Subsurface will find Marble theme when installed on Linux
We need the marble data to go into a subdirectory of /usr/share/subsurface
and we need to search for both data and marbledata when trying to find the
theme.
Fixes #310
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | qt-ui/globe.cpp | 8 | ||||
| -rw-r--r-- | subsurface-install.pri | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 42e97c898..83b9464b4 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -38,9 +38,13 @@ GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0) foundGoogleMap = true; if (!foundGoogleMap) { subsurfaceDataPath = getSubsurfaceDataPath("marbledata"); - qDebug() << subsurfaceDataPath; - if (subsurfaceDataPath != "") + if (subsurfaceDataPath != "") { MarbleDirs::setMarbleDataPath(subsurfaceDataPath); + } else { + subsurfaceDataPath = getSubsurfaceDataPath("data"); + if (subsurfaceDataPath != "") + MarbleDirs::setMarbleDataPath(subsurfaceDataPath); + } } messageWidget = new KMessageWidget(this); messageWidget->setCloseButtonVisible(false); diff --git a/subsurface-install.pri b/subsurface-install.pri index 89d1958a8..1cf4f2f0c 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -141,7 +141,7 @@ XSLTDIR = $(DATADIR)/subsurface icon.files = $$ICON xslt.path = /$(XSLTDIR) - marbledir.path = /$(DATADIR)/subsurface + marbledir.path = /$(DATADIR)/subsurface/data doc.path = /$(DOCDIR) doc.CONFIG += no_check_exist |