mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

fixed inconsistent handling of deleted records in dialogue; general cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2015-06-27 15:02:50 +02:00
parent a8c26ec0c1
commit 9aa153984a
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/opencs/view/world/dialoguesubview.cpp
View file

@ -764,12 +764,21 @@ void CSVWorld::DialogueSubView::viewRecord ()
void CSVWorld::DialogueSubView::switchToRow (int row) void CSVWorld::DialogueSubView::switchToRow (int row)
{ {
int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
std::string id = getTable().data (getTable().index (row, idColumn)).toString().toUtf8().constData();
int typeColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> (
getTable().data (getTable().index (row, typeColumn)).toInt());
setUniversalId (CSMWorld::UniversalId (type, id));
changeCurrentId (id);
getEditWidget().remake (row); getEditWidget().remake (row);
setUniversalId (CSMWorld::UniversalId (static_cast<CSMWorld::UniversalId::Type> (getTable().data (getTable().index (row, 2)).toInt()), int stateColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
getTable().data (getTable().index (row, 0)).toString().toUtf8().constData())); CSMWorld::RecordBase::State state = static_cast<CSMWorld::RecordBase::State> (
getTable().data (getTable().index (row, stateColumn)).toInt());
changeCurrentId(std::string (getTable().data (getTable().index (row, 0)).toString().toUtf8().constData())); getEditWidget().setDisabled (isLocked() || state==CSMWorld::RecordBase::State_Deleted);
getEditWidget().setDisabled (isLocked());
} }

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

@ -121,17 +121,14 @@ void CSVWorld::RecordButtonBar::cloneRequest()
{ {
if (mBottom) if (mBottom)
{ {
int typeColumn = mTable.searchColumnIndex (CSMWorld::Columns::ColumnId_RecordType); int typeColumn = mTable.findColumnIndex (CSMWorld::Columns::ColumnId_RecordType);
if (typeColumn!=-1)
{
QModelIndex typeIndex = mTable.getModelIndex (mId.getId(), typeColumn); QModelIndex typeIndex = mTable.getModelIndex (mId.getId(), typeColumn);
CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> ( CSMWorld::UniversalId::Type type = static_cast<CSMWorld::UniversalId::Type> (
mTable.data (typeIndex).toInt()); mTable.data (typeIndex).toInt());
mBottom->cloneRequest (mId.getId(), type); mBottom->cloneRequest (mId.getId(), type);
} }
}
} }
void CSVWorld::RecordButtonBar::nextId() void CSVWorld::RecordButtonBar::nextId()