From 2afe3f3e5735bb369826e2ad8542dc661f47ae24 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Thu, 13 Feb 2014 19:00:35 +0100
Subject: [PATCH] Introduced multitype icon.

---
 apps/opencs/model/world/tablemimedata.cpp |   2 --
 apps/opencs/view/world/genericcreator.cpp |   4 ++--
 apps/opencs/view/world/table.cpp          |  22 ++++++++++++----------
 files/opencs/multitype.png                | Bin 0 -> 1708 bytes
 files/opencs/resources.qrc                |   1 +
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 files/opencs/multitype.png

diff --git a/apps/opencs/model/world/tablemimedata.cpp b/apps/opencs/model/world/tablemimedata.cpp
index 07c9999b9..87bd67ce9 100644
--- a/apps/opencs/model/world/tablemimedata.cpp
+++ b/apps/opencs/model/world/tablemimedata.cpp
@@ -3,7 +3,6 @@
 
 #include "universalid.hpp"
 #include "columnbase.hpp"
-#include <iostream>
 
 CSMWorld::TableMimeData::TableMimeData (UniversalId id)
 {
@@ -79,7 +78,6 @@ bool CSMWorld::TableMimeData::holdsType (CSMWorld::UniversalId::Type type) const
 
 bool CSMWorld::TableMimeData::holdsType (CSMWorld::ColumnBase::Display type) const
 {
-    std::cout<<type<<std::endl;
     for (std::vector<UniversalId>::const_iterator it = mUniversalId.begin(); it != mUniversalId.end(); ++it)
     {
         if (it->getType() == convertEnums (type))
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index cd7a5fa18..31c216e2c 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -133,9 +133,9 @@ void CSVWorld::GenericCreator::create()
             std::string id = getId();
             std::auto_ptr<CSMWorld::CloneCommand> command (new CSMWorld::CloneCommand (
                 dynamic_cast<CSMWorld::IdTable&> (*mData.getTableModel(mListId)), mClonedId, id, mClonedType));
-            
+
             mUndoStack.push(command.release());
-            
+
             emit done();
             emit requestFocus(id);
         } else {
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index bfd58fb86..48b533992 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -6,6 +6,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QContextMenuEvent>
+#include <QString>
 
 #include "../../model/world/data.hpp"
 #include "../../model/world/commands.hpp"
@@ -477,27 +478,28 @@ void CSVWorld::Table::mouseMoveEvent (QMouseEvent* event)
 
 void CSVWorld::Table::dragEnterEvent(QDragEnterEvent *event)
 {
-//     QModelIndex index = indexAt (event->pos());
-
-//     if (dynamic_cast<const CSMWorld::TableMimeData*> (event->mimeData())->holdsType (mModel->getColumnDisplay (index.column())))
-//     {
         event->acceptProposedAction();
-//     }
 }
 
 void CSVWorld::Table::dropEvent(QDropEvent *event)
 {
     QModelIndex index = indexAt (event->pos());
 
-    CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>(mModel->headerData(index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+    CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>
+    (mModel->headerData(index.column(), Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+
     if (dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData())->holdsType(display))
     {
-        event->acceptProposedAction();
-        std::cout<<"Dropped/n";
-    } else {std::cout<<"Not Dropped\n";}
+        const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
+        CSMWorld::UniversalId record(mime->returnMatching(display));
+        mUndoStack.push (new CSMWorld::ModifyCommand ( *mModel,
+                                                       index,
+                                                       QVariant(record.getId().c_str())
+                                                     ));
+    }
 }
 
 void CSVWorld::Table::dragMoveEvent(QDragMoveEvent *event)
 {
-    event->accept();
+        event->accept();
 }
diff --git a/files/opencs/multitype.png b/files/opencs/multitype.png
new file mode 100644
index 0000000000000000000000000000000000000000..05676e2de06f52ed563842c0d8d5fe888e771a70
GIT binary patch
literal 1708
zcmV;d22=ToP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1010$OSaeirbZlh+LT`BaS~m3n000+sMObt}b#!QNasW(WaBm<(
zVQgV-VQyq{Woh4$8Y%z)1@TElK~z}7wU=FtRaX_qe{1i3&bfCkcV@T@!$)C?X$u&z
z&_J|G)EY@lOHE_ZS}YMCOd1m#KjMqNs1H7wkV+qTGS-OE)&~<48%<0b6TdQs6fr`J
zw$*_)d<@f}40rCw*=zZ5&b<sH!wfp^<mP<sz1M&J*MF_Gub3IjF^)Z1{pQuSz5In|
zTfexSb+Q})e)gF7+MR=WZPVWF>Ekc{Xm)1$i(h%(W|y+oEr<7?dfwtd#j#`W=aP>d
z{Klc7H5<=7{e<lNzX5pWF<JfeXTpJ_htflRD#1jR8khaP17F>+;hy*X@yKVZUq?i4
zwO3e@!G|P^!(or}?!k~`kEAO{$F}cz#3sg{3&0P1(d=|*h1f=?&#>o%AFaH$e$%&(
zCcpYbeo!8L>X@CoEdYlP$VMk_e_E;SmyycuyWV|&ckAwbwN+#9acONB=QAe%`g85g
zH&E@iod6;bn-{oqZ9N@%@ZheOe*Kfv-#ZvS|D|L3b4wE8w?86b)mZh-T_4^*G%~g$
zYpfX~Bq?T~8c|g$Bb#~Y@B^Is*HscP?7XYa=6&BGojHTWoS3(ZU(D&M<F~*0Wpifc
z?LA-qv7J~{14HY>1C7<|2DaS${;V-n#adHzn{ShMW>FI)Q~}3ey~f9%Ji_B&dzPWK
zTZmWA5(YOQJ|NB^;t?Qdi|sq#n|cZRmn6b8Ngv;K--l|2#|kb1pCO@A7*DDgAeu8f
z^-tQD|IXUGKfvTGFYw0rPl>*cq_qNsbBH(^!-K(v<iL^usOqDmcWe^F5TAk1AXJfb
z5I@i$sjbBfFr_p37p}f_oNH6BQy+a7Nmk+Y-+!O8XZ}npCIt)55hN0VzvJ)$*?3D4
z9(h7`)#{BT$?AwpAg$xlVO+X`YppJqCr&awF;0HzBrep*M(<;IxW<Zs?79Qna?YOq
z1LyxSPO@efs|ExoIa{`FmlH3KKMWjQI17CG$!$CDuNa=GsVhuQpJVF61lKOT!iso-
zM7mtl8j>{_7~09e%z5%qC6DP1+f;|v)6^AAy?KhWT4UYl2y54^&(gnT2X6_$JOAlM
zqY+M>_!B2zyF^81@e)xSleP&p2O_Mh3{a5_!=VIBk|G(47@`O&fp%EUwdr>_e(D?#
z@7+z_?e2c&A<3S4!P*Pd0b5n8X576Y<({$4xFkh<AwCIJTv9EcE8sJnPr(NSk0F?L
z&~A&-(Iz9ECYCpeohI6u!BqyS*Bd(7xwsNIe^UTX9HxqCj#&rVhEP^h5kL?TOk7cb
zrO<I9N-!drVH!arY7sO?V~1pD6EU_Ise}e59@RExifJsbidihLOMQRib1e+gZntgm
zQtaHEjTbU>`+!8k(t3f2FBiuD-Sav3;*upcBMI}oUzpb00mn@`^GyL18u-r*S=7+t
zfR-MD|0e#6fK%<<`a~om0t!CNqd(3Q<pNhN=iT%^qTLn%-H0s2fB=X~i(D>WSnrDo
zP6WmEW+KjEIE)goD41YkD2k~s!)Il&fMy3LB4TD1ZuB09h&Z1i&f_DP12I9=VNSs!
z4#Pw+bAY1iu7|DY;g~nX6y}ImPym_jTxUMa^FCmRgcK2nx&pB?K}$ZwT;Yi*Vg{y&
z7>Xh0vEp!69?}fM3h|lt1O85n(BpJIfPSKi^GIpb6uei=9EO#Ki_Iy|1<neO6)>me
zH!ISwq&|qlK(4k(04E{^fRcUzQbPpI5pg&dzzp$L9K}S6%?yfuXGn>mXT+h!6tf~6
zW_`su?=eHJG^vyc5a%-Bfr=Rp%jshhK?Iz+UZcPSyjmZSi2yoBt%{j|7;~`Uo$qNN
zEA8cBUP>nIs1`d-sv}!5F)YSDomea@RV+iHn3maMiii?b3bCnTQnW}ZQ#y89#2Ed=
zH0@pq2sidYy1#ohKjVM!-5uA7TfQL}uU_<Ty>XFlKfBGWrvVStfP3p1E6w$lx?ICV
zh*z6j0Zs!`K;HjjA|kE?k(A6VKLv%?InV_nVE+cordT0F3*6fP0000<MNUMnLSTZ9
CjTK}7

literal 0
HcmV?d00001

diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc
index eadcf9697..2b1e65ff0 100644
--- a/files/opencs/resources.qrc
+++ b/files/opencs/resources.qrc
@@ -56,6 +56,7 @@
 	<file>spell.png</file>
 	<file>static.png</file>
 	<file>weapon.png</file>
+	<file>multitype.png</file>
         <file alias="startup/create-addon">raster/startup/big/create-addon.png</file>
         <file alias="startup/create-game">raster/startup/big/new-game.png</file>
         <file alias="startup/edit-content">raster/startup/big/edit-content.png</file>