mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: activate qPrefLocationService

Browse source 
remove LocationService from SettingsObjectWrapper and reference qPrefLocationService

update files using SettingsObjectWrapper/LocationService to use qPrefLocationService

this activated qPrefLocationService and removed the similar class from
SettingsObjectWrapper.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-06 17:36:29 +02:00 • committed by Dirk Hohndel
parent 2b11fd4cc8
commit 75ce813a27
6 changed files with 15 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/settings/qPref.cpp
View file

@ -20,6 +20,7 @@ void qPref::loadSync(bool doSync)
qPrefDiveComputer::instance()->loadSync(doSync); qPrefDiveComputer::instance()->loadSync(doSync);
qPrefDivePlanner::instance()->loadSync(doSync); qPrefDivePlanner::instance()->loadSync(doSync);
// qPrefFaceook does not use disk. // qPrefFaceook does not use disk.
qPrefLocationService::instance()->loadSync(doSync);
qPrefProxy::instance()->loadSync(doSync); qPrefProxy::instance()->loadSync(doSync);
qPrefTechnicalDetails::instance()->loadSync(doSync); qPrefTechnicalDetails::instance()->loadSync(doSync);
qPrefUnits::instance()->loadSync(doSync); qPrefUnits::instance()->loadSync(doSync);

45
core/subsurface-qt/SettingsObjectWrapper.cpp
View file

@ -532,44 +532,6 @@ void LanguageSettingsObjectWrapper::setDateFormatOverride(bool value)
} }
LocationServiceSettingsObjectWrapper::LocationServiceSettingsObjectWrapper(QObject* parent):
QObject(parent)
{
}
int LocationServiceSettingsObjectWrapper::distanceThreshold() const
{
return prefs.distance_threshold;
}
int LocationServiceSettingsObjectWrapper::timeThreshold() const
{
return prefs.time_threshold;
}
void LocationServiceSettingsObjectWrapper::setDistanceThreshold(int value)
{
if (value == prefs.distance_threshold)
return;
QSettings s;
s.beginGroup(group);
s.setValue("distance_threshold", value);
prefs.distance_threshold = value;
emit distanceThresholdChanged(value);
}
void LocationServiceSettingsObjectWrapper::setTimeThreshold(int value)
{
if (value == prefs.time_threshold)
return;
QSettings s;
s.beginGroup(group);
s.setValue("time_threshold", value);
prefs.time_threshold = value;
emit timeThresholdChanged(value);
}
SettingsObjectWrapper::SettingsObjectWrapper(QObject* parent): SettingsObjectWrapper::SettingsObjectWrapper(QObject* parent):
QObject(parent), QObject(parent),
techDetails(new qPrefTechnicalDetails(this)), techDetails(new qPrefTechnicalDetails(this)),
@ -584,7 +546,7 @@ QObject(parent),
display_settings(new qPrefDisplay(this)), display_settings(new qPrefDisplay(this)),
language_settings(new LanguageSettingsObjectWrapper(this)), language_settings(new LanguageSettingsObjectWrapper(this)),
animation_settings(new qPrefAnimations(this)), animation_settings(new qPrefAnimations(this)),
location_settings(new LocationServiceSettingsObjectWrapper(this)), location_settings(new qPrefLocationService(this)),
update_manager_settings(new qPrefUpdateManager(this)), update_manager_settings(new qPrefUpdateManager(this)),
dive_computer_settings(new qPrefDiveComputer(this)) dive_computer_settings(new qPrefDiveComputer(this))
{ {
@ -633,10 +595,7 @@ void SettingsObjectWrapper::load()
s.endGroup(); s.endGroup();
// GPS service time and distance thresholds // GPS service time and distance thresholds
s.beginGroup("LocationService"); qPrefLocationService::instance()->load();
GET_INT("time_threshold", time_threshold);
GET_INT("distance_threshold", distance_threshold);
s.endGroup();
qPrefDivePlanner::instance()->load(); qPrefDivePlanner::instance()->load();
qPrefDiveComputer::instance()->load(); qPrefDiveComputer::instance()->load();

22
core/subsurface-qt/SettingsObjectWrapper.h
View file

@ -183,24 +183,6 @@ private:
const QString group = QStringLiteral("Language"); const QString group = QStringLiteral("Language");
}; };
class LocationServiceSettingsObjectWrapper : public QObject {
Q_OBJECT
Q_PROPERTY(int time_threshold READ timeThreshold WRITE setTimeThreshold NOTIFY timeThresholdChanged)
Q_PROPERTY(int distance_threshold READ distanceThreshold WRITE setDistanceThreshold NOTIFY distanceThresholdChanged)
public:
LocationServiceSettingsObjectWrapper(QObject *parent);
int timeThreshold() const;
int distanceThreshold() const;
public slots:
void setTimeThreshold(int value);
void setDistanceThreshold(int value);
signals:
void timeThresholdChanged(int value);
void distanceThresholdChanged(int value);
private:
const QString group = QStringLiteral("LocationService");
};
class SettingsObjectWrapper : public QObject { class SettingsObjectWrapper : public QObject {
Q_OBJECT Q_OBJECT
@ -216,7 +198,7 @@ class SettingsObjectWrapper : public QObject {
Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT) Q_PROPERTY(qPrefDisplay* display MEMBER display_settings CONSTANT)
Q_PROPERTY(LanguageSettingsObjectWrapper* language MEMBER language_settings CONSTANT) Q_PROPERTY(LanguageSettingsObjectWrapper* language MEMBER language_settings CONSTANT)
Q_PROPERTY(qPrefAnimations* animation MEMBER animation_settings CONSTANT) Q_PROPERTY(qPrefAnimations* animation MEMBER animation_settings CONSTANT)
Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location MEMBER location_settings CONSTANT) Q_PROPERTY(qPrefLocationService* Location MEMBER location_settings CONSTANT)
Q_PROPERTY(qPrefUpdateManager* update MEMBER update_manager_settings CONSTANT) Q_PROPERTY(qPrefUpdateManager* update MEMBER update_manager_settings CONSTANT)
Q_PROPERTY(qPrefDiveComputer* dive_computer MEMBER dive_computer_settings CONSTANT) Q_PROPERTY(qPrefDiveComputer* dive_computer MEMBER dive_computer_settings CONSTANT)
@ -235,7 +217,7 @@ public:
qPrefDisplay *display_settings; qPrefDisplay *display_settings;
LanguageSettingsObjectWrapper *language_settings; LanguageSettingsObjectWrapper *language_settings;
qPrefAnimations *animation_settings; qPrefAnimations *animation_settings;
LocationServiceSettingsObjectWrapper *location_settings; qPrefLocationService *location_settings;
qPrefUpdateManager *update_manager_settings; qPrefUpdateManager *update_manager_settings;
qPrefDiveComputer *dive_computer_settings; qPrefDiveComputer *dive_computer_settings;

4
mobile-widgets/qmlmanager.cpp
View file

@ -425,8 +425,8 @@ QMLManager *QMLManager::instance()
void QMLManager::savePreferences() void QMLManager::savePreferences()
{ {
auto location = SettingsObjectWrapper::instance()->location_settings; auto location = SettingsObjectWrapper::instance()->location_settings;
location->setTimeThreshold(QMLPrefs::instance()->timeThreshold() * 60); location->set_time_threshold(QMLPrefs::instance()->timeThreshold() * 60);
location->setDistanceThreshold(QMLPrefs::instance()->distanceThreshold()); location->set_distance_threshold(QMLPrefs::instance()->distanceThreshold());
} }
#define CLOUDURL QString(prefs.cloud_base_url) #define CLOUDURL QString(prefs.cloud_base_url)

1
subsurface-helper.cpp
View file

@ -162,6 +162,7 @@ void register_qml_types()
REGISTER_TYPE(qPrefDiveComputer, "SsrfDiveComputerPrefs"); REGISTER_TYPE(qPrefDiveComputer, "SsrfDiveComputerPrefs");
REGISTER_TYPE(qPrefDivePlanner, "SsrfDivePlannerPrefs"); REGISTER_TYPE(qPrefDivePlanner, "SsrfDivePlannerPrefs");
REGISTER_TYPE(qPrefFacebook, "SsrfFacebookPrefs"); REGISTER_TYPE(qPrefFacebook, "SsrfFacebookPrefs");
REGISTER_TYPE(qPrefLocationService, "SsrfLocationServicePrefs");
REGISTER_TYPE(qPrefProxy, "SsrfProxyPrefs"); REGISTER_TYPE(qPrefProxy, "SsrfProxyPrefs");
REGISTER_TYPE(qPrefTechnicalDetails, "SsrfTechnicalDetailsPrefs"); REGISTER_TYPE(qPrefTechnicalDetails, "SsrfTechnicalDetailsPrefs");
REGISTER_TYPE(qPrefUnits, "SsrfUnitPrefs"); REGISTER_TYPE(qPrefUnits, "SsrfUnitPrefs");

14
tests/testpreferences.cpp
View file

@ -147,15 +147,15 @@ void TestPreferences::testPreferences()
TEST(language->dateFormatOverride(), true); TEST(language->dateFormatOverride(), true);
TEST(language->useSystemLanguage(), true); TEST(language->useSystemLanguage(), true);
auto location = pref->location_settings; auto location = qPrefLocationService::instance();
location->setTimeThreshold(10); location->set_time_threshold(10);
location->setDistanceThreshold(20); location->set_distance_threshold(20);
TEST(location->timeThreshold(), 10); TEST(location->time_threshold(), 10);
TEST(location->distanceThreshold(), 20); TEST(location->distance_threshold(), 20);
location->setTimeThreshold(30); location->set_time_threshold(30);
location->setDistanceThreshold(40); location->set_distance_threshold(40);
TEST(location->timeThreshold(), 30); TEST(location->timeThreshold(), 30);
TEST(location->distanceThreshold(), 40); TEST(location->distanceThreshold(), 40);