mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

QML UI: prepare to enter the cloud PIN on mobile UI

Browse source 
This just creates the properties to connect QML and C++ code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-06-13 16:41:26 -07:00
parent d2f9803883
commit 5fa965df54
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mobile-widgets/qmlmanager.cpp
View file

@ -95,6 +95,7 @@ QMLManager::QMLManager() : m_locationServiceEnabled(false),
qDebug() << QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion()); qDebug() << QStringLiteral("build with Qt Version %1, runtime from Qt Version %2").arg(QT_VERSION_STR).arg(qVersion());
setStartPageText(tr("Starting...")); setStartPageText(tr("Starting..."));
setAccessingCloud(-1); setAccessingCloud(-1);
setShowPin(false);
// create location manager service // create location manager service
locationProvider = new GpsLocation(&appendTextToLogStandalone, this); locationProvider = new GpsLocation(&appendTextToLogStandalone, this);
connect(locationProvider, SIGNAL(haveSourceChanged()), this, SLOT(hasLocationSourceChanged())); connect(locationProvider, SIGNAL(haveSourceChanged()), this, SLOT(hasLocationSourceChanged()));
@ -1183,6 +1184,17 @@ void QMLManager::setCloudPassword(const QString &cloudPassword)
emit cloudPasswordChanged(); emit cloudPasswordChanged();
} }
QString QMLManager::cloudPin() const
{
return m_cloudPin;
}
void QMLManager::setCloudPin(const QString &cloudPin)
{
m_cloudPin = cloudPin;
emit cloudPinChanged();
}
QString QMLManager::cloudUserName() const QString QMLManager::cloudUserName() const
{ {
return m_cloudUserName; return m_cloudUserName;
@ -1421,3 +1433,14 @@ QStringList QMLManager::divemasterInit() const
divemasters.sort(); divemasters.sort();
return divemasters; return divemasters;
} }
bool QMLManager::showPin() const
{
return m_showPin;
}
void QMLManager::setShowPin(bool enable)
{
m_showPin = enable;
emit showPinChanged();
}

12
mobile-widgets/qmlmanager.h
View file

@ -15,6 +15,7 @@ class QMLManager : public QObject {
Q_ENUMS(credentialStatus_t) Q_ENUMS(credentialStatus_t)
Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged) Q_PROPERTY(QString cloudUserName READ cloudUserName WRITE setCloudUserName NOTIFY cloudUserNameChanged)
Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged) Q_PROPERTY(QString cloudPassword READ cloudPassword WRITE setCloudPassword NOTIFY cloudPasswordChanged)
Q_PROPERTY(QString cloudPin READ cloudPin WRITE setCloudPin NOTIFY cloudPinChanged)
Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged) Q_PROPERTY(QString logText READ logText WRITE setLogText NOTIFY logTextChanged)
Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged) Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
Q_PROPERTY(bool locationServiceAvailable READ locationServiceAvailable WRITE setLocationServiceAvailable NOTIFY locationServiceAvailableChanged) Q_PROPERTY(bool locationServiceAvailable READ locationServiceAvailable WRITE setLocationServiceAvailable NOTIFY locationServiceAvailableChanged)
@ -32,6 +33,7 @@ class QMLManager : public QObject {
Q_PROPERTY(QStringList suitInit READ suitInit CONSTANT) Q_PROPERTY(QStringList suitInit READ suitInit CONSTANT)
Q_PROPERTY(QStringList buddyInit READ buddyInit CONSTANT) Q_PROPERTY(QStringList buddyInit READ buddyInit CONSTANT)
Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT) Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT)
Q_PROPERTY(bool showPin READ showPin WRITE setShowPin NOTIFY showPinChanged)
public: public:
QMLManager(); QMLManager();
@ -54,6 +56,9 @@ public:
QString cloudPassword() const; QString cloudPassword() const;
void setCloudPassword(const QString &cloudPassword); void setCloudPassword(const QString &cloudPassword);
QString cloudPin() const;
void setCloudPin(const QString &cloudPin);
bool locationServiceEnabled() const; bool locationServiceEnabled() const;
void setLocationServiceEnabled(bool locationServiceEnable); void setLocationServiceEnabled(bool locationServiceEnable);
@ -104,6 +109,9 @@ public:
QStringList buddyInit() const; QStringList buddyInit() const;
QStringList divemasterInit() const; QStringList divemasterInit() const;
bool showPin() const;
void setShowPin(bool enable);
public slots: public slots:
void applicationStateChanged(Qt::ApplicationState state); void applicationStateChanged(Qt::ApplicationState state);
void savePreferences(); void savePreferences();
@ -153,6 +161,7 @@ public slots:
private: private:
QString m_cloudUserName; QString m_cloudUserName;
QString m_cloudPassword; QString m_cloudPassword;
QString m_cloudPin;
QString m_ssrfGpsWebUserid; QString m_ssrfGpsWebUserid;
QString m_startPageText; QString m_startPageText;
QString m_logText; QString m_logText;
@ -182,10 +191,12 @@ private:
bool checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration); bool checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration);
bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth); bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth);
bool currentGitLocalOnly; bool currentGitLocalOnly;
bool m_showPin;
signals: signals:
void cloudUserNameChanged(); void cloudUserNameChanged();
void cloudPasswordChanged(); void cloudPasswordChanged();
void cloudPinChanged();
void locationServiceEnabledChanged(); void locationServiceEnabledChanged();
void locationServiceAvailableChanged(); void locationServiceAvailableChanged();
void verboseEnabledChanged(); void verboseEnabledChanged();
@ -200,6 +211,7 @@ signals:
void syncToCloudChanged(); void syncToCloudChanged();
void updateSelectedDiveChanged(); void updateSelectedDiveChanged();
void selectedDiveTimestampChanged(); void selectedDiveTimestampChanged();
void showPinChanged();
void sendScreenChanged(QScreen *screen); void sendScreenChanged(QScreen *screen);
}; };