diff options
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/preferences/preferencesdialog.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index dd9913da4..4f5da16bf 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -904,8 +904,12 @@ void ConfigureDiveComputerDialog::configError(QString err) void ConfigureDiveComputerDialog::getDeviceData() { +#ifdef BT_SUPPORT QString device = ui.bluetoothMode && btDeviceSelectionDialog ? btDeviceSelectionDialog->getSelectedDeviceAddress() : ui.device->currentText(); +#else + QString device = ui.device->currentText(); +#endif device_data.devname = strdup(device.toUtf8().data()); device_data.vendor = strdup(selected_vendor.toUtf8().data()); device_data.product = strdup(selected_product.toUtf8().data()); @@ -915,8 +919,10 @@ void ConfigureDiveComputerDialog::getDeviceData() auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; dc->setDevice(device_data.devname); +#ifdef BT_SUPPORT if (ui.bluetoothMode && btDeviceSelectionDialog) dc->setDeviceName(btDeviceSelectionDialog->getSelectedDeviceName()); +#endif } void ConfigureDiveComputerDialog::on_cancel_clicked() diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index e5739bd47..330ea7d05 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -461,7 +461,7 @@ MainWindow *MainWindow::instance() return m_Instance; } -// this gets called after we download dives from a divecomputer +// This gets called after one or more dives were added, edited or downloaded for a dive computer void MainWindow::refreshDisplay(bool doRecreateDiveList) { information()->reload(); @@ -485,6 +485,7 @@ void MainWindow::recreateDiveList() BuddyFilterModel::instance()->repopulate(); LocationFilterModel::instance()->repopulate(); SuitsFilterModel::instance()->repopulate(); + MultiFilterSortModel::instance()->myInvalidate(); } void MainWindow::configureToolbar() { diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp index 6f5f4b9fa..50a0049ac 100644 --- a/desktop-widgets/preferences/preferencesdialog.cpp +++ b/desktop-widgets/preferences/preferencesdialog.cpp @@ -109,7 +109,7 @@ void PreferencesDialog::refreshPages() curr->setParent(0); } - // Readd things. + // Read things Q_FOREACH(AbstractPreferencesWidget *page, pages) { QListWidgetItem *item = new QListWidgetItem(page->icon(), page->name()); pagesList->addItem(item); @@ -139,7 +139,7 @@ void PreferencesDialog::cancelRequested() void PreferencesDialog::defaultsRequested() { - prefs = default_prefs; + copy_prefs(&default_prefs, &prefs); Q_FOREACH(AbstractPreferencesWidget *page, pages) { page->refreshSettings(); } |