From 582253fe88a6e50c416ba7e037f99f1508e48a56 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 6 Jun 2013 06:39:54 +0900 Subject: Distinguish between "collapse" and "collapse all" Some users might want to really see nothing but trips, others might want to be able to keep the trip with the selected dive open. Suggested-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'qt-ui/divelistview.cpp') diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index d66313823..9e3ceb52e 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -282,7 +282,10 @@ void DiveListView::mousePressEvent(QMouseEvent *event) } QMenu popup(this); popup.addAction(tr("expand all"), this, SLOT(expandAll())); - QAction *collapseAllAction = popup.addAction(tr("collapse all"), this, SLOT(collapseAll())); - if (popup.exec(event->globalPos()) == collapseAllAction) + popup.addAction(tr("collapse all"), this, SLOT(collapseAll())); + QAction *collapseAction = popup.addAction(tr("collapse"), this, SLOT(collapseAll())); + // "collapse all" really closes all trips, + // "collaps" keeps the trip with the selected dive open + if (popup.exec(event->globalPos()) == collapseAction) selectDive(current_dive, true); } -- cgit v1.2.3-70-g09d2