diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-06-30 23:08:02 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-04 10:41:09 +0900 |
| commit | 02e94de062dc2c776ee37e8f642f0ec0ae8ad9e7 (patch) | |
| tree | a52aa1336790a6124db9fba35664385ecc8f46f2 /desktop-widgets/locationinformation.cpp | |
| parent | f451f7d9a5155be6ea1225a7414e5665656f8b42 (diff) | |
| download | subsurface-02e94de062dc2c776ee37e8f642f0ec0ae8ad9e7.tar.gz | |
Desktop: enable clearing of dive site
Clearing dive site did not work for two reasons:
1) We didn't get a signal when editing was finished.
2) When clearing the dive site, the "add new dive site" site was set.
Thus, connect to the editingFinished signal and in
DiveLocationLineEdit::currDiveSite() return a null pointer if
the string is empty.
This means that it is not possible to have a dive site with an
empty string, but that shouldn't be a problem, right?
Fixes #2148
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/locationinformation.cpp')
| -rw-r--r-- | desktop-widgets/locationinformation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index 03ebbc9b4..1c8c79aef 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -432,9 +432,8 @@ bool DiveLocationLineEdit::eventFilter(QObject *, QEvent *e) void DiveLocationLineEdit::focusOutEvent(QFocusEvent *ev) { - if (!view->isVisible()) { + if (!view->isVisible()) QLineEdit::focusOutEvent(ev); - } } void DiveLocationLineEdit::itemActivated(const QModelIndex &index) @@ -601,7 +600,8 @@ DiveLocationLineEdit::DiveSiteType DiveLocationLineEdit::currDiveSiteType() cons struct dive_site *DiveLocationLineEdit::currDiveSite() const { - return currDs; + // If there is no text, this corresponds to the empty dive site + return text().trimmed().isEmpty() ? nullptr : currDs; } DiveLocationListView::DiveLocationListView(QWidget*) |