summaryrefslogtreecommitdiffstats
path: root/desktop-widgets/command_divelist.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-03-28 17:23:35 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 18:19:07 +0300
commit4a3ffeba05fb90a1c9c29d939599bf770db5f0ce (patch)
tree8991d8049f0e57f95852755b797f28150feaf07e /desktop-widgets/command_divelist.cpp
parent8287d86d2b83fb5a343f2638391b1393a73cde72 (diff)
downloadsubsurface-4a3ffeba05fb90a1c9c29d939599bf770db5f0ce.tar.gz
Undo: remove ADD mode from main tab
Instead of letting the user edit the fields before adding a dive, simply add an empty dive. Thus, the ADD mode of the main tab can be removed. Constructing a new dive with default-depth and making sure that the dive is displayed correctly is very subtle. This all needs to be detangled in due course. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/command_divelist.cpp')
-rw-r--r--desktop-widgets/command_divelist.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp
index e7bc31820..4e1359ea7 100644
--- a/desktop-widgets/command_divelist.cpp
+++ b/desktop-widgets/command_divelist.cpp
@@ -359,22 +359,14 @@ void DiveListBase::redo()
finishWork();
}
-AddDive::AddDive(dive *d, const QString &newDS, bool autogroup, bool newNumber)
+AddDive::AddDive(dive *d, bool autogroup, bool newNumber)
{
setText(tr("add dive"));
- // By convention, d is "displayed dive" and can be overwritten.
+ // By convention, d is a pointer to "displayed dive" or a temporary variable and can be overwritten.
d->maxdepth.mm = 0;
d->dc.maxdepth.mm = 0;
fixup_dive(d);
- // Create new dive site if requested.
- if (!newDS.isEmpty()) {
- struct dive_site *ds = alloc_dive_site();
- ds->name = copy_qstring(newDS);
- d->dive_site = ds;
- divesToAdd.sites.emplace_back(ds);
- }
-
// Get an owning pointer to a copied or moved dive
// Note: if move is true, this destroys the old dive!
OwningDivePtr divePtr(clone_dive(d));