mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 20:53:50 +00:00
post merge fixes
This commit is contained in:
parent
4986b7d65d
commit
de5898c953
3 changed files with 6 additions and 2 deletions
|
@ -37,7 +37,10 @@ namespace CSMWorld
|
|||
template<typename 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
|
||||
{
|
||||
|
|
|
@ -128,6 +128,7 @@ CSMWorld::Data::Data() : mRefs (mCells)
|
|||
mCells.addColumn (new FlagColumn<Cell> ("Interior Sky", ESM::Cell::QuasiEx));
|
||||
mCells.addColumn (new RegionColumn<Cell>);
|
||||
|
||||
mRefs.addColumn (new StringIdColumn<CellRef> (true));
|
||||
mRefs.addColumn (new RecordStateColumn<CellRef>);
|
||||
mRefs.addColumn (new CellColumn<CellRef>);
|
||||
mRefs.addColumn (new IdColumn<CellRef>);
|
||||
|
|
|
@ -209,7 +209,7 @@ void CSVWorld::Table::updateEditorSetting (const QString &settingName, const QSt
|
|||
{
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue