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

Only show Collapse all when its needed

Browse source 
This makes Collapse All only visible when its needed, and it
also fixes a crash when invocking collapse all when there was
nothing to collapse.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-05-10 17:19:34 -03:00 • committed by Dirk Hohndel
parent d6f45ec74d
commit 9523132b6d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-ui/divelistview.cpp
View file

@ -800,22 +800,29 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event)
// verify if there is a node that`s not expanded. // verify if there is a node that`s not expanded.
bool needs_expand = false; bool needs_expand = false;
bool needs_collapse = false; bool needs_collapse = false;
uint expanded_nodes = 0;
for(int i = 0, end = model()->rowCount(); i < end; i++) { for(int i = 0, end = model()->rowCount(); i < end; i++) {
QModelIndex idx = model()->index(i, 0); QModelIndex idx = model()->index(i, 0);
if (idx.data(DiveTripModel::DIVE_ROLE).value<void *>()) if (idx.data(DiveTripModel::DIVE_ROLE).value<void *>())
continue; continue;
if (!isExpanded(idx)) if (!isExpanded(idx)) {
needs_expand = true; needs_expand = true;
else } else {
needs_collapse = true; needs_collapse = true;
expanded_nodes ++;
}
} }
if (needs_expand) if (needs_expand)
popup.addAction(tr("Expand all"), this, SLOT(expandAll())); popup.addAction(tr("Expand all"), this, SLOT(expandAll()));
if (needs_collapse) if (needs_collapse)
popup.addAction(tr("Collapse all"), this, SLOT(collapseAll())); popup.addAction(tr("Collapse all"), this, SLOT(collapseAll()));
// verify if there`s a need for collapse others
if (expanded_nodes > 1)
collapseAction = popup.addAction(tr("Collapse others"), this, SLOT(collapseAll())); collapseAction = popup.addAction(tr("Collapse others"), this, SLOT(collapseAll()));
if (d) { if (d) {
popup.addAction(tr("Remove dive(s) from trip"), this, SLOT(removeFromTrip())); popup.addAction(tr("Remove dive(s) from trip"), this, SLOT(removeFromTrip()));
popup.addAction(tr("Create new trip above"), this, SLOT(newTripAbove())); popup.addAction(tr("Create new trip above"), this, SLOT(newTripAbove()));