From f5fe6839c7672f775e35068f46fbb2d2e41b8bf5 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 29 Sep 2020 23:19:11 +0200 Subject: desktop: add trip selection dialog A simple dialog to select a trip. Simply fill a QListWidget without the model/view rigmarole. So much less painful! Of course that means that the dialog has to be regenerated everytime it is used. Signed-off-by: Berthold Stoeger --- desktop-widgets/CMakeLists.txt | 3 ++ desktop-widgets/tripselectiondialog.cpp | 47 ++++++++++++++++++++ desktop-widgets/tripselectiondialog.h | 23 ++++++++++ desktop-widgets/tripselectiondialog.ui | 78 +++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+) create mode 100644 desktop-widgets/tripselectiondialog.cpp create mode 100644 desktop-widgets/tripselectiondialog.h create mode 100644 desktop-widgets/tripselectiondialog.ui (limited to 'desktop-widgets') diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt index 5a1418d76..9531688d7 100644 --- a/desktop-widgets/CMakeLists.txt +++ b/desktop-widgets/CMakeLists.txt @@ -43,6 +43,7 @@ set (SUBSURFACE_UI shifttimes.ui tableview.ui templateedit.ui + tripselectiodialog.ui urldialog.ui webservices.ui tab-widgets/maintab.ui @@ -130,6 +131,8 @@ set(SUBSURFACE_INTERFACE tagwidget.h textedit.cpp textedit.h + tripselectiondialog.cpp + tripselectiondialog.h updatemanager.cpp updatemanager.h ) diff --git a/desktop-widgets/tripselectiondialog.cpp b/desktop-widgets/tripselectiondialog.cpp new file mode 100644 index 000000000..2623fdc10 --- /dev/null +++ b/desktop-widgets/tripselectiondialog.cpp @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "tripselectiondialog.h" +#include "core/trip.h" +#include "core/qthelper.h" +#include +#include + +TripSelectionDialog::TripSelectionDialog(QWidget *parent) : QDialog(parent) +{ + ui.setupUi(this); + connect(ui.trips, &QListWidget::itemSelectionChanged, this, &TripSelectionDialog::selectionChanged); + + QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); + connect(close, &QShortcut::activated, this, &QDialog::close); + QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this); + connect(quit, &QShortcut::activated, parent, &QWidget::close); + + // We could use a model, but it seems barely worth the hassle. + QStringList list; + list.reserve(trip_table.nr); + for (int i = 0; i < trip_table.nr; ++i) + list.push_back(get_trip_string(trip_table.trips[i])); + ui.trips->addItems(list); +} + +void TripSelectionDialog::selectionChanged() +{ + ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(selectedTrip() != nullptr); +} + +dive_trip *TripSelectionDialog::selectedTrip() const +{ + // Accessing the selected index of a QListWidget is ridiculously cumbersome. + // Note that "currentItem" is a different beast. + QModelIndexList rows = ui.trips->selectionModel()->selectedRows(); + if (rows.size() != 1) + return nullptr; + int idx = rows[0].row(); + if (idx < 0 || idx >= trip_table.nr) + return nullptr; + return trip_table.trips[idx]; +} + +dive_trip *TripSelectionDialog::getTrip() +{ + return exec() ? selectedTrip() : nullptr; +} diff --git a/desktop-widgets/tripselectiondialog.h b/desktop-widgets/tripselectiondialog.h new file mode 100644 index 000000000..9cef28e17 --- /dev/null +++ b/desktop-widgets/tripselectiondialog.h @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef TRIPSELECTIONDIALOG_H +#define TRIPSELECTIONDIALOG_H + +#include +#include "ui_tripselectiondialog.h" + +struct dive_trip; + +class TripSelectionDialog : public QDialog { + Q_OBJECT +private +slots: + void selectionChanged(); +public: + TripSelectionDialog(QWidget *parent); // Must pass in MainWindow for QShortcut hackery. + dive_trip *getTrip(); // NULL if user canceled. +private: + dive_trip *selectedTrip() const; + Ui::TripSelectionDialog ui; +}; + +#endif // TRIPSELECTIONDIALOG_H diff --git a/desktop-widgets/tripselectiondialog.ui b/desktop-widgets/tripselectiondialog.ui new file mode 100644 index 000000000..ae3946b04 --- /dev/null +++ b/desktop-widgets/tripselectiondialog.ui @@ -0,0 +1,78 @@ + + + TripSelectionDialog + + + Qt::WindowModal + + + + 0 + 0 + 560 + 300 + + + + Select trip + + + + :subsurface-icon + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + TripSelectionDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + TripSelectionDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + -- cgit v1.2.3-70-g09d2