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: add progress message variable

Browse source 
To be shared between C/C++ and QML code in order to show the updates
and potential error messages from libdivecomputer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-07-09 15:07:16 -07:00
parent 8e5c211e21
commit fd96daca6a
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mobile-widgets/qmlmanager.cpp
View file

@ -1508,6 +1508,17 @@ void QMLManager::setShowPin(bool enable)
emit showPinChanged(); emit showPinChanged();
} }
QString QMLManager::progressMessage() const
{
return m_progressMessage;
}
void QMLManager::setProgressMessage(QString text)
{
m_progressMessage = text;
emit progressMessageChanged();
}
#if defined (Q_OS_ANDROID) #if defined (Q_OS_ANDROID)

6
mobile-widgets/qmlmanager.h
View file

@ -40,6 +40,7 @@ class QMLManager : public QObject {
Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT) Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT)
Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT) Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT)
Q_PROPERTY(bool showPin READ showPin WRITE setShowPin NOTIFY showPinChanged) Q_PROPERTY(bool showPin READ showPin WRITE setShowPin NOTIFY showPinChanged)
Q_PROPERTY(QString progressMessage READ progressMessage WRITE setProgressMessage NOTIFY progressMessageChanged)
public: public:
QMLManager(); QMLManager();
@ -111,6 +112,9 @@ public:
int selectedDiveTimestamp() const; int selectedDiveTimestamp() const;
void setSelectedDiveTimestamp(int when); void setSelectedDiveTimestamp(int when);
QString progressMessage() const;
void setProgressMessage(QString text);
typedef void (QMLManager::*execute_function_type)(); typedef void (QMLManager::*execute_function_type)();
DiveListSortModel *dlSortModel; DiveListSortModel *dlSortModel;
@ -203,6 +207,7 @@ private:
bool currentGitLocalOnly; bool currentGitLocalOnly;
bool m_showPin; bool m_showPin;
DCDeviceData *m_device_data; DCDeviceData *m_device_data;
QString m_progressMessage;
signals: signals:
void cloudUserNameChanged(); void cloudUserNameChanged();
@ -225,6 +230,7 @@ signals:
void selectedDiveTimestampChanged(); void selectedDiveTimestampChanged();
void showPinChanged(); void showPinChanged();
void sendScreenChanged(QScreen *screen); void sendScreenChanged(QScreen *screen);
void progressMessageChanged();
}; };
#endif #endif