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

Move divecomputer configuration code to different files

Browse source 
This splits the code in configuredivecomputer.cpp into multiple files.
The read and write threads are moved to configuredivecomputerthreads.h/cpp,
and the device details class is moved to devicedetails.h/.cpp

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>
Signed-off-by: Thiago Macieira <thiago@macieira.org>
This commit is contained in:
Joseph W. Joshua 2014-06-10 15:03:26 +03:00 • committed by Thiago Macieira
parent 2432350064
commit 4fc16b1674
10 changed files with 403 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

36
qt-ui/configuredivecomputerdialog.cpp
View file

@ -33,14 +33,16 @@ ConfigureDiveComputerDialog::ConfigureDiveComputerDialog(QWidget *parent) :
ui(new Ui::ConfigureDiveComputerDialog),
config(0),
vendorModel(0),
productModel(0)
productModel(0),
deviceDetails(0)
{
ui->setupUi(this);
deviceDetails = new DeviceDetails(this);
config = new ConfigureDiveComputer(this);
connect (config, SIGNAL(error(QString)), this, SLOT(configError(QString)));
connect (config, SIGNAL(message(QString)), this, SLOT(configMessage(QString)));
connect (config, SIGNAL(deviceSettings(QString)), ui->availableDetails, SLOT(setText(QString)));
connect (config, SIGNAL(readFinished()), this, SLOT(deviceReadFinished()));
fill_computer_list();
@ -157,7 +159,7 @@ void ConfigureDiveComputerDialog::readSettings()
ui->errorLabel->clear();
getDeviceData();
config->readSettings(&device_data);
config->readSettings(deviceDetails, &device_data);
}
void ConfigureDiveComputerDialog::configMessage(QString msg)
@ -181,6 +183,8 @@ void ConfigureDiveComputerDialog::getDeviceData()
set_default_dive_computer(device_data.vendor, device_data.product);
set_default_dive_computer_device(device_data.devname);
//deviceDetails->setData(&device_data);
}
void ConfigureDiveComputerDialog::on_cancel_clicked()
@ -188,31 +192,13 @@ void ConfigureDiveComputerDialog::on_cancel_clicked()
this->close();
}
void ConfigureDiveComputerDialog::on_setDeviceName_clicked()
void ConfigureDiveComputerDialog::deviceReadFinished()
{
ui->statusLabel->clear();
ui->errorLabel->clear();
ui->availableDetails->clear();
QString newDeviceName = QInputDialog::getText(this, tr("Set device name"), tr("Enter the new name for this device:"));
if (newDeviceName.length() > 0) {
getDeviceData();
config->setDeviceName(&device_data, newDeviceName);
}
ui->brightnessComboBox->setCurrentIndex(config->m_deviceDetails->brightness());
}
void ConfigureDiveComputerDialog::on_setDateAndTime_clicked()
void ConfigureDiveComputerDialog::on_saveSettingsPushButton_clicked()
{
ui->statusLabel->clear();
ui->errorLabel->clear();
ui->availableDetails->clear();
getDeviceData();
config->setDeviceDateAndTime(&device_data, QDateTime::currentDateTime());
config->saveDeviceDetails();
}
void ConfigureDiveComputerDialog::on_setBrightnessButton_clicked()
{
getDeviceData();
config->setDeviceBrightness(&device_data, ui->brightnessComboBox->currentIndex());
}