accept drops from filters table. Cool. ☺

apps/opencs/view/filter/editwidget.cpp

@@ -154,7 +154,7 @@ void CSVFilter::EditWidget::createFilterRequest (std::vector< std::pair< std::st
     if (ss.str().length() >4)
     {
         clear();
-        insert (QString::fromStdString (ss.str().c_str()));
+        insert (QString::fromUtf8(ss.str().c_str()));
     }
 }
 
@@ -194,3 +194,10 @@ std::string CSVFilter::EditWidget::generateFilter (std::pair< std::string, std::
 
     return ss.str();
 }
+
+void CSVFilter::EditWidget::useFilterRequest (const std::string& idOfFilter)
+{
+    clear();
+    insert(QString::fromUtf8(idOfFilter.c_str()));
+}
+

apps/opencs/view/filter/editwidget.hpp

@@ -49,6 +49,8 @@ namespace CSVFilter
 
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
                                      Qt::DropAction action);
+
+            void useFilterRequest(const std::string& idOfFilter);
     };
 }
 

apps/opencs/view/filter/filterbox.cpp

@@ -28,6 +28,7 @@ CSVFilter::FilterBox::FilterBox (CSMWorld::Data& data, QWidget *parent)
     connect(this, SIGNAL(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)),
             recordFilterBox, SIGNAL(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)));
 
+    connect(this, SIGNAL(useFilterRequest(const std::string&)), recordFilterBox, SIGNAL(useFilterRequest(const std::string&)));
     setAcceptDrops(true);
 }
 

apps/opencs/view/filter/filterbox.hpp

@@ -36,6 +36,7 @@ namespace CSVFilter
             void recordDropped (std::vector<CSMWorld::UniversalId>& types, Qt::DropAction action);
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource, 
                                      Qt::DropAction action);
+            void useFilterRequest(const std::string& idOfFilter);
     };
 
 }

apps/opencs/view/filter/recordfilterbox.cpp

@@ -27,4 +27,6 @@ CSVFilter::RecordFilterBox::RecordFilterBox (CSMWorld::Data& data, QWidget *pare
 
     connect(this, SIGNAL(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)),
             editWidget, SLOT(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)));
+
+    connect(this, SIGNAL(useFilterRequest(const std::string&)), editWidget, SLOT(useFilterRequest(const std::string&)));
 }

apps/opencs/view/filter/recordfilterbox.hpp

@@ -30,6 +30,7 @@ namespace CSVFilter
             void filterChanged (boost::shared_ptr<CSMFilter::Node> filter);
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
                                      Qt::DropAction action);
+            void useFilterRequest(const std::string& idOfFilter);
     };
 
 }

apps/opencs/view/world/table.hpp

@@ -64,10 +64,9 @@ namespace CSVWorld
 
             void dragEnterEvent(QDragEnterEvent *event);
 
-            void dropEvent(QDropEvent *event);
-
             void dragMoveEvent(QDragMoveEvent *event);
 
+            void dropEvent(QDropEvent *event);
 
         public:
 

apps/opencs/view/world/tablesubview.cpp

@@ -2,6 +2,7 @@
 #include "tablesubview.hpp"
 
 #include <QVBoxLayout>
+#include <QEvent>
 
 #include "../../model/doc/document.hpp"
 #include "../../model/world/tablemimedata.hpp"
@@ -44,7 +45,7 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
 
     mTable->tableSizeUpdate();
     mTable->selectionSizeUpdate();
-    mTable->installEventFilter(this);
+    mTable->viewport()->installEventFilter(this);
     mBottom->installEventFilter(this);
     filterBox->installEventFilter(this);
 
@@ -68,6 +69,8 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
     connect(filterBox, SIGNAL(recordDropped(std::vector<CSMWorld::UniversalId>&, Qt::DropAction)),
         this, SLOT(createFilterRequest(std::vector<CSMWorld::UniversalId>&, Qt::DropAction)));
 
+    connect(this, SIGNAL(useFilterRequest(const std::string&)), filterBox, SIGNAL(useFilterRequest(const std::string&)));
+
     connect(this, SIGNAL(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)),
             filterBox, SIGNAL(createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >&, Qt::DropAction)));
 }
@@ -114,9 +117,16 @@ void CSVWorld::TableSubView::createFilterRequest (std::vector< CSMWorld::Univers
 
 bool CSVWorld::TableSubView::eventFilter (QObject* object, QEvent* event)
 {
+    if (event->type() == QEvent::Drop)
+    {
+        QDropEvent* drop = dynamic_cast<QDropEvent*>(event);
+        const CSMWorld::TableMimeData* data = dynamic_cast<const CSMWorld::TableMimeData*>(drop->mimeData());
+        bool handled = data->holdsType(CSMWorld::UniversalId::Type_Filter);
+        if (handled)
+        {
+            emit useFilterRequest(data->returnMatching(CSMWorld::UniversalId::Type_Filter).getId());
+        }
+        return handled;
+    }
     return false;
 }
-
-void CSVWorld::TableSubView::dropEvent (QDropEvent* event)
-{
-}

apps/opencs/view/world/tablesubview.hpp

@@ -41,14 +41,15 @@ namespace CSVWorld
 
             virtual void setStatusBar (bool show);
 
+        protected:
             bool eventFilter(QObject* object, QEvent *event);
-            void dropEvent(QDropEvent *event);
 
         signals:
             void cloneRequest(const std::string&,
                               const CSMWorld::UniversalId::Type);
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
                                      Qt::DropAction action);
+            void useFilterRequest(const std::string& idOfFilter);
 
         private slots: