Commit 037bb68e authored by Artem Fedoskin's avatar Artem Fedoskin
Browse files

DSO images are now included in KStars Lite package for Android. Added

support for DSO labels and filled ellipses on Android.
parent 6e2f41f3
......@@ -563,6 +563,7 @@ if(BUILD_KSTARS_LITE)
kstarslite/skyitems/lines/linesitem.cpp
kstarslite/skyitems/lines/equatoritem.cpp
kstarslite/skyitems/lines/eclipticitem.cpp
kstarslite/skyitems/lines/milkywayitem.cpp
#SkyNodes
kstarslite/skyitems/skynodes/planetnode.cpp
kstarslite/skyitems/skynodes/skynode.cpp
......@@ -621,6 +622,9 @@ if(BUILD_KSTARS_LITE)
kstarslite/qml/modules/Splash.qml
)
add_subdirectory(kstarslite/qml)
if(ANDROID)
add_subdirectory(kstarslite/res)
endif()
ADD_CUSTOM_TARGET(kstarsliteqml SOURCES ${kstarsliteqml_SRCS})
endif(BUILD_KSTARS_LITE)
......
#include "auxiliary/kspaths.h"
#include <QFileInfo>
#include <QDebug>
QString KSPaths::locate(QStandardPaths::StandardLocation location, const QString &fileName,
QStandardPaths::LocateOptions options) {
......@@ -6,6 +8,9 @@ QString KSPaths::locate(QStandardPaths::StandardLocation location, const QString
QString file = QStandardPaths::locate(location,fileName,options);
if(file.isEmpty()) {
file = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
if (!QFileInfo(file).exists()) {
return QString();
}
}
return file;
#else
......@@ -18,7 +23,10 @@ QStringList KSPaths::locateAll(QStandardPaths::StandardLocation location, const
#ifdef ANDROID
QStringList file = QStandardPaths::locateAll(location,fileName,options);
if(file.isEmpty()) {
file[0] = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
QString f = "/data/data/org.kde.kstars/qt-reserved-files/share/kstars/" + fileName;
if (QFileInfo(f).exists()) {
file[0] = f;
}
}
return file;
#else
......
#install_files
install( DIRECTORY dso/
DESTINATION ${KDE_INSTALL_DATADIR}/kstars )
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment