1 files changed, 61 insertions, 39 deletions
diff --git a/Swift/QtUI/QtTextEdit.h b/Swift/QtUI/QtTextEdit.h
index a8df4d3..178f258 100644
--- a/Swift/QtUI/QtTextEdit.h
+++ b/Swift/QtUI/QtTextEdit.h
@@ -1,50 +1,72 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <SwifTools/SpellParser.h>
+#include <boost/optional.hpp>
+
+#include <QPointer>
+#include <QTextEdit>
 
 #include <Swift/Controllers/Settings/SettingsProvider.h>
-#include <Swift/Controllers/SettingConstants.h>
 
-#include <QTextEdit>
-#include <QPointer>
+#include <SwifTools/SpellParser.h>
+
+#include <Swift/QtUI/QtSpellCheckHighlighter.h>
 
 namespace Swift {
-	class SpellChecker;
-	class QtSpellCheckerWindow;
-	class QtTextEdit : public QTextEdit {
-		Q_OBJECT
-	public:
-		QtTextEdit(SettingsProvider* settings, QWidget* parent = 0);
-		virtual ~QtTextEdit();
-		virtual QSize sizeHint() const;
-	signals:
-		void wordCorrected(QString& word);
-		void returnPressed();
-		void unhandledKeyPressEvent(QKeyEvent* event);
-	public slots:
-		void handleSettingChanged(const std::string& settings);
-	protected:
-		virtual void keyPressEvent(QKeyEvent* event);
-		virtual void contextMenuEvent(QContextMenuEvent* event);
-	private slots:
-		void handleTextChanged();
-	private:
-		SpellChecker *checker_;
-		std::vector<QAction*> replaceWordActions_;
-		PositionPairList misspelledPositions_;
-		SettingsProvider *settings_;
-		QPointer<QtSpellCheckerWindow> spellCheckerWindow_;
-		void addSuggestions(QMenu* menu, QContextMenuEvent* event);
-		void replaceMisspelledWord(const QString& word, int cursorPosition);
-		void setUpSpellChecker();
-		void underlineMisspells();
-		void spellCheckerSettingsWindow();
-		PositionPair getWordFromCursor(int cursorPosition);
-	};
+    class SpellChecker;
+    class QtSpellCheckerWindow;
+
+    class QtTextEdit : public QTextEdit {
+        Q_OBJECT
+    public:
+        QtTextEdit(SettingsProvider* settings, QWidget* parent = nullptr);
+        virtual ~QtTextEdit();
+        virtual QSize sizeHint() const;
+
+        void setEmphasiseFocus(bool emphasise);
+        void setCorrectionHighlight(bool coorectionHighlight);
+
+    signals:
+        void wordCorrected(QString& word);
+        void returnPressed();
+        void unhandledKeyPressEvent(QKeyEvent* event);
+        void receivedFocus();
+        void lostFocus();
+        void itemDropped(QDropEvent* event);
+
+    public slots:
+        void handleSettingChanged(const std::string& settings);
+
+    protected:
+        virtual void keyPressEvent(QKeyEvent* event);
+        virtual void focusInEvent(QFocusEvent* event);
+        virtual void focusOutEvent(QFocusEvent* event);
+        virtual void contextMenuEvent(QContextMenuEvent* event);
+        virtual void dropEvent(QDropEvent* event);
+
+    private slots:
+        void handleTextChanged();
+
+    private:
+        void addSuggestions(QMenu* menu, QContextMenuEvent* event);
+        void replaceMisspelledWord(const QString& word, size_t cursorPosition);
+        void setUpSpellChecker();
+        void spellCheckerSettingsWindow();
+        boost::optional<PositionPair> getWordFromCursor(size_t cursorPosition);
+        void updateStyleSheet();
+
+    private:
+        SpellChecker* checker_;
+        QtSpellCheckHighlighter* highlighter_;
+        std::vector<QAction*> replaceWordActions_;
+        SettingsProvider* settings_;
+        QPointer<QtSpellCheckerWindow> spellCheckerWindow_;
+        bool emphasiseFocus_ = false;
+        bool correctionHighlight_ = false;
+    };
 }