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

Undo: select dives on undo of editing commands

Browse source 
Save selected dives when generating an edit-command. Restore the
selection and current dive in undo()/redo().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-02-18 21:30:11 +01:00 • committed by Dirk Hohndel
parent ebfa366826
commit 464721b2ec
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
desktop-widgets/command_edit.cpp
View file

@ -8,7 +8,7 @@
namespace Command { namespace Command {
static std::vector<dive *> getSelectedDives(bool currentDiveOnly) static std::vector<dive *> getDives(bool currentDiveOnly)
{ {
if (currentDiveOnly) if (currentDiveOnly)
return current_dive ? std::vector<dive *> { current_dive } return current_dive ? std::vector<dive *> { current_dive }
@ -27,7 +27,8 @@ static std::vector<dive *> getSelectedDives(bool currentDiveOnly)
template<typename T> template<typename T>
EditBase<T>::EditBase(T newValue, bool currentDiveOnly) : EditBase<T>::EditBase(T newValue, bool currentDiveOnly) :
value(std::move(newValue)), value(std::move(newValue)),
dives(getSelectedDives(currentDiveOnly)), dives(getDives(currentDiveOnly)),
selectedDives(getDiveSelection()),
current(current_dive) current(current_dive)
{ {
} }
@ -88,6 +89,9 @@ void EditBase<T>::undo()
emit diveListNotifier.divesChanged(trip, divesInTrip, id); emit diveListNotifier.divesChanged(trip, divesInTrip, id);
}); });
if (setSelection(selectedDives, current))
emit diveListNotifier.selectionChanged(); // If the selection changed -> tell the frontend
mark_divelist_changed(true); mark_divelist_changed(true);
} }
@ -404,7 +408,8 @@ DiveField EditMode::fieldId() const
// ***** Tag based commands ***** // ***** Tag based commands *****
EditTagsBase::EditTagsBase(const QStringList &newListIn, bool currentDiveOnly) : EditTagsBase::EditTagsBase(const QStringList &newListIn, bool currentDiveOnly) :
dives(getSelectedDives(currentDiveOnly)), dives(getDives(currentDiveOnly)),
selectedDives(getDiveSelection()),
current(current_dive), current(current_dive),
newList(newListIn) newList(newListIn)
{ {
@ -498,6 +503,9 @@ void EditTagsBase::undo()
emit diveListNotifier.divesChanged(trip, divesInTrip, id); emit diveListNotifier.divesChanged(trip, divesInTrip, id);
}); });
if (setSelection(selectedDives, current))
emit diveListNotifier.selectionChanged(); // If the selection changed -> tell the frontend
mark_divelist_changed(true); mark_divelist_changed(true);
} }

6
desktop-widgets/command_edit.h
View file

@ -34,7 +34,9 @@ protected:
bool workToBeDone() override; bool workToBeDone() override;
std::vector<dive *> dives; // Dives to be edited. std::vector<dive *> dives; // Dives to be edited.
struct dive *current; // On undo, we set the current dive at the time of the operation. // On undo, we set the selection and current dive at the time of the operation.
std::vector<dive *> selectedDives;
struct dive *current;
public: public:
EditBase(T newValue, bool currentDiveOnly); EditBase(T newValue, bool currentDiveOnly);
@ -162,6 +164,8 @@ class EditTagsBase : public Base {
// the active dive when the user initialized the action. This dive // the active dive when the user initialized the action. This dive
// will be made the current dive on redo / undo. // will be made the current dive on redo / undo.
std::vector<dive *> dives; std::vector<dive *> dives;
// On undo, we set the selection and current dive at the time of the operation.
std::vector<dive *> selectedDives;
struct dive *current; struct dive *current;
QStringList newList; // Temporary until initialized QStringList newList; // Temporary until initialized
public: public: