core: create qPrefUnit 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>

core/CMakeLists.txt

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

core/settings/qPref.h

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

core/settings/qPrefPrivate.h

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

core/settings/qPrefUnit.cpp

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "qPref.h"
+#include "qPrefPrivate.h"
+
+
+static const QString group = QStringLiteral("Units");
+
+qPrefUnits::qPrefUnits(QObject *parent) : QObject(parent)
+{
+}
+qPrefUnits *qPrefUnits::instance()
+{
+	static qPrefUnits *self = new qPrefUnits;
+	return self;
+}
+
+
+void qPrefUnits::loadSync(bool doSync)
+{
+	disk_coordinates_traditional(doSync);
+	disk_duration_units(doSync);
+	disk_length(doSync);
+	disk_pressure(doSync);
+	disk_show_units_table(doSync);
+	disk_temperature(doSync);
+	disk_unit_system(doSync);
+	disk_vertical_speed_time(doSync);
+	disk_volume(doSync);
+	disk_weight(doSync);
+}
+
+HANDLE_PREFERENCE_BOOL(Units, "/coordinates", coordinates_traditional);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::DURATION, "/duration_units", duration_units, units.);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::LENGTH, "/length", length, units.);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::PRESSURE, "/pressure", pressure, units.);
+
+HANDLE_PREFERENCE_BOOL_EXT(Units, "/show_units_table", show_units_table, units.);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::TEMPERATURE, "/temperature", temperature, units.);
+
+QString qPrefUnits::unit_system()
+{
+	return 	prefs.unit_system == METRIC ? QStringLiteral("metric") :
+			prefs.unit_system == IMPERIAL ? QStringLiteral("imperial") :
+											QStringLiteral("personalized");
+}
+void qPrefUnits::set_unit_system(const QString& value)
+{
+	short int v = value == QStringLiteral("metric") ? METRIC :
+					value == QStringLiteral("imperial")? IMPERIAL :
+							PERSONALIZE;
+	if (v != prefs.unit_system) {
+		if (v == METRIC) {
+			prefs.unit_system = METRIC;
+			prefs.units = SI_units;
+		} else if (v == IMPERIAL) {
+			prefs.unit_system = IMPERIAL;
+			prefs.units = IMPERIAL_units;
+		} else {
+			prefs.unit_system = PERSONALIZE;
+		}
+		disk_unit_system(true);
+		emit unit_system_changed(value);
+	}
+}
+DISK_LOADSYNC_ENUM(Units, "/unit_system", unit_system_values, unit_system);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::TIME, "/vertical_speed_time", vertical_speed_time, units.);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::VOLUME, "/volume", volume, units.);
+
+HANDLE_PREFERENCE_ENUM_EXT(Units, units::WEIGHT, "/weight", weight, units.);

core/settings/qPrefUnit.h

@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0
+#ifndef QPREFUNIT_H
+#define QPREFUNIT_H
+#include "core/pref.h"
+
+#include <QObject>
+
+
+class qPrefUnits : public QObject {
+	Q_OBJECT
+	Q_PROPERTY(bool coordinates_traditional READ coordinates_traditional WRITE set_coordinates_traditional NOTIFY coordinates_traditional_changed);
+	Q_PROPERTY(units::DURATION duration_units READ duration_units WRITE set_duration_units NOTIFY duration_units_changed);
+	Q_PROPERTY(units::LENGTH length READ length WRITE set_length NOTIFY length_changed);
+	Q_PROPERTY(units::PRESSURE pressure READ pressure WRITE set_pressure NOTIFY pressure_changed);
+	Q_PROPERTY(bool show_units_table READ show_units_table WRITE set_show_units_table NOTIFY show_units_table_changed);
+	Q_PROPERTY(units::TEMPERATURE temperature READ temperature WRITE set_temperature NOTIFY temperature_changed);
+	Q_PROPERTY(QString unit_system READ unit_system WRITE set_unit_system NOTIFY unit_system_changed);
+	Q_PROPERTY(units::TIME vertical_speed_time READ vertical_speed_time WRITE set_vertical_speed_time NOTIFY vertical_speed_time_changed);
+	Q_PROPERTY(units::VOLUME volume READ volume WRITE set_volume NOTIFY volume_changed);
+	Q_PROPERTY(units::WEIGHT weight READ weight WRITE set_weight NOTIFY weight_changed);
+
+public:
+	qPrefUnits(QObject *parent = NULL);
+	static qPrefUnits *instance();
+
+	// Load/Sync local settings (disk) and struct preference
+	void loadSync(bool doSync);
+	void inline load() { loadSync(false); }
+	void inline sync() { loadSync(true); }
+
+public:
+	static inline bool coordinates_traditional() { return prefs.coordinates_traditional; }
+	static inline units::DURATION duration_units() { return prefs.units.duration_units; }
+	static inline units::LENGTH length() { return prefs.units.length; }
+	static inline units::PRESSURE pressure() { return prefs.units.pressure; }
+	static inline bool show_units_table() { return prefs.units.show_units_table; }
+	static inline units::TEMPERATURE temperature() { return prefs.units.temperature; }
+	static QString unit_system();
+	static inline units::TIME vertical_speed_time() { return prefs.units.vertical_speed_time; }
+	static inline units::VOLUME volume() { return prefs.units.volume; }
+	static inline units::WEIGHT weight() { return prefs.units.weight; }
+
+public slots:
+	void set_coordinates_traditional(bool value);
+	void set_duration_units(units::DURATION value);
+	void set_length(units::LENGTH value);
+	void set_pressure(units::PRESSURE value);
+	void set_show_units_table(bool value);
+	void set_temperature(units::TEMPERATURE value);
+	void set_unit_system(const QString& value);
+	void set_vertical_speed_time(units::TIME value);
+	void set_volume(units::VOLUME value);
+	void set_weight(units::WEIGHT value);
+
+signals:
+	void coordinates_traditional_changed(bool value);
+	void duration_units_changed(int value);
+	void length_changed(int value);
+	void pressure_changed(int value);
+	void show_units_table_changed(bool value);
+	void temperature_changed(int value);
+	void unit_system_changed(const QString& value);
+	void vertical_speed_time_changed(int value);
+	void volume_changed(int value);
+	void weight_changed(int value);
+
+private:
+	void disk_coordinates_traditional(bool doSync);
+	void disk_duration_units(bool doSync);
+	void disk_length(bool doSync);
+	void disk_pressure(bool doSync);
+	void disk_show_units_table(bool doSync);
+	void disk_temperature(bool doSync);
+	void disk_unit_system(bool doSync);
+	void disk_vertical_speed_time(bool doSync);
+	void disk_volume(bool doSync);
+	void disk_weight(bool doSync);
+};
+
+#endif

packaging/ios/Subsurface-mobile.pro

@@ -85,6 +85,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \
 	../../core/settings/qPrefFacebook.cpp \
 	../../core/settings/qPrefPrivate.cpp \
 	../../core/settings/qPrefProxy.cpp \
+	../../core/settings/qPrefUnit.cpp \
 	../../core/subsurface-qt/CylinderObjectHelper.cpp \
 	../../core/subsurface-qt/DiveObjectHelper.cpp \
 	../../core/subsurface-qt/SettingsObjectWrapper.cpp \
@@ -199,6 +200,7 @@ HEADERS += \
 	../../core/settings/qPrefFacebook.h \
 	../../core/settings/qPrefPrivate.h \
 	../../core/settings/qPrefProxy.h \
+	../../core/settings/qPrefUnit.h \
 	../../core/subsurface-qt/CylinderObjectHelper.h \
 	../../core/subsurface-qt/DiveObjectHelper.h \
 	../../core/subsurface-qt/SettingsObjectWrapper.h \