mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Settings update: Add "Dive Computer" settings to SettingsObjectWrapper

Browse source 
For some reason, the dive computer settings weren't in the
settings prefs. This moves it, makes the boilerplate on Settings
ObjectWrapper and make things compile.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-08-10 18:10:15 -03:00 • committed by Dirk Hohndel
parent b264c3e367
commit db8e8957ab
9 changed files with 134 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

59
core/divecomputer.cpp
View file

@ -1,12 +1,9 @@
#include "divecomputer.h"
#include "dive.h"
#include "subsurface-qt/SettingsObjectWrapper.h"
#include <QSettings>
const char *default_dive_computer_vendor;
const char *default_dive_computer_product;
const char *default_dive_computer_device;
int default_dive_computer_download_mode;
DiveComputerList dcList;
DiveComputerList::DiveComputerList()
@ -144,60 +141,14 @@ extern "C" void call_for_each_dc (void *f, void (*callback)(void *, const char *
extern "C" int is_default_dive_computer(const char *vendor, const char *product)
{
return default_dive_computer_vendor && !strcmp(vendor, default_dive_computer_vendor) &&
default_dive_computer_product && !strcmp(product, default_dive_computer_product);
auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
return dc->dc_vendor() == vendor && dc->dc_product() == product;
}
extern "C" int is_default_dive_computer_device(const char *name)
{
return default_dive_computer_device && !strcmp(name, default_dive_computer_device);
}
void set_default_dive_computer(const char *vendor, const char *product)
{
QSettings s;
if (!vendor || !*vendor)
return;
if (!product || !*product)
return;
if (is_default_dive_computer(vendor, product))
return;
free((void *)default_dive_computer_vendor);
free((void *)default_dive_computer_product);
default_dive_computer_vendor = strdup(vendor);
default_dive_computer_product = strdup(product);
s.beginGroup("DiveComputer");
s.setValue("dive_computer_vendor", vendor);
s.setValue("dive_computer_product", product);
s.endGroup();
}
void set_default_dive_computer_device(const char *name)
{
QSettings s;
if (!name || !*name)
return;
if (is_default_dive_computer_device(name))
return;
free((void *)default_dive_computer_device);
default_dive_computer_device = strdup(name);
s.beginGroup("DiveComputer");
s.setValue("dive_computer_device", name);
s.endGroup();
}
void set_default_dive_computer_download_mode(int download_mode)
{
QSettings s;
default_dive_computer_download_mode = download_mode;
s.beginGroup("DiveComputer");
s.setValue("dive_computer_download_mode", download_mode);
s.endGroup();
auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
return dc->dc_device() == name;
}
extern "C" void set_dc_nickname(struct dive *dive)