diff options
| -rw-r--r-- | qt-ui/diveplanner.cpp | 28 | ||||
| -rw-r--r-- | qt-ui/diveplanner.h | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 1 |
3 files changed, 28 insertions, 3 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 6b3c7b591..7c69c7d6b 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -364,6 +364,18 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) { ui.setupUi(this); + QSettings s; + s.beginGroup("Planner"); + prefs.ascrate75 = s.value("ascrate75", 9).toInt(); + prefs.ascrate50 = s.value("ascrate50", 6).toInt(); + prefs.ascratestops = s.value("ascratestops", 6).toInt(); + prefs.ascratelast6m = s.value("ascratelast6m", 1).toInt(); + prefs.descrate = s.value("descrate", 18).toInt(); + prefs.bottompo2 = s.value("bottompo2", 1400).toInt(); + prefs.decopo2 = s.value("decopo2",1600).toInt(); + prefs.doo2breaks = s.value("doo2breaks", false).toBool(); + s.endGroup(); + ui.ascRate75->setValue(prefs.ascrate75 / UNIT_FACTOR); ui.ascRate50->setValue(prefs.ascrate50 / UNIT_FACTOR); ui.ascRateStops->setValue(prefs.ascratestops / UNIT_FACTOR); @@ -373,7 +385,6 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) ui.decopo2->setValue(prefs.decopo2 / 1000.0); ui.backgasBreaks->setChecked(prefs.doo2breaks); - connect(ui.lastStop, SIGNAL(toggled(bool)), plannerModel, SLOT(setLastStop6m(bool))); connect(ui.verbatim_plan, SIGNAL(toggled(bool)), plannerModel, SLOT(setVerbatim(bool))); connect(ui.display_duration, SIGNAL(toggled(bool)), plannerModel, SLOT(setDisplayDuration(bool))); @@ -407,6 +418,21 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) setMinimumHeight(0); } +PlannerSettingsWidget::~PlannerSettingsWidget() +{ + QSettings s; + s.beginGroup("Planner"); + s.setValue("ascrate75", prefs.ascrate75); + s.setValue("ascrate50", prefs.ascrate50); + s.setValue("ascratestops", prefs.ascratestops); + s.setValue("ascratelast6m", prefs.ascratelast6m); + s.setValue("descrate", prefs.descrate); + s.setValue("bottompo2", prefs.bottompo2); + s.setValue("decopo2", prefs.decopo2); + s.setValue("doo2breaks", prefs.doo2breaks); + s.endGroup(); +} + void PlannerSettingsWidget::settingsChanged() { if (get_units()->length == units::FEET) { diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index a2c33f8c9..dda7daed3 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -150,7 +150,7 @@ class PlannerSettingsWidget : public QWidget { Q_OBJECT public: explicit PlannerSettingsWidget(QWidget *parent = 0, Qt::WindowFlags f = 0); - + virtual ~PlannerSettingsWidget(); public slots: void settingsChanged(); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index fdad2ba99..01024a580 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -797,7 +797,6 @@ void MainWindow::readSettings() default_dive_computer_product = getSetting(s, "dive_computer_product"); default_dive_computer_device = getSetting(s, "dive_computer_device"); s.endGroup(); - QNetworkProxy proxy; proxy.setType(QNetworkProxy::ProxyType(prefs.proxy_type)); proxy.setHostName(prefs.proxy_host); |