mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-23 15:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Let the filterbox of the receiving side of the drag&drop to decide whether to add referenceable type. Only added if the table has "Referenceable ID" column AND the UniversalId type is referenceable.

Browse Source
This commit is contained in:
cc9cii 2014-09-08 23:14:04 +10:00
parent 4a8fe39b2c
commit 724ed807c8
4 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/opencs/model/world/tablemimedata.cpp
View File

@ -68,26 +68,6 @@ std::vector< CSMWorld::UniversalId > CSMWorld::TableMimeData::getData() const
return mUniversalId; return mUniversalId;
} }
std::vector< CSMWorld::UniversalId > CSMWorld::TableMimeData::getRefTypeData() const
{
std::vector<CSMWorld::UniversalId> ref_data;
std::vector<CSMWorld::UniversalId>::const_iterator it = mUniversalId.begin();
for(; it != mUniversalId.end(); ++it)
{
if(isReferencable(it->getType()))
{
// change the type
ref_data.push_back(CSMWorld::UniversalId(
CSMWorld::UniversalId::Type_Referenceable, it->getId()));
}
else
ref_data.push_back(*it);
}
return ref_data;
}
bool CSMWorld::TableMimeData::isReferencable(CSMWorld::ColumnBase::Display type) const bool CSMWorld::TableMimeData::isReferencable(CSMWorld::ColumnBase::Display type) const
{ {
return ( type == CSMWorld::ColumnBase::Display_Activator return ( type == CSMWorld::ColumnBase::Display_Activator
@ -111,7 +91,7 @@ return ( type == CSMWorld::ColumnBase::Display_Activator
|| type == CSMWorld::ColumnBase::Display_Static || type == CSMWorld::ColumnBase::Display_Static
|| type == CSMWorld::ColumnBase::Display_Weapon); || type == CSMWorld::ColumnBase::Display_Weapon);
} }
bool CSMWorld::TableMimeData::isReferencable(CSMWorld::UniversalId::Type type) const bool CSMWorld::TableMimeData::isReferencable(CSMWorld::UniversalId::Type type)
{ {
return ( type == CSMWorld::UniversalId::Type_Activator return ( type == CSMWorld::UniversalId::Type_Activator
|| type == CSMWorld::UniversalId::Type_Potion || type == CSMWorld::UniversalId::Type_Potion

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

@ -43,9 +43,6 @@ namespace CSMWorld
std::vector<UniversalId> getData() const; std::vector<UniversalId> getData() const;
// change Id type to Type_Referenceable where possible
std::vector<UniversalId> getRefTypeData() const;
bool holdsType(UniversalId::Type type) const; bool holdsType(UniversalId::Type type) const;
bool holdsType(CSMWorld::ColumnBase::Display type) const; bool holdsType(CSMWorld::ColumnBase::Display type) const;
@ -62,8 +59,8 @@ namespace CSMWorld
static CSMWorld::ColumnBase::Display convertEnums(CSMWorld::UniversalId::Type type); static CSMWorld::ColumnBase::Display convertEnums(CSMWorld::UniversalId::Type type);
static bool isReferencable(CSMWorld::UniversalId::Type type);
private: private:
bool isReferencable(CSMWorld::UniversalId::Type type) const;
bool isReferencable(CSMWorld::ColumnBase::Display type) const; bool isReferencable(CSMWorld::ColumnBase::Display type) const;
}; };

2
apps/opencs/view/filter/filterbox.cpp
View File

@ -39,7 +39,7 @@ void CSVFilter::FilterBox::dropEvent (QDropEvent* event)
if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped if (!mime) // May happen when non-records (e.g. plain text) are dragged and dropped
return; return;
std::vector<CSMWorld::UniversalId> data = mime->getRefTypeData(); std::vector<CSMWorld::UniversalId> data = mime->getData();
emit recordDropped(data, event->proposedAction()); emit recordDropped(data, event->proposedAction());
} }

17
apps/opencs/view/world/tablesubview.cpp
View File

@ -111,14 +111,21 @@ void CSVWorld::TableSubView::createFilterRequest (std::vector< CSMWorld::Univers
{ {
std::vector<std::pair<std::string, std::vector<std::string> > > filterSource; std::vector<std::pair<std::string, std::vector<std::string> > > filterSource;
std::vector<std::string> refIdColumns = mTable->getColumnsWithDisplay(CSMWorld::TableMimeData::convertEnums(CSMWorld::UniversalId::Type_Referenceable));
bool hasRefIdDisplay = !refIdColumns.empty();
for (std::vector<CSMWorld::UniversalId>::iterator it(types.begin()); it != types.end(); ++it) for (std::vector<CSMWorld::UniversalId>::iterator it(types.begin()); it != types.end(); ++it)
{ {
std::pair<std::string, std::vector<std::string> > pair( //splited long line CSMWorld::UniversalId::Type type = it->getType();
std::make_pair(it->getId(), mTable->getColumnsWithDisplay(CSMWorld::TableMimeData::convertEnums(it->getType())))); std::vector<std::string> col = mTable->getColumnsWithDisplay(CSMWorld::TableMimeData::convertEnums(type));
if(!col.empty())
if(!pair.second.empty())
{ {
filterSource.push_back(pair); filterSource.push_back(std::make_pair(it->getId(), col));
}
if(hasRefIdDisplay && CSMWorld::TableMimeData::isReferencable(type))
{
filterSource.push_back(std::make_pair(it->getId(), refIdColumns));
} }
} }