From e2103287aa0a9114b8e6b401aa3a699577aeec47 Mon Sep 17 00:00:00 2001 From: Stanislav Bas Date: Mon, 29 Jun 2015 22:45:34 +0300 Subject: [PATCH 1/2] Not accepted drag event must be ignored --- apps/opencs/view/world/dragrecordtable.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/opencs/view/world/dragrecordtable.cpp b/apps/opencs/view/world/dragrecordtable.cpp index 5e8ddae26..a5f933283 100644 --- a/apps/opencs/view/world/dragrecordtable.cpp +++ b/apps/opencs/view/world/dragrecordtable.cpp @@ -55,12 +55,10 @@ void CSVWorld::DragRecordTable::dragMoveEvent(QDragMoveEvent *event) if (index.flags() & Qt::ItemIsEditable) { event->accept(); + return; } } - else - { - event->ignore(); - } + event->ignore(); } void CSVWorld::DragRecordTable::dropEvent(QDropEvent *event) From 1afa22f443e05656c4b36e85c2e1d3eac4ca94e1 Mon Sep 17 00:00:00 2001 From: Stanislav Bas Date: Tue, 30 Jun 2015 23:35:54 +0300 Subject: [PATCH 2/2] Add the RecordType column to the MetaData table --- apps/opencs/model/world/data.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp index e999b4650..a92a7ad79 100644 --- a/apps/opencs/model/world/data.cpp +++ b/apps/opencs/model/world/data.cpp @@ -479,6 +479,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc mMetaData.addColumn (new StringIdColumn (true)); mMetaData.addColumn (new RecordStateColumn); + mMetaData.addColumn (new FixedRecordTypeColumn (UniversalId::Type_MetaData)); mMetaData.addColumn (new FormatColumn); mMetaData.addColumn (new AuthorColumn); mMetaData.addColumn (new FileDescriptionColumn);