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

core: activate qPrefDiveComputer

Browse source 
remove DiveComputer from SettingsObjectWrapper and reference qPrefDiveComputer

update files using SettingsObjectWrapper/DiveComputer to use qPrefDiveComputer

this activated qPrefDiveComputer and removed the similar class from
SettingsObjectWrapper.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-22 16:19:22 +02:00 • committed by Dirk Hohndel
parent 98820cf970
commit 3d6848b22c
9 changed files with 56 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

8
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -133,8 +133,8 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) : QDia
memset(&device_data, 0, sizeof(device_data));
fill_computer_list();
auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
if (!dc->dc_device().isEmpty())
ui.device->setEditText(dc->dc_device());
if (!dc->device().isEmpty())
ui.device->setEditText(dc->device());
ui.DiveComputerList->setCurrentRow(0);
on_DiveComputerList_currentRowChanged(0);
@ -912,10 +912,10 @@ void ConfigureDiveComputerDialog::getDeviceData()
device_data.deviceid = device_data.diveid = 0;
auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
dc->setDevice(device_data.devname);
dc->set_device(device_data.devname);
#ifdef BT_SUPPORT
if (ui.bluetoothMode && btDeviceSelectionDialog)
dc->setDeviceName(btDeviceSelectionDialog->getSelectedDeviceName());
dc->set_device_name(btDeviceSelectionDialog->getSelectedDeviceName());
#endif
}