From 2bb2643ae4d4c1b6d0c32c9a18e2225eed0b5936 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 28 Dec 2018 14:14:31 +0100 Subject: [PATCH] Desktop: create new custom TextEdit widget for notes-field Currently, the notes field uses a QTextEdit, which doesn't send a signal if it goes out of focus. But for undo of dive-editing we don't want to create an undo object for *every* text change. Thus, create a custom TextEdit widget that derives from QTextEdit and turns the focusOutEvent into a editingFinished signal. Signed-off-by: Berthold Stoeger --- desktop-widgets/CMakeLists.txt | 2 ++ desktop-widgets/tab-widgets/maintab.ui | 7 ++++++- desktop-widgets/textedit.cpp | 7 +++++++ desktop-widgets/textedit.h | 20 ++++++++++++++++++++ 4 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 desktop-widgets/textedit.cpp create mode 100644 desktop-widgets/textedit.h diff --git a/desktop-widgets/CMakeLists.txt b/desktop-widgets/CMakeLists.txt index c494f1a8b..c451c46ef 100644 --- a/desktop-widgets/CMakeLists.txt +++ b/desktop-widgets/CMakeLists.txt @@ -126,6 +126,8 @@ set(SUBSURFACE_INTERFACE tableview.h tagwidget.cpp tagwidget.h + textedit.cpp + textedit.h updatemanager.cpp updatemanager.h usersurvey.cpp diff --git a/desktop-widgets/tab-widgets/maintab.ui b/desktop-widgets/tab-widgets/maintab.ui index 34ce65186..cc79634e6 100644 --- a/desktop-widgets/tab-widgets/maintab.ui +++ b/desktop-widgets/tab-widgets/maintab.ui @@ -454,7 +454,7 @@ 0 - + false @@ -601,6 +601,11 @@ QLineEdit
desktop-widgets/locationinformation.h
+ + TextEdit + QTextEdit +
desktop-widgets/textedit.h
+
diff --git a/desktop-widgets/textedit.cpp b/desktop-widgets/textedit.cpp new file mode 100644 index 000000000..0e5619e84 --- /dev/null +++ b/desktop-widgets/textedit.cpp @@ -0,0 +1,7 @@ +#include "textedit.h" + +void TextEdit::focusOutEvent(QFocusEvent *ev) +{ + QTextEdit::focusOutEvent(ev); + emit editingFinished(); +} diff --git a/desktop-widgets/textedit.h b/desktop-widgets/textedit.h new file mode 100644 index 000000000..1b90c0248 --- /dev/null +++ b/desktop-widgets/textedit.h @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef TEXTEDIT_H +#define TEXTEDIT_H + +#include + +// QTextEdit does not possess a signal that fires when the user finished +// editing the text. This subclass therefore overrides the focusOutEvent +// and sends the textEdited signal. +class TextEdit : public QTextEdit { + Q_OBJECT +public: + using QTextEdit::QTextEdit; // Make constructors of QTextEdit available +signals: + void editingFinished(); +private: + void focusOutEvent(QFocusEvent *ev) override; +}; + +#endif