core: create qPrefUpdateManager from SettingsObjectWrapper

Update set/get functions to follow common name scheme:
- get function have same name as in struct diveComputer
- set function have set_<name>
- signal function have <name>_changed

one class one .h/.cpp is the C++ idiom. Having load/sync of each
variable in 1 functions (in contrast to the distributed way
SettingsObjectWrapper handles it) secures the same storage name
is used. Having the set/get/load/sync functions grouped together
makes it easier to get an overview.

REMARK: this commit only defines the class, it is not active in production

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-03 19:24:53 +02:00 committed by Dirk Hohndel
parent e3008c893a
commit e673a3558e
6 changed files with 106 additions and 0 deletions

View file

@ -112,6 +112,7 @@ set(SUBSURFACE_CORE_LIB_SRCS
settings/qPrefPrivate.cpp
settings/qPrefProxy.cpp
settings/qPrefUnit.cpp
settings/qPrefUpdateManager.cpp
#Subsurface Qt have the Subsurface structs QObjectified for easy access via QML.
subsurface-qt/DiveObjectHelper.cpp

View file

@ -13,6 +13,7 @@
#include "qPrefFacebook.h"
#include "qPrefProxy.h"
#include "qPrefUnit.h"
#include "qPrefUpdateManager.h"
class qPref : public QObject {
Q_OBJECT

View file

@ -22,6 +22,7 @@ public:
friend class qPrefFacebook;
friend class qPrefProxy;
friend class qPrefUnits;
friend class qPrefUpdateManager;
private:
static qPrefPrivate *instance();

View file

@ -0,0 +1,52 @@
// SPDX-License-Identifier: GPL-2.0
#include "qPref.h"
#include "qPrefPrivate.h"
static const QString group = QStringLiteral("UpdateManager");
qPrefUpdateManager::qPrefUpdateManager(QObject *parent) : QObject(parent)
{
}
qPrefUpdateManager *qPrefUpdateManager::instance()
{
static qPrefUpdateManager *self = new qPrefUpdateManager;
return self;
}
void qPrefUpdateManager::loadSync(bool doSync)
{
disk_dont_check_for_updates(doSync);
disk_last_version_used(doSync);
disk_next_check(doSync);
}
HANDLE_PREFERENCE_BOOL_EXT(UpdateManager, "/DontCheckForUpdates", dont_check_for_updates, update_manager.);
void qPrefUpdateManager::set_dont_check_exists(bool value)
{
if (value != prefs.update_manager.dont_check_exists) {
prefs.update_manager.dont_check_exists = value;
emit dont_check_exists_changed(value);
}
// DO NOT STORE ON DISK
}
HANDLE_PREFERENCE_TXT_EXT(UpdateManager, "/LastVersionUsed", last_version_used, update_manager.);
void qPrefUpdateManager::set_next_check(const QDate& value)
{
QString valueString = value.toString("dd/MM/yyyy");
if (valueString != prefs.update_manager.next_check) {
qPrefPrivate::copy_txt(&prefs.update_manager.next_check, valueString);
disk_next_check(true);
emit next_check_changed(value);
}
}
DISK_LOADSYNC_TXT_EXT(UpdateManager, "/NextCheck", next_check, update_manager.);

View file

@ -0,0 +1,49 @@
// SPDX-License-Identifier: GPL-2.0
#ifndef QPREFUPDATEMANAGER_H
#define QPREFUPDATEMANAGER_H
#include "core/pref.h"
#include <QObject>
#include <QDate>
class qPrefUpdateManager : public QObject {
Q_OBJECT
Q_PROPERTY(bool dont_check_for_updates READ dont_check_for_updates WRITE set_dont_check_for_updates NOTIFY dont_check_for_updates_changed);
Q_PROPERTY(bool dont_check_exists READ dont_check_exists WRITE set_dont_check_exists NOTIFY dont_check_exists_changed);
Q_PROPERTY(const QString last_version_used READ last_version_used WRITE set_last_version_used NOTIFY last_version_used_changed);
Q_PROPERTY(const QDate next_check READ next_check WRITE set_next_check NOTIFY next_check_changed);
public:
qPrefUpdateManager(QObject *parent = NULL);
static qPrefUpdateManager *instance();
// Load/Sync local settings (disk) and struct preference
void loadSync(bool doSync);
void load() { loadSync(false); }
void sync() { loadSync(true); }
public:
bool dont_check_for_updates() { return prefs.update_manager.dont_check_for_updates; }
bool dont_check_exists() { return prefs.update_manager.dont_check_exists; }
const QString last_version_used() { return prefs.update_manager.last_version_used; }
const QDate next_check() { return QDate::fromString(QString(prefs.update_manager.next_check), "dd/MM/yyyy"); }
public slots:
void set_dont_check_for_updates(bool value);
void set_dont_check_exists(bool value);
void set_last_version_used(const QString& value);
void set_next_check(const QDate& value);
signals:
void dont_check_for_updates_changed(bool value);
void dont_check_exists_changed(bool value);
void last_version_used_changed(const QString& value);
void next_check_changed(const QDate& value);
private:
void disk_dont_check_for_updates(bool doSync);
void disk_last_version_used(bool doSync);
void disk_next_check(bool doSync);
};
#endif

View file

@ -87,6 +87,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
../../core/settings/qPrefPrivate.cpp \
../../core/settings/qPrefProxy.cpp \
../../core/settings/qPrefUnit.cpp \
../../core/settings/qPrefUpdateManager.cpp \
../../core/subsurface-qt/CylinderObjectHelper.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \
../../core/subsurface-qt/SettingsObjectWrapper.cpp \
@ -203,6 +204,7 @@ HEADERS += \
../../core/settings/qPrefPrivate.h \
../../core/settings/qPrefProxy.h \
../../core/settings/qPrefUnit.h \
../../core/settings/qPrefUpdateManager.h \
../../core/subsurface-qt/CylinderObjectHelper.h \
../../core/subsurface-qt/DiveObjectHelper.h \
../../core/subsurface-qt/SettingsObjectWrapper.h \