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 option to undo deleted dives

Browse source 
Add ability to undo deleted dives by storing a list of the
deleted dives in a QUndoCommand.

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-02-11 10:57:56 +03:00 • committed by Dirk Hohndel
parent 6d996a7874
commit 60a7404ed4
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/divelistview.cpp
View file

@ -14,6 +14,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QFileDialog> #include <QFileDialog>
#include "qthelper.h" #include "qthelper.h"
#include "undocommands.h"
// # Date Rtg Dpth Dur Tmp Wght Suit Cyl Gas SAC OTU CNS Loc // # Date Rtg Dpth Dur Tmp Wght Suit Cyl Gas SAC OTU CNS Loc
static int defaultWidth[] = { 70, 140, 90, 50, 50, 50, 50, 70, 50, 50, 70, 50, 50, 500}; static int defaultWidth[] = { 70, 140, 90, 50, 50, 50, 50, 70, 50, 50, 70, 50, 50, 500};
@ -731,13 +732,19 @@ void DiveListView::deleteDive()
// so instead of using the for_each_dive macro I'm using an explicit for loop // so instead of using the for_each_dive macro I'm using an explicit for loop
// to make this easier to understand // to make this easier to understand
int lastDiveNr = -1; int lastDiveNr = -1;
QList<struct dive*> deletedDives; //a list of all deleted dives to be stored in the undo command
for_each_dive (i, d) { for_each_dive (i, d) {
if (!d->selected) if (!d->selected)
continue; continue;
struct dive* undo_entry = alloc_dive();
copy_dive(get_dive(i), undo_entry);
deletedDives.append(undo_entry);
delete_single_dive(i); delete_single_dive(i);
i--; // so the next dive isn't skipped... it's now #i i--; // so the next dive isn't skipped... it's now #i
lastDiveNr = i; lastDiveNr = i;
} }
UndoDeleteDive *undoEntry = new UndoDeleteDive(deletedDives);
MainWindow::instance()->undoStack->push(undoEntry);
if (amount_selected == 0) { if (amount_selected == 0) {
MainWindow::instance()->cleanUpEmpty(); MainWindow::instance()->cleanUpEmpty();
} }

26
qt-ui/undocommands.cpp
View file

@ -1,16 +1,36 @@
#include "undocommands.h" #include "undocommands.h"
#include "mainwindow.h"
#include "divelist.h"
UndoDeleteDive::UndoDeleteDive(QList<dive *> diveList) UndoDeleteDive::UndoDeleteDive(QList<dive *> diveList)
{ {
dives = diveList;
setText("delete dive");
if (dives.count() > 1)
setText(QString("delete %1 dives").arg(QString::number(dives.count())));
} }
void UndoDeleteDive::undo() void UndoDeleteDive::undo()
{ {
for (int i = 0; i < dives.count(); i++)
record_dive(dives.at(i));
mark_divelist_changed(true);
MainWindow::instance()->refreshDisplay();
} }
void UndoDeleteDive::redo() void UndoDeleteDive::redo()
{ {
QList<struct dive*> newList;
for (int i = 0; i < dives.count(); i++) {
//make a copy of the dive before deleting it
struct dive* d = alloc_dive();
copy_dive(dives.at(i), d);
newList.append(d);
//delete the dive
delete_single_dive(get_divenr(dives.at(i)));
}
mark_divelist_changed(true);
MainWindow::instance()->refreshDisplay();
dives.clear();
dives = newList;
} }