diff options
| -rw-r--r-- | qt-models/divelocationmodel.cpp | 3 | ||||
| -rw-r--r-- | qt-ui/locationinformation.cpp | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/qt-models/divelocationmodel.cpp b/qt-models/divelocationmodel.cpp index 47037b576..6e1bbaadb 100644 --- a/qt-models/divelocationmodel.cpp +++ b/qt-models/divelocationmodel.cpp @@ -189,6 +189,7 @@ bool filter_same_gps_cb (QAbstractItemModel *model, int sourceRow, const QModelI { int ref_lat = displayed_dive_site.latitude.udeg; int ref_lon = displayed_dive_site.longitude.udeg; + int ref_uuid = displayed_dive_site.uuid; QSortFilterProxyModel *self = (QSortFilterProxyModel*) model; int ds_uuid = self->sourceModel()->index(sourceRow, LocationInformationModel::UUID, parent).data().toInt(); @@ -197,5 +198,5 @@ bool filter_same_gps_cb (QAbstractItemModel *model, int sourceRow, const QModelI if (!ds) return false; - return (ds->latitude.udeg == ref_lat && ds->longitude.udeg == ref_lon); + return (ds->latitude.udeg == ref_lat && ds->longitude.udeg == ref_lon && ds->uuid != ref_uuid); }
\ No newline at end of file diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp index dbc22b178..bf8300426 100644 --- a/qt-ui/locationinformation.cpp +++ b/qt-ui/locationinformation.cpp @@ -55,13 +55,11 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo bool LocationInformationWidget::eventFilter(QObject*, QEvent *ev) { if( ev->type() == QEvent::ContextMenu ) { - if (ui.diveSiteListView->selectionModel()->selectedIndexes().count() >= 2) { - QContextMenuEvent *ctx = (QContextMenuEvent*) ev; - QMenu contextMenu; - contextMenu.addAction(tr("Merge dive Sites"), this, SLOT(mergeSelectedDiveSites())); - contextMenu.exec(ctx->globalPos()); - return true; - } + QContextMenuEvent *ctx = (QContextMenuEvent*) ev; + QMenu contextMenu; + contextMenu.addAction(tr("Merge into current site"), this, SLOT(mergeSelectedDiveSites())); + contextMenu.exec(ctx->globalPos()); + return true; } return false; } |