mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 18:33:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add ability to undo removing of dives from trips

Browse source 
Add the functionality to undo/redo removing of dives from trips. The
code calling remove_dive_from_trip has moved to the UndoCommands class.

Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Grace Karanja 2015-04-10 09:39:51 +03:00 • committed by Dirk Hohndel
parent 8e32faa866
commit 193edd9f13
3 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/divelistview.cpp
View file

@ -622,10 +622,14 @@ void DiveListView::removeFromTrip()
//TODO: move this to C-code.
int i;
struct dive *d;
QMap<struct dive*, dive_trip*> divesToRemove;
for_each_dive (i, d) {
if (d->selected)
remove_dive_from_trip(d, false);
divesToRemove.insert(d, d->divetrip);
}
UndoRemoveDivesFromTrip *undoCommand = new UndoRemoveDivesFromTrip(divesToRemove);
MainWindow::instance()->undoStack->push(undoCommand);
rememberSelection();
reload(currentLayout, false);
fixMessyQtModelBehaviour();

29
qt-ui/undocommands.cpp
View file

@ -92,3 +92,32 @@ void UndoRenumberDives::redo()
mark_divelist_changed(true);
MainWindow::instance()->refreshDisplay();
}
UndoRemoveDivesFromTrip::UndoRemoveDivesFromTrip(QMap<dive *, dive_trip *> removedDives)
{
divesToUndo = removedDives;
setText("remove dive(s) from trip");
}
void UndoRemoveDivesFromTrip::undo()
{
QMapIterator<dive*, dive_trip*> i(divesToUndo);
while (i.hasNext()) {
i.next();
add_dive_to_trip(i.key (), i.value());
}
mark_divelist_changed(true);
MainWindow::instance()->refreshDisplay();
}
void UndoRemoveDivesFromTrip::redo()
{
QMapIterator<dive*, dive_trip*> i(divesToUndo);
while (i.hasNext()) {
i.next();
remove_dive_from_trip(i.key(), false);
}
mark_divelist_changed(true);
MainWindow::instance()->refreshDisplay();
}

10
qt-ui/undocommands.h
View file

@ -37,4 +37,14 @@ private:
int start;
};
class UndoRemoveDivesFromTrip : public QUndoCommand {
public:
UndoRemoveDivesFromTrip(QMap<struct dive*, dive_trip*> removedDives);
virtual void undo();
virtual void redo();
private:
QMap<struct dive*, dive_trip*> divesToUndo;
};
#endif // UNDOCOMMANDS_H