mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 09:36:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop

Browse Source 
Conflicts:
	apps/opencs/view/world/table.cpp
This commit is contained in:
Marek Kochanowicz 2014-02-12 12:12:53 +01:00
commit 8dfdd87a07
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/model/world/tablemimedata.hpp
View File

@ -6,7 +6,7 @@
#include <vector>
#include <qt4/QtCore/QMimeData>
#include <QtCore/QMimeData>
#include <QStringList>
#include "universalid.hpp"

37
apps/opencs/view/world/table.cpp
View File

@ -85,7 +85,7 @@ std::vector<std::string> CSVWorld::Table::listRevertableSelectedIds() const
QModelIndexList selectedRows = selectionModel()->selectedRows();
for (QModelIndexList::const_iterator iter (selectedRows.begin()); iter!=selectedRows.end();
++iter)
++iter)
{
QModelIndex index = mProxyModel->mapToSource (mProxyModel->index (iter->row(), 0));
@ -228,6 +228,8 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, Q
connect (selectionModel(), SIGNAL (selectionChanged (const QItemSelection&, const QItemSelection&)),
this, SLOT (selectionSizeUpdate ()));
setAcceptDrops(true);
}
void CSVWorld::Table::setEditLock (bool locked)
@ -384,10 +386,10 @@ void CSVWorld::Table::tableSizeUpdate()
switch (state)
{
case CSMWorld::RecordBase::State_BaseOnly: ++size; break;
case CSMWorld::RecordBase::State_Modified: ++size; ++modified; break;
case CSMWorld::RecordBase::State_ModifiedOnly: ++size; ++modified; break;
case CSMWorld::RecordBase:: State_Deleted: ++deleted; ++modified; break;
case CSMWorld::RecordBase::State_BaseOnly: ++size; break;
case CSMWorld::RecordBase::State_Modified: ++size; ++modified; break;
case CSMWorld::RecordBase::State_ModifiedOnly: ++size; ++modified; break;
case CSMWorld::RecordBase:: State_Deleted: ++deleted; ++modified; break;
}
}
}
@ -446,5 +448,28 @@ void CSVWorld::Table::mouseMoveEvent (QMouseEvent* event)
drag->setMimeData (mime);
drag->setPixmap (QString::fromStdString (mime->getIcon()));
drag->exec();
}
std::cout << "startdrag";
}
}
void CSVWorld::Table::dragEnterEvent(QDragEnterEvent *event)
{
//if (event->mimeData()->hasFormat("text/plain"))
std::cout << "accept drag event";
event->acceptProposedAction();
}
void CSVWorld::Table::dropEvent(QDropEvent *event)
{
std::cout << "drop";
event->acceptProposedAction();
QModelIndex index = indexAt(event->pos());
std::cout << index.row();
}
void CSVWorld::Table::dragMoveEvent(QDragMoveEvent *event)
{
event->accept();
}

9
apps/opencs/view/world/table.hpp
View File

@ -5,7 +5,7 @@
#include <string>
#include <QTableView>
#include <qt4/QtGui/qevent.h>
#include <QtGui/qevent.h>
#include "../../model/filter/node.hpp"
@ -52,6 +52,13 @@ namespace CSVWorld
void mouseMoveEvent(QMouseEvent *event);
void dragEnterEvent(QDragEnterEvent *event);
void dropEvent(QDropEvent *event);
void dragMoveEvent(QDragMoveEvent *event);
public:
Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, QUndoStack& undoStack, bool createAndDelete, bool sorting);