From d936c55a015789f61f7e93426b11218ebb4312af Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 29 Nov 2013 11:46:41 -0800 Subject: 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 --- qt-ui/globe.cpp | 8 ++++++-- 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 -- cgit v1.2.3-70-g09d2