From 2d40172d78436b8aef3eab238faabe2ce3f9830f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 24 Sep 2013 03:02:02 -0700 Subject: Much easier way to detect if more than one dive is selected Instead of getting data from Qt just use our internal notion of the number of selected dive to decide if more than one dive is selected (and therefore if we need to show the 'merge dives' option in the context menu). Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index a1436bf2d..ddd10e219 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -400,7 +400,7 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event) } if (d) popup.addAction(tr("delete dive"), this, SLOT(deleteDive())); - if (selectionModel()->selection().indexes().count() > 14) + if (amount_selected > 1) popup.addAction(tr("merge selected dives"), this, SLOT(mergeDives())); // "collapse all" really closes all trips, // "collapse" keeps the trip with the selected dive open -- cgit v1.2.3-70-g09d2