blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 07:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add track location to settings

Browse source
This commit is contained in:
Dan Paulat 2023-11-21 22:15:21 -06:00
parent f31f98f545
commit f515ac7b45
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scwx-qt/source/scwx/qt/settings/general_settings.cpp
View file

@ -42,6 +42,7 @@ public:
mapProvider_.SetDefault(defaultMapProviderValue); mapProvider_.SetDefault(defaultMapProviderValue);
mapboxApiKey_.SetDefault("?"); mapboxApiKey_.SetDefault("?");
maptilerApiKey_.SetDefault("?"); maptilerApiKey_.SetDefault("?");
trackLocation_.SetDefault(false);
updateNotificationsEnabled_.SetDefault(true); updateNotificationsEnabled_.SetDefault(true);
fontSizes_.SetElementMinimum(1); fontSizes_.SetElementMinimum(1);
@ -118,6 +119,7 @@ public:
SettingsVariable<std::string> mapProvider_ {"map_provider"}; SettingsVariable<std::string> mapProvider_ {"map_provider"};
SettingsVariable<std::string> mapboxApiKey_ {"mapbox_api_key"}; SettingsVariable<std::string> mapboxApiKey_ {"mapbox_api_key"};
SettingsVariable<std::string> maptilerApiKey_ {"maptiler_api_key"}; SettingsVariable<std::string> maptilerApiKey_ {"maptiler_api_key"};
SettingsVariable<bool> trackLocation_ {"track_location"};
SettingsVariable<bool> updateNotificationsEnabled_ {"update_notifications"}; SettingsVariable<bool> updateNotificationsEnabled_ {"update_notifications"};
}; };
@ -137,6 +139,7 @@ GeneralSettings::GeneralSettings() :
&p->mapProvider_, &p->mapProvider_,
&p->mapboxApiKey_, &p->mapboxApiKey_,
&p->maptilerApiKey_, &p->maptilerApiKey_,
&p->trackLocation_,
&p->updateNotificationsEnabled_}); &p->updateNotificationsEnabled_});
SetDefaults(); SetDefaults();
} }
@ -212,6 +215,11 @@ SettingsVariable<std::string>& GeneralSettings::maptiler_api_key() const
return p->maptilerApiKey_; return p->maptilerApiKey_;
} }
SettingsVariable<bool>& GeneralSettings::track_location() const
{
return p->trackLocation_;
}
SettingsVariable<bool>& GeneralSettings::update_notifications_enabled() const SettingsVariable<bool>& GeneralSettings::update_notifications_enabled() const
{ {
return p->updateNotificationsEnabled_; return p->updateNotificationsEnabled_;
@ -225,6 +233,7 @@ bool GeneralSettings::Shutdown()
dataChanged |= p->loopDelay_.Commit(); dataChanged |= p->loopDelay_.Commit();
dataChanged |= p->loopSpeed_.Commit(); dataChanged |= p->loopSpeed_.Commit();
dataChanged |= p->loopTime_.Commit(); dataChanged |= p->loopTime_.Commit();
dataChanged |= p->trackLocation_.Commit();
return dataChanged; return dataChanged;
} }
@ -250,6 +259,7 @@ bool operator==(const GeneralSettings& lhs, const GeneralSettings& rhs)
lhs.p->mapProvider_ == rhs.p->mapProvider_ && lhs.p->mapProvider_ == rhs.p->mapProvider_ &&
lhs.p->mapboxApiKey_ == rhs.p->mapboxApiKey_ && lhs.p->mapboxApiKey_ == rhs.p->mapboxApiKey_ &&
lhs.p->maptilerApiKey_ == rhs.p->maptilerApiKey_ && lhs.p->maptilerApiKey_ == rhs.p->maptilerApiKey_ &&
lhs.p->trackLocation_ == rhs.p->trackLocation_ &&
lhs.p->updateNotificationsEnabled_ == lhs.p->updateNotificationsEnabled_ ==
rhs.p->updateNotificationsEnabled_); rhs.p->updateNotificationsEnabled_);
} }

1
scwx-qt/source/scwx/qt/settings/general_settings.hpp
View file

@ -38,6 +38,7 @@ public:
SettingsVariable<std::string>& map_provider() const; SettingsVariable<std::string>& map_provider() const;
SettingsVariable<std::string>& mapbox_api_key() const; SettingsVariable<std::string>& mapbox_api_key() const;
SettingsVariable<std::string>& maptiler_api_key() const; SettingsVariable<std::string>& maptiler_api_key() const;
SettingsVariable<bool>& track_location() const;
SettingsVariable<bool>& update_notifications_enabled() const; SettingsVariable<bool>& update_notifications_enabled() const;
static GeneralSettings& Instance(); static GeneralSettings& Instance();

2
test/data

@ -1 +1 @@
Subproject commit fc428fa1460b3d5ce04646727e379e2f4f90f5ec Subproject commit 49a5bf59c30822b585b5726d7262b8e4ed4f10a7