mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: make the state of the GPS service available to QML

Browse source 
This exposes a locationServiceAvailable property to QML and keeps it in
sync with the corresponding state in the GpsLocation widget.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-17 22:54:53 -07:00
parent 4ac6f34b16
commit 1819cc1ccc
2 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
mobile-widgets/qmlmanager.cpp
View file

@ -72,11 +72,11 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
reply(0),
deletedDive(0),
deletedTrip(0),
m_updateSelectedDive(-1),
m_selectedDiveTimestamp(0),
m_credentialStatus(UNKNOWN),
m_lastDevicePixelRatio(1.0),
alreadySaving(false),
m_selectedDiveTimestamp(0),
m_updateSelectedDive(-1)
alreadySaving(false)
{
m_instance = this;
connect(qobject_cast<QApplication *>(QApplication::instance()), &QApplication::applicationStateChanged, this, &QMLManager::applicationStateChanged);
@ -88,6 +88,8 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
setAccessingCloud(-1);
// create location manager service
locationProvider = new GpsLocation(&appendTextToLogStandalone, this);
connect(locationProvider, SIGNAL(haveSourceChanged()), this, SLOT(hasLocationSourceChanged()));
setLocationServiceAvailable(locationProvider->hasLocationsSource());
set_git_update_cb(&gitProgressCB);
// make sure we know if the current cloud repo has been successfully synced
@ -928,6 +930,14 @@ void QMLManager::addDiveAborted(int id)
QString QMLManager::getCurrentPosition()
{
static bool hasLocationSource = false;
if (locationProvider->hasLocationsSource() != hasLocationSource) {
hasLocationSource = !hasLocationSource;
setLocationServiceAvailable(hasLocationSource);
}
if (!hasLocationSource)
return tr("Unknown GPS location");
return locationProvider->currentPosition();
}
@ -966,7 +976,6 @@ void QMLManager::deleteGpsFix(quint64 when)
populateGpsData();
}
QString QMLManager::logText() const
{
QString logText = m_logText + QString("\nNumer of GPS fixes: %1").arg(locationProvider->getGpsNum());
@ -996,6 +1005,23 @@ void QMLManager::setLocationServiceEnabled(bool locationServiceEnabled)
locationProvider->serviceEnable(m_locationServiceEnabled);
}
bool QMLManager::locationServiceAvailable() const
{
return m_locationServiceAvailable;
}
void QMLManager::setLocationServiceAvailable(bool locationServiceAvailable)
{
qDebug() << "location service is" << (locationServiceAvailable ? "available" : "not available");
m_locationServiceAvailable = locationServiceAvailable;
emit locationServiceAvailableChanged();
}
void QMLManager::hasLocationSourceChanged()
{
setLocationServiceAvailable(locationProvider->hasLocationsSource());
}
bool QMLManager::verboseEnabled() const
{
return m_verboseEnabled;

7
mobile-widgets/qmlmanager.h
View file

@ -17,6 +17,7 @@ class QMLManager : public QObject {
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged)
Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
Q_PROPERTY(bool locationServiceAvailable READ locationServiceAvailable WRITE setLocationServiceAvailable NOTIFY locationServiceAvailableChanged)
Q_PROPERTY(int distanceThreshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
Q_PROPERTY(int timeThreshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
Q_PROPERTY(bool loadFromCloud READ loadFromCloud WRITE setLoadFromCloud NOTIFY loadFromCloudChanged)
@ -52,6 +53,9 @@ public:
bool locationServiceEnabled() const;
void setLocationServiceEnabled(bool locationServiceEnable);
bool locationServiceAvailable() const;
void setLocationServiceAvailable(bool locationServiceAvailable);
bool verboseEnabled() const;
void setVerboseEnabled(bool verboseMode);
@ -133,6 +137,7 @@ public slots:
qreal lastDevicePixelRatio();
void appendTextToLog(const QString &newText);
void quit();
void hasLocationSourceChanged();
private:
QString m_cloudUserName;
@ -141,6 +146,7 @@ private:
QString m_startPageText;
QString m_logText;
bool m_locationServiceEnabled;
bool m_locationServiceAvailable;
bool m_verboseEnabled;
int m_distanceThreshold;
int m_timeThreshold;
@ -169,6 +175,7 @@ signals:
void cloudUserNameChanged();
void cloudPasswordChanged();
void locationServiceEnabledChanged();
void locationServiceAvailableChanged();
void verboseEnabledChanged();
void logTextChanged();
void timeThresholdChanged();