mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add some helper functions

Browse source 
First step towards getting the "add to trip" logic in the divelist context
menu to be consistent and correct.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-24 08:27:42 -07:00
parent 2a88a72f1a
commit ba1c4fcec1
3 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
qt-ui/divelistview.cpp
View file

@ -634,18 +634,10 @@ void DiveListView::addToTrip(bool below)
if (d->selected) { // we are right-clicking on one of possibly many selected dive(s)
// find the top selected dive, depending on the list order
if (delta == 1) {
for_each_dive (idx, d) {
if (d->selected)
pd = d;
}
d = pd; // this way we have the chronologically last
} else {
for_each_dive (idx, d) {
if (d->selected)
break; // now that's the chronologically first
}
}
if (delta == 1)
d = last_selected_dive();
else
d = first_selected_dive();
}
// now find the trip "above" in the dive list
if ((pd = get_dive(get_divenr(d) + delta)) != NULL) {
@ -757,8 +749,12 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event)
if (d) {
popup.addAction(tr("remove dive(s) from trip"), this, SLOT(removeFromTrip()));
popup.addAction(tr("create new trip above"), this, SLOT(newTripAbove()));
popup.addAction(tr("add dive(s) to trip immediately above"), this, SLOT(addToTripAbove()));
popup.addAction(tr("add dive(s) to trip immediately below"), this, SLOT(addToTripBelow()));
if (!d->divetrip) {
if (is_trip_before_after(d, (currentOrder == Qt::AscendingOrder)))
popup.addAction(tr("add dive(s) to trip immediately above"), this, SLOT(addToTripAbove()));
if (is_trip_before_after(d, (currentOrder == Qt::DescendingOrder)))
popup.addAction(tr("add dive(s) to trip immediately below"), this, SLOT(addToTripBelow()));
}
}
if (trip) {
popup.addAction(tr("merge trip with trip above"), this, SLOT(mergeTripAbove()));