mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
f4bcdf46aa
Since commit 01d961086c, the location filter
list is updated if a dive site is edited. The problem is that if the
name of a selected dive site is changed, the selection is lost.
Therefore, before repopulating, inform the location filter that a dive
site changed its name. The location filter then internally changes the
name and can properly transfer the old selection on repopulate. This is
performed via the new LocationInformationWidget::nameChanged signal,
which is connected to the new LocationFilterModel::changeName slot.
A special case to be handled is the following:
[ ] Site 1
[x] Site 2
and "Site 2" being renamed to "Site 1", i.e. both sites being merged.
Here, the merging is detected and "Site 1" will likewise be checked:
[x] Site 1
[x] Site 1
No merging is performed, as the list will be repopulated anyway.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
118 lines
3.4 KiB
C++
118 lines
3.4 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef LOCATIONINFORMATION_H
|
|
#define LOCATIONINFORMATION_H
|
|
|
|
#include "ui_locationInformation.h"
|
|
#include <stdint.h>
|
|
#include <QAbstractListModel>
|
|
#include <QSortFilterProxyModel>
|
|
|
|
class LocationInformationWidget : public QGroupBox {
|
|
Q_OBJECT
|
|
public:
|
|
LocationInformationWidget(QWidget *parent = 0);
|
|
virtual bool eventFilter(QObject*, QEvent*);
|
|
|
|
protected:
|
|
void showEvent(QShowEvent *);
|
|
|
|
public slots:
|
|
void acceptChanges();
|
|
void rejectChanges();
|
|
void updateGpsCoordinates();
|
|
void markChangedWidget(QWidget *w);
|
|
void enableEdition();
|
|
void resetState();
|
|
void resetPallete();
|
|
void on_diveSiteCountry_textChanged(const QString& text);
|
|
void on_diveSiteCoordinates_textChanged(const QString& text);
|
|
void on_diveSiteDescription_textChanged(const QString& text);
|
|
void on_diveSiteName_textChanged(const QString& text);
|
|
void on_diveSiteNotes_textChanged();
|
|
void reverseGeocode();
|
|
void mergeSelectedDiveSites();
|
|
private slots:
|
|
void updateLabels();
|
|
signals:
|
|
void startEditDiveSite(uint32_t uuid);
|
|
void endEditDiveSite();
|
|
void coordinatesChanged();
|
|
void startFilterDiveSite(uint32_t uuid);
|
|
void stopFilterDiveSite();
|
|
void requestCoordinates();
|
|
void endRequestCoordinates();
|
|
void nameChanged(const QString &oldName, const QString &newName);
|
|
|
|
private:
|
|
void clearLabels();
|
|
Ui::LocationInformation ui;
|
|
bool modified;
|
|
QAction *acceptAction, *rejectAction;
|
|
};
|
|
|
|
class DiveLocationFilterProxyModel : public QSortFilterProxyModel {
|
|
Q_OBJECT
|
|
public:
|
|
DiveLocationFilterProxyModel(QObject *parent = 0);
|
|
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
|
|
virtual bool lessThan(const QModelIndex& source_left, const QModelIndex& source_right) const;
|
|
};
|
|
|
|
class DiveLocationModel : public QAbstractTableModel {
|
|
Q_OBJECT
|
|
public:
|
|
enum columns{UUID, NAME, LATITUDE, LONGITUDE, DESCRIPTION, NOTES, COLUMNS};
|
|
DiveLocationModel(QObject *o = 0);
|
|
void resetModel();
|
|
QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
|
|
int rowCount(const QModelIndex& parent = QModelIndex()) const;
|
|
int columnCount(const QModelIndex& parent = QModelIndex()) const;
|
|
bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
|
|
private:
|
|
QString new_ds_value[2];
|
|
};
|
|
|
|
class DiveLocationListView : public QListView {
|
|
Q_OBJECT
|
|
public:
|
|
DiveLocationListView(QWidget *parent = 0);
|
|
protected:
|
|
virtual void currentChanged(const QModelIndex& current, const QModelIndex& previous);
|
|
signals:
|
|
void currentIndexChanged(const QModelIndex& current);
|
|
};
|
|
|
|
class DiveLocationLineEdit : public QLineEdit {
|
|
Q_OBJECT
|
|
public:
|
|
enum DiveSiteType { NO_DIVE_SITE, NEW_DIVE_SITE, EXISTING_DIVE_SITE };
|
|
DiveLocationLineEdit(QWidget *parent =0 );
|
|
void refreshDiveSiteCache();
|
|
void setTemporaryDiveSiteName(const QString& s);
|
|
bool eventFilter(QObject*, QEvent*);
|
|
void itemActivated(const QModelIndex& index);
|
|
DiveSiteType currDiveSiteType() const;
|
|
uint32_t currDiveSiteUuid() const;
|
|
void fixPopupPosition();
|
|
void setCurrentDiveSiteUuid(uint32_t uuid);
|
|
|
|
signals:
|
|
void diveSiteSelected(uint32_t uuid);
|
|
void entered(const QModelIndex& index);
|
|
void currentChanged(const QModelIndex& index);
|
|
|
|
protected:
|
|
void keyPressEvent(QKeyEvent *ev);
|
|
void focusOutEvent(QFocusEvent *ev);
|
|
void showPopup();
|
|
|
|
private:
|
|
using QLineEdit::setText;
|
|
DiveLocationFilterProxyModel *proxy;
|
|
DiveLocationModel *model;
|
|
DiveLocationListView *view;
|
|
DiveSiteType currType;
|
|
uint32_t currUuid;
|
|
};
|
|
|
|
#endif
|