mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-09 16:06:42 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'smbas/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-07-01 23:13:49 +02:00
commit dafb1b5fa9
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/world/data.cpp
View file

@ -479,6 +479,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mMetaData.addColumn (new StringIdColumn<MetaData> (true)); mMetaData.addColumn (new StringIdColumn<MetaData> (true));
mMetaData.addColumn (new RecordStateColumn<MetaData>); mMetaData.addColumn (new RecordStateColumn<MetaData>);
mMetaData.addColumn (new FixedRecordTypeColumn<MetaData> (UniversalId::Type_MetaData));
mMetaData.addColumn (new FormatColumn<MetaData>); mMetaData.addColumn (new FormatColumn<MetaData>);
mMetaData.addColumn (new AuthorColumn<MetaData>); mMetaData.addColumn (new AuthorColumn<MetaData>);
mMetaData.addColumn (new FileDescriptionColumn<MetaData>); mMetaData.addColumn (new FileDescriptionColumn<MetaData>);

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

@ -55,12 +55,10 @@ void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event)
if (index.flags() & Qt::ItemIsEditable) if (index.flags() & Qt::ItemIsEditable)
{ {
event->accept(); event->accept();
return;
} }
} }
else event->ignore();
{
event->ignore();
}
} }
void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event) void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event)