mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
QML UI: keep QML manager and the UI in sync about selected dive
The manager can now directly update the index of the selected dive, and the UI tells the manager the timestamp of the currently selected dive. This allows the manager to pick the best possible dive as selected dive if things change (for example if the dive list gets reloaded because it changed in cloud storage). Fixes #1009 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
5909e438c9
commit
6e6cce770b
3 changed files with 50 additions and 0 deletions
|
|
@ -26,6 +26,8 @@ class QMLManager : public QObject {
|
|||
Q_PROPERTY(credentialStatus_t oldStatus READ oldStatus WRITE setOldStatus NOTIFY oldStatusChanged)
|
||||
Q_PROPERTY(int accessingCloud READ accessingCloud WRITE setAccessingCloud NOTIFY accessingCloudChanged)
|
||||
Q_PROPERTY(bool syncToCloud READ syncToCloud WRITE setSyncToCloud NOTIFY syncToCloudChanged)
|
||||
Q_PROPERTY(int updateSelectedDive READ updateSelectedDive WRITE setUpdateSelectedDive NOTIFY updateSelectedDiveChanged)
|
||||
Q_PROPERTY(int selectedDiveTimestamp READ selectedDiveTimestamp WRITE setSelectedDiveTimestamp NOTIFY selectedDiveTimestampChanged)
|
||||
|
||||
public:
|
||||
QMLManager();
|
||||
|
|
@ -81,6 +83,12 @@ public:
|
|||
bool syncToCloud() const;
|
||||
void setSyncToCloud(bool status);
|
||||
|
||||
int updateSelectedDive() const;
|
||||
void setUpdateSelectedDive(int idx);
|
||||
|
||||
int selectedDiveTimestamp() const;
|
||||
void setSelectedDiveTimestamp(int when);
|
||||
|
||||
typedef void (QMLManager::*execute_function_type)();
|
||||
DiveListSortModel *dlSortModel;
|
||||
|
||||
|
|
@ -144,6 +152,8 @@ private:
|
|||
struct dive_trip *deletedTrip;
|
||||
int m_accessingCloud;
|
||||
bool m_syncToCloud;
|
||||
int m_updateSelectedDive;
|
||||
int m_selectedDiveTimestamp;
|
||||
credentialStatus_t m_credentialStatus;
|
||||
credentialStatus_t m_oldStatus;
|
||||
qreal m_lastDevicePixelRatio;
|
||||
|
|
@ -164,6 +174,8 @@ signals:
|
|||
void oldStatusChanged();
|
||||
void accessingCloudChanged();
|
||||
void syncToCloudChanged();
|
||||
void updateSelectedDiveChanged();
|
||||
void selectedDiveTimestampChanged();
|
||||
void sendScreenChanged(QScreen *screen);
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue