krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

able to drag existing cells from the regionmap

Browse source
This commit is contained in:
Marek Kochanowicz 2014-04-29 12:27:26 +02:00
parent 853abb65c3
commit 18fc8acc71
5 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/view/world/dragrecordtable.cpp
View file

@ -16,6 +16,7 @@ void CSVWorld::DragRecordTable::startDrag (const CSVWorld::DragRecordTable& tabl
} }
} }
CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document) : CSVWorld::DragRecordTable::DragRecordTable (CSMDoc::Document& document, QWidget* parent) :
mDocument(document) mDocument(document),
QTableView(parent)
{} {}

9
apps/opencs/view/world/dragrecordtable.hpp
View file

@ -1,8 +1,9 @@
#ifndef CSV_WORLD_REGIONMAP_H #ifndef CSV_WORLD_DRAGRECORDTABLE_H
#define CSV_WORLD_REGIONMAP_H #define CSV_WORLD_DRAGRECORDTABLE_H
#include <QTableView> #include <QTableView>
class QWidget;
class QAction; class QAction;
namespace CSMDoc namespace CSMDoc
@ -23,7 +24,7 @@ namespace CSVWorld
CSMDoc::Document& mDocument; CSMDoc::Document& mDocument;
public: public:
DragRecordTable(CSMDoc::Document& document); DragRecordTable(CSMDoc::Document& document, QWidget* parent = NULL);
virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const = 0; virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const = 0;
@ -33,4 +34,4 @@ namespace CSVWorld
} }
#endif #endif

17
apps/opencs/view/world/regionmap.cpp
View file

@ -181,7 +181,7 @@ void CSVWorld::RegionMap::setRegion (const std::string& regionId)
CSVWorld::RegionMap::RegionMap (const CSMWorld::UniversalId& universalId, CSVWorld::RegionMap::RegionMap (const CSMWorld::UniversalId& universalId,
CSMDoc::Document& document, QWidget *parent) CSMDoc::Document& document, QWidget *parent)
: QTableView (parent), mEditLock (false), mDocument (document) : mEditLock (false), DragRecordTable(document, parent)
{ {
verticalHeader()->hide(); verticalHeader()->hide();
horizontalHeader()->hide(); horizontalHeader()->hide();
@ -348,4 +348,19 @@ void CSVWorld::RegionMap::viewInTable()
void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event) void CSVWorld::RegionMap::mouseMoveEvent (QMouseEvent* event)
{ {
startDrag(*this);
}
std::vector< CSMWorld::UniversalId > CSVWorld::RegionMap::getDragedRecords() const
{
QModelIndexList selected = getSelectedCells();
std::vector<CSMWorld::UniversalId> ids;
foreach (QModelIndex it, selected)
{
ids.push_back(
CSMWorld::UniversalId
(CSMWorld::UniversalId::Type_Cell,
model()->data(it, CSMWorld::RegionMap::Role_CellId).toString().toUtf8().constData()));
}
return ids;
} }

11
apps/opencs/view/world/regionmap.hpp
View file

@ -1,8 +1,14 @@
#ifndef CSV_WORLD_REGIONMAP_H #ifndef CSV_WORLD_REGIONMAP_H
#define CSV_WORLD_REGIONMAP_H #define CSV_WORLD_REGIONMAP_H
#include <cstddef>
#include <vector>
#include <QObject>
#include <QTableView> #include <QTableView>
#include "./dragrecordtable.hpp"
class QAction; class QAction;
namespace CSMDoc namespace CSMDoc
@ -17,7 +23,7 @@ namespace CSMWorld
namespace CSVWorld namespace CSVWorld
{ {
class RegionMap : public QTableView class RegionMap : public DragRecordTable
{ {
Q_OBJECT Q_OBJECT
@ -30,7 +36,6 @@ namespace CSVWorld
QAction *mViewAction; QAction *mViewAction;
QAction *mViewInTableAction; QAction *mViewInTableAction;
bool mEditLock; bool mEditLock;
CSMDoc::Document& mDocument;
std::string mRegionId; std::string mRegionId;
private: private:
@ -59,6 +64,8 @@ namespace CSVWorld
void setEditLock (bool locked); void setEditLock (bool locked);
virtual std::vector<CSMWorld::UniversalId> getDragedRecords() const;
signals: signals:
void editRequest (const CSMWorld::UniversalId& id, const std::string& hint); void editRequest (const CSMWorld::UniversalId& id, const std::string& hint);

2
apps/opencs/view/world/table.hpp
View file

@ -4,7 +4,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <QTableView>
#include <QtGui/qevent.h> #include <QtGui/qevent.h>
#include "../../model/filter/node.hpp" #include "../../model/filter/node.hpp"
@ -25,7 +24,6 @@ namespace CSMWorld
class UniversalId; class UniversalId;
class IdTableProxyModel; class IdTableProxyModel;
class IdTable; class IdTable;
class TableMimeData;
} }
namespace CSVWorld namespace CSVWorld