mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

post merge fixes

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-07-06 18:34:14 +02:00
parent 4986b7d65d
commit de5898c953
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,10 @@ namespace CSMWorld
template<typename ESXRecordT> template<typename ESXRecordT>
struct StringIdColumn : public Column<ESXRecordT> struct StringIdColumn : public Column<ESXRecordT>
{ {
StringIdColumn() : Column<ESXRecordT> ("ID", ColumnBase::Display_String) {} StringIdColumn (bool hidden = false)
: Column<ESXRecordT> ("ID", ColumnBase::Display_String,
hidden ? 0 : ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
{}
virtual QVariant get (const Record<ESXRecordT>& record) const virtual QVariant get (const Record<ESXRecordT>& record) const
{ {

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

@ -128,6 +128,7 @@ CSMWorld::Data::Data() : mRefs (mCells)
mCells.addColumn (new FlagColumn<Cell> ("Interior Sky", ESM::Cell::QuasiEx)); mCells.addColumn (new FlagColumn<Cell> ("Interior Sky", ESM::Cell::QuasiEx));
mCells.addColumn (new RegionColumn<Cell>); mCells.addColumn (new RegionColumn<Cell>);
mRefs.addColumn (new StringIdColumn<CellRef> (true));
mRefs.addColumn (new RecordStateColumn<CellRef>); mRefs.addColumn (new RecordStateColumn<CellRef>);
mRefs.addColumn (new CellColumn<CellRef>); mRefs.addColumn (new CellColumn<CellRef>);
mRefs.addColumn (new IdColumn<CellRef>); mRefs.addColumn (new IdColumn<CellRef>);

2
apps/opencs/view/world/table.cpp
View File

@ -209,7 +209,7 @@ void CSVWorld::Table::updateEditorSetting (const QString &settingName, const QSt
{ {
if (settingName == "Record Status Display") if (settingName == "Record Status Display")
{ {
dynamic_cast<CSVWorld::RecordStatusDelegate *>(this->itemDelegateForColumn(1))->updateEditorSetting (settingName, settingValue); dynamic_cast<CSVWorld::RecordStatusDelegate&> (*itemDelegateForColumn(1)).updateEditorSetting (settingName, settingValue);
emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1)); emit dataChanged(mModel->index(0,1), mModel->index(mModel->rowCount()-1, 1));
} }
} }