1 files changed, 10 insertions, 0 deletions
diff --git a/Swift/QtUI/QtTextEdit.cpp b/Swift/QtUI/QtTextEdit.cpp
index 1b4d76d..168e6fc 100644
--- a/Swift/QtUI/QtTextEdit.cpp
+++ b/Swift/QtUI/QtTextEdit.cpp
@@ -1,47 +1,48 @@
 /*
  * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtTextEdit.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <QApplication>
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QMenu>
 #include <QTextDocument>
+#include <QMimeData>
 
 #include <Swiften/Base/Log.h>
 
 #include <SwifTools/SpellChecker.h>
 #include <SwifTools/SpellCheckerFactory.h>
 
 #include <Swift/QtUI/QtSpellCheckerWindow.h>
 #include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtUISettingConstants.h>
 #include <Swift/QtUI/QtUtilities.h>
 
 namespace Swift {
 
 QtTextEdit::QtTextEdit(SettingsProvider* settings, QWidget* parent) : QTextEdit(parent), checker_(nullptr), highlighter_(nullptr) {
     connect(this, SIGNAL(textChanged()), this, SLOT(handleTextChanged()));
     settings_ = settings;
 #ifdef HAVE_SPELLCHECKER
     setUpSpellChecker();
 #endif
     handleTextChanged();
     QTextOption textOption = document()->defaultTextOption();
     textOption.setWrapMode(QTextOption::WordWrap);
     document()->setDefaultTextOption(textOption);
 }
 
 QtTextEdit::~QtTextEdit() {
     delete checker_;
 }
 
 void QtTextEdit::keyPressEvent(QKeyEvent* event) {
@@ -152,60 +153,69 @@ PositionPair QtTextEdit::getWordFromCursor(int cursorPosition) {
 QSize QtTextEdit::sizeHint() const {
     QSize hint = document()->size().toSize();
     QMargins margins = contentsMargins();
     return hint + QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
 }
 
 void QtTextEdit::contextMenuEvent(QContextMenuEvent* event) {
     QMenu* menu = createStandardContextMenu();
     QTextCursor cursor = cursorForPosition(event->pos());
 #ifdef HAVE_SPELLCHECKER
     QAction* insertPoint = menu->actions().first();
     QAction* settingsAction = new QAction(tr("Spell Checker Options"), menu);
     menu->insertAction(insertPoint, settingsAction);
     menu->insertAction(insertPoint, menu->addSeparator());
     addSuggestions(menu, event);
     QAction* result = menu->exec(event->globalPos());
     if (result == settingsAction) {
         spellCheckerSettingsWindow();
     }
     for (auto& replaceWordAction : replaceWordActions_) {
         if (replaceWordAction == result) {
             replaceMisspelledWord(replaceWordAction->text(), cursor.position());
         }
     }
 #else
     menu->exec(event->globalPos());
 #endif
     delete menu;
 }
 
+void QtTextEdit::dropEvent(QDropEvent* event) {
+    if (event->mimeData()->hasUrls()) {
+        itemDropped(event);
+    }
+    else {
+        QTextEdit::dropEvent(event);
+    }
+}
+
 void QtTextEdit::addSuggestions(QMenu* menu, QContextMenuEvent* event)
 {
     replaceWordActions_.clear();
     if (checker_ && highlighter_) {
         QAction* insertPoint = menu->actions().first();
         QTextCursor cursor = cursorForPosition(event->pos());
         PositionPair wordPosition = getWordFromCursor(cursor.position());
         if (boost::get<0>(wordPosition) < 0) {
             // The click was executed outside a spellable word so no
             // suggestions are necessary
             return;
         }
         cursor.setPosition(boost::get<0>(wordPosition), QTextCursor::MoveAnchor);
         cursor.setPosition(boost::get<1>(wordPosition), QTextCursor::KeepAnchor);
         std::vector<std::string> wordList;
         checker_->getSuggestions(Q2PSTRING(cursor.selectedText()), wordList);
         if (wordList.size() == 0) {
             QAction* noSuggestions = new QAction(tr("No Suggestions"), menu);
             noSuggestions->setDisabled(true);
             menu->insertAction(insertPoint, noSuggestions);
         }
         else {
             for (auto& word : wordList) {
                 QAction* wordAction = new QAction(word.c_str(), menu);
                 menu->insertAction(insertPoint, wordAction);
                 replaceWordActions_.push_back(wordAction);
             }
         }
         menu->insertAction(insertPoint, menu->addSeparator());
     }