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

mobile/divelist: don't set currentIndex on undo of dive deletion

Browse source 
The core sets the current dive when undoing something.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-12-21 20:21:56 +01:00 • committed by Dirk Hohndel
parent d55ea8f875
commit dd8d8edc45
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mobile-widgets/qml/DiveDetails.qml
View file

@ -155,12 +155,11 @@ Kirigami.Page {
} }
onTriggered: { onTriggered: {
var deletedId = currentItem.modelData.id var deletedId = currentItem.modelData.id
var deletedIndex = diveDetailsListView.currentIndex
manager.deleteDive(deletedId) manager.deleteDive(deletedId)
pageStack.pop() pageStack.pop()
showPassiveNotification("Dive deleted", 5000, "Undo", showPassiveNotification("Dive deleted", 5000, "Undo",
function() { function() {
diveDetailsListView.currentIndex = manager.undoDelete(deletedId) ? deletedIndex : diveDetailsListView.currentIndex manager.undoDelete(deletedId)
}); });
} }
} }

3
mobile-widgets/qmlmanager.cpp
View file

@ -1398,11 +1398,10 @@ void QMLManager::saveChangesCloud(bool forceRemoteSync)
git_local_only = glo; git_local_only = glo;
} }
bool QMLManager::undoDelete(int) void QMLManager::undoDelete(int)
{ {
undoAction->activate(QAction::Trigger); undoAction->activate(QAction::Trigger);
changesNeedSaving(); changesNeedSaving();
return true;
} }
void QMLManager::selectDive(int id) void QMLManager::selectDive(int id)

2
mobile-widgets/qmlmanager.h
View file

@ -198,7 +198,7 @@ public slots:
bool toggleTags(bool toggle); bool toggleTags(bool toggle);
bool toggleCylinders(bool toggle); bool toggleCylinders(bool toggle);
bool toggleWeights(bool toggle); bool toggleWeights(bool toggle);
bool undoDelete(int id); void undoDelete(int id);
QString addDive(); QString addDive();
void addDiveAborted(int id); void addDiveAborted(int id);
void applyGpsData(); void applyGpsData();