mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-27 20:58:47 +00:00
9c253ee6c5
The parser API was very annoying, as a number of tables to-be-filled were passed in as pointers. The goal of this commit is to collect all these tables in a single struct. This should make it (more or less) clear what is actually written into the divelog files. Moreover, it should now be rather easy to search for instances, where the global logfile is accessed (and it turns out that there are many!). The divelog struct does not contain the tables as substructs, but only collects pointers. The idea is that the "divelog.h" file can be included without all the other files describing the numerous tables. To make it easier to use from C++ parts of the code, the struct implements a constructor and a destructor. Sadly, we can't use smart pointers, since the pointers are accessed from C code. Therfore the constructor and destructor are quite complex. The whole commit is large, but was mostly an automatic conversion. One oddity of note: the divelog structure also contains the "autogroup" flag, since that is saved in the divelog. This actually fixes a bug: Before, when importing dives from a different log, the autogroup flag was overwritten. This was probably not intended and does not happen anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
48 lines
1.5 KiB
C++
48 lines
1.5 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "tripselectiondialog.h"
|
|
#include "core/divelog.h"
|
|
#include "core/string-format.h"
|
|
#include "core/trip.h"
|
|
#include <QShortcut>
|
|
#include <QPushButton>
|
|
|
|
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(divelog.trips->nr);
|
|
for (int i = 0; i < divelog.trips->nr; ++i)
|
|
list.push_back(formatTripTitleWithDives(divelog.trips->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 >= divelog.trips->nr)
|
|
return nullptr;
|
|
return divelog.trips->trips[idx];
|
|
}
|
|
|
|
dive_trip *TripSelectionDialog::getTrip()
|
|
{
|
|
return exec() ? selectedTrip() : nullptr;
|
|
}
|