diff options
Diffstat (limited to 'qt-ui/divelistview.cpp')
| -rw-r--r-- | qt-ui/divelistview.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index 2e40678ad..639e988fd 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -7,6 +7,7 @@ #include "divelistview.h" #include "models.h" #include "modeldelegates.h" +#include "mainwindow.h" #include "../display.h" #include <QApplication> #include <QHeaderView> @@ -72,7 +73,7 @@ void DiveListView::selectDive(struct dive *dive, bool scrollto, bool toggle) expand(parent); flags = toggle ? QItemSelectionModel::Toggle : QItemSelectionModel::Select; flags |= QItemSelectionModel::Rows; - selectionModel()->select( idx, flags); + selectionModel()->select(idx, flags); if (scrollto) scrollTo(idx, PositionAtCenter); } @@ -330,9 +331,19 @@ void DiveListView::removeFromTrip() void DiveListView::deleteDive() { + int nr; struct dive *d = (struct dive *) contextMenuIndex.data(DiveTripModel::DIVE_ROLE).value<void*>(); - if (d) + if (d) { + nr = get_divenr(d); delete_single_dive(get_index_for_dive(d)); + if (amount_selected == 0) { + if (nr > 0) + select_dive(nr - 1); + else + mainWindow()->cleanUpEmpty(); + } + } + mainWindow()->refreshDisplay(); reload(currentLayout, false); } |