diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-30 12:40:52 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-30 12:40:52 -0700 |
| commit | 241dd7cb81364521d78250f800e8508211575254 (patch) | |
| tree | 1ea443fe4589f0f247db4304de38e857e18100f6 /mobile-widgets/qmlmanager.h | |
| parent | 2e6588dc0ef8d7698cc5dbe831f524a6e394145d (diff) | |
| parent | ba9288fab6d7aa8527f7a75a717cdc88a68facd9 (diff) | |
| download | subsurface-241dd7cb81364521d78250f800e8508211575254.tar.gz | |
Merge branch 'offlineDefault'
Diffstat (limited to 'mobile-widgets/qmlmanager.h')
| -rw-r--r-- | mobile-widgets/qmlmanager.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mobile-widgets/qmlmanager.h b/mobile-widgets/qmlmanager.h index ece2c7b59..906e7b0b2 100644 --- a/mobile-widgets/qmlmanager.h +++ b/mobile-widgets/qmlmanager.h @@ -39,7 +39,8 @@ public: UNKNOWN, INVALID, VALID_EMAIL, - VALID + VALID, + NOCLOUD }; static QMLManager *instance(); @@ -127,11 +128,14 @@ public slots: void clearGpsData(); void finishSetup(); void openLocalThenRemote(QString url); + void mergeLocalRepo(); QString getNumber(const QString& diveId); QString getDate(const QString& diveId); QString getCurrentPosition(); QString getVersion() const; void deleteGpsFix(quint64 when); + void revertToNoCloudIfNeeded(); + void consumeFinishedLoad(timestamp_t currentDiveTimestamp); void refreshDiveList(); void screenChanged(QScreen *screen); qreal lastDevicePixelRatio(); @@ -170,6 +174,7 @@ private: bool checkLocation(DiveObjectHelper *myDive, struct dive *d, QString location, QString gps); bool checkDuration(DiveObjectHelper *myDive, struct dive *d, QString duration); bool checkDepth(DiveObjectHelper *myDive, struct dive *d, QString depth); + bool currentGitLocalOnly; signals: void cloudUserNameChanged(); |