mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
8581e213ed
The trip selection code was an awkward layering violation. Whereas dive selections due to dive undo-commands trickled down via DiveTripModel-->MultiFilterSortModel-->DiveListView, for trip editing, the DiveListView directly intercepted the TripEdited signal. Instead, mimic the dive-selection code. This is a bit longer but more consistent and logical. The undo/redo of trip changes is now also a "programmatical" change of the selection. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
85 lines
1.6 KiB
C++
85 lines
1.6 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#include "command_edit_trip.h"
|
|
#include "core/qthelper.h"
|
|
#include "core/selection.h"
|
|
|
|
namespace Command {
|
|
|
|
EditTripBase::EditTripBase(dive_trip *tripIn, const QString &newValue) : trip(tripIn),
|
|
current(current_dive),
|
|
value(newValue)
|
|
{
|
|
}
|
|
|
|
// Note: Virtual functions cannot be called in the constructor.
|
|
// Therefore, setting of the title is done here.
|
|
bool EditTripBase::workToBeDone()
|
|
{
|
|
setText(Command::Base::tr("Edit %1").arg(fieldName()));
|
|
return data(trip) != value;
|
|
}
|
|
|
|
void EditTripBase::undo()
|
|
{
|
|
QString old = data(trip);
|
|
set(trip, value);
|
|
value = old;
|
|
|
|
emit diveListNotifier.tripChanged(trip, fieldId());
|
|
setTripSelection(trip, current);
|
|
}
|
|
|
|
// Undo and redo do the same as just the stored value is exchanged
|
|
void EditTripBase::redo()
|
|
{
|
|
undo();
|
|
}
|
|
|
|
// Implementation of virtual functions
|
|
|
|
// ***** Location *****
|
|
void EditTripLocation::set(dive_trip *t, const QString &s) const
|
|
{
|
|
free(t->location);
|
|
t->location = copy_qstring(s);
|
|
}
|
|
|
|
QString EditTripLocation::data(dive_trip *t) const
|
|
{
|
|
return QString(t->location);
|
|
}
|
|
|
|
QString EditTripLocation::fieldName() const
|
|
{
|
|
return Command::Base::tr("trip location");
|
|
}
|
|
|
|
TripField EditTripLocation::fieldId() const
|
|
{
|
|
return TripField::LOCATION;
|
|
}
|
|
|
|
// ***** Notes *****
|
|
void EditTripNotes::set(dive_trip *t, const QString &s) const
|
|
{
|
|
free(t->notes);
|
|
t->notes = copy_qstring(s);
|
|
}
|
|
|
|
QString EditTripNotes::data(dive_trip *t) const
|
|
{
|
|
return QString(t->notes);
|
|
}
|
|
|
|
QString EditTripNotes::fieldName() const
|
|
{
|
|
return Command::Base::tr("trip notes");
|
|
}
|
|
|
|
TripField EditTripNotes::fieldId() const
|
|
{
|
|
return TripField::NOTES;
|
|
}
|
|
|
|
} // namespace Command
|