diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-21 12:16:42 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-09-23 11:49:30 -0700 |
| commit | 4eb8ed1b29685a10b56f213c4fc6aca440c00601 (patch) | |
| tree | 75d3287856081336d0caba1c3d18c899470cfcc9 /desktop-widgets | |
| parent | 99261775ceede62e19422f6c909439a619d65ee0 (diff) | |
| download | subsurface-4eb8ed1b29685a10b56f213c4fc6aca440c00601.tar.gz | |
Desktop/remember DCs: hook up the shortcut buttons
The straight forward code to update the currentIndex of the combobox doesn't
appear to work on macOS (but works fine on Linux). Calling the event loop and
then calling update afterwards seems very unintuitive, but it appears to fix
the issue in my testing.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 23 | ||||
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.h | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 41acae7c5..047d325f2 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -83,6 +83,7 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : if (!qPrefDiveComputer::vendor##num().isEmpty()) { \ ui.DC##num->setVisible(true); \ ui.DC##num->setText(qPrefDiveComputer::vendor##num() + " - " + qPrefDiveComputer::product##num()); \ + connect(ui.DC##num, &QPushButton::clicked, this, &DownloadFromDCWidget::DC##num##Clicked); \ } else { \ ui.DC##num->setVisible(false); \ } @@ -114,6 +115,28 @@ DownloadFromDCWidget::DownloadFromDCWidget(QWidget *parent, Qt::WindowFlags f) : ui.device->setEditText(deviceText); } +// DC button slots +#define DCBUTTON(num) \ +void DownloadFromDCWidget::DC##num##Clicked() \ +{ \ + ui.vendor->setCurrentIndex(ui.vendor->findText(qPrefDiveComputer::vendor##num())); \ + productModel.setStringList(productList[qPrefDiveComputer::vendor##num()]); \ + ui.product->setCurrentIndex(ui.product->findText(qPrefDiveComputer::product##num())); \ + ui.device->setCurrentIndex(ui.device->findText(qPrefDiveComputer::device##num())); \ + if (QSysInfo::kernelType() == "darwin") { \ + /* it makes no sense that this would be needed on macOS but not Linux */ \ + QCoreApplication::processEvents(); \ + ui.vendor->update(); \ + ui.product->update(); \ + ui.device->update(); \ + } \ +} + +DCBUTTON(1) +DCBUTTON(2) +DCBUTTON(3) +DCBUTTON(4) + void DownloadFromDCWidget::updateProgressBar() { static char *last_text = NULL; diff --git a/desktop-widgets/downloadfromdivecomputer.h b/desktop-widgets/downloadfromdivecomputer.h index f9cc83e64..78e2923ce 100644 --- a/desktop-widgets/downloadfromdivecomputer.h +++ b/desktop-widgets/downloadfromdivecomputer.h @@ -50,6 +50,11 @@ slots: void checkDumpFile(int state); void pickDumpFile(); void pickLogFile(); + void DC1Clicked(); + void DC2Clicked(); + void DC3Clicked(); + void DC4Clicked(); + #if defined(BT_SUPPORT) void enableBluetoothMode(int state); void selectRemoteBluetoothDevice(); |