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: refuse to save to cloud unless you loaded from cloud, first

Browse source 
This prevents people from overwriting a perfectly fine repository with an empty
one. Typically happens when you first enter your cloud credentials and then
don't Load Dives right away.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-12-02 18:49:02 -08:00
parent 789c32bf4c
commit f17041e1cb
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-mobile/qmlmanager.cpp
View file

@ -129,6 +129,7 @@ void QMLManager::loadDives()
DiveListModel::instance()->addDive(d);
}
appendTextToLog(QString("%1 dives loaded").arg(i));
setLoadFromCloud(true);
}
void QMLManager::commitChanges(QString diveId, QString suit, QString buddy, QString diveMaster, QString notes)
@ -162,6 +163,10 @@ void QMLManager::commitChanges(QString diveId, QString suit, QString buddy, QStr
void QMLManager::saveChanges()
{
if (!loadFromCloud()) {
qmlUiShowMessage("Don't save dives without loading from the cloud, first.");
return;
}
qmlUiShowMessage("Saving dives.");
QString fileName;
if (getCloudURL(fileName)) {
@ -287,3 +292,14 @@ void QMLManager::setTimeThreshold(int time)
m_timeThreshold = time;
emit timeThresholdChanged();
}
bool QMLManager::loadFromCloud() const
{
return m_loadFromCloud;
}
void QMLManager::setLoadFromCloud(bool done)
{
m_loadFromCloud = done;
emit loadFromCloudChanged();
}

6
qt-mobile/qmlmanager.h
View file

@ -18,6 +18,7 @@ class QMLManager : public QObject
Q_PROPERTY(bool locationServiceEnabled READ locationServiceEnabled WRITE setLocationServiceEnabled NOTIFY locationServiceEnabledChanged)
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)
public:
QMLManager();
~QMLManager();
@ -40,6 +41,9 @@ public:
int timeThreshold() const;
void setTimeThreshold(int time);
bool loadFromCloud() const;
void setLoadFromCloud(bool done);
QString logText() const;
void setLogText(const QString &logText);
void appendTextToLog(const QString &newText);
@ -64,6 +68,7 @@ private:
int m_distanceThreshold;
int m_timeThreshold;
GpsLocation *locationProvider;
bool m_loadFromCloud;
signals:
void cloudUserNameChanged();
@ -73,6 +78,7 @@ signals:
void logTextChanged();
void timeThresholdChanged();
void distanceThresholdChanged();
void loadFromCloudChanged();
};
#endif