mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 05:44:06 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'dieho/master'

Browse source 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
This commit is contained in:
Marc Zinnschlag 2015-08-08 11:00:44 +02:00
commit 23ccee0124
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,6 @@ bool CSMWorld::ColumnBase::isId (Display display)
Display_EffectId, Display_EffectId,
Display_PartRefType, Display_PartRefType,
Display_AiPackageType, Display_AiPackageType,
Display_YesNo,
Display_InfoCondFunc, Display_InfoCondFunc,
Display_InfoCondVar, Display_InfoCondVar,
Display_InfoCondComp, Display_InfoCondComp,

1
apps/opencs/model/world/columnbase.hpp
View file

@ -118,7 +118,6 @@ namespace CSMWorld
Display_EffectId, Display_EffectId,
Display_PartRefType, Display_PartRefType,
Display_AiPackageType, Display_AiPackageType,
Display_YesNo,
Display_InfoCondFunc, Display_InfoCondFunc,
Display_InfoCondVar, Display_InfoCondVar,
Display_InfoCondComp, Display_InfoCondComp,

2
apps/opencs/model/world/refidcollection.cpp
View file

@ -198,7 +198,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderIdle, CSMWorld::ColumnBase::Display_Integer)); new RefIdColumn (Columns::ColumnId_AiWanderIdle, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_YesNo)); new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
mColumns.back().addColumn( mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String)); new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String));
mColumns.back().addColumn( mColumns.back().addColumn(

2
apps/opencs/view/doc/viewmanager.cpp
View file

@ -103,7 +103,7 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
{ CSMWorld::ColumnBase::Display_EffectId, CSMWorld::Columns::ColumnId_EffectId, false }, { CSMWorld::ColumnBase::Display_EffectId, CSMWorld::Columns::ColumnId_EffectId, false },
{ CSMWorld::ColumnBase::Display_PartRefType, CSMWorld::Columns::ColumnId_PartRefType, false }, { CSMWorld::ColumnBase::Display_PartRefType, CSMWorld::Columns::ColumnId_PartRefType, false },
{ CSMWorld::ColumnBase::Display_AiPackageType, CSMWorld::Columns::ColumnId_AiPackageType, false }, { CSMWorld::ColumnBase::Display_AiPackageType, CSMWorld::Columns::ColumnId_AiPackageType, false },
{ CSMWorld::ColumnBase::Display_YesNo, CSMWorld::Columns::ColumnId_AiWanderRepeat, false }, { CSMWorld::ColumnBase::Display_Boolean, CSMWorld::Columns::ColumnId_AiWanderRepeat, false },
{ CSMWorld::ColumnBase::Display_InfoCondFunc, CSMWorld::Columns::ColumnId_InfoCondFunc, false }, { CSMWorld::ColumnBase::Display_InfoCondFunc, CSMWorld::Columns::ColumnId_InfoCondFunc, false },
{ CSMWorld::ColumnBase::Display_InfoCondComp, CSMWorld::Columns::ColumnId_InfoCondComp, false }, { CSMWorld::ColumnBase::Display_InfoCondComp, CSMWorld::Columns::ColumnId_InfoCondComp, false },
{ CSMWorld::ColumnBase::Display_RaceSkill, CSMWorld::Columns::ColumnId_RaceSkill, true }, { CSMWorld::ColumnBase::Display_RaceSkill, CSMWorld::Columns::ColumnId_RaceSkill, true },

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

@ -742,13 +742,15 @@ CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::Universa
mMainLayout = new QVBoxLayout(mainWidget); mMainLayout = new QVBoxLayout(mainWidget);
setWidget (mainWidget); setWidget (mainWidget);
int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
mEditWidget = new EditWidget(mainWidget, mEditWidget = new EditWidget(mainWidget,
mTable->getModelIndex(getUniversalId().getId(), 0).row(), mTable, mCommandDispatcher, document, false); mTable->getModelIndex(getUniversalId().getId(), idColumn).row(), mTable, mCommandDispatcher, document, false);
mMainLayout->addWidget(mEditWidget); mMainLayout->addWidget(mEditWidget);
mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
dataChanged(mTable->getModelIndex (getUniversalId().getId(), 0)); dataChanged(mTable->getModelIndex (getUniversalId().getId(), idColumn));
connect(mEditWidget, connect(mEditWidget,
SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)), SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)),
@ -761,8 +763,9 @@ void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
if (!mEditWidget) // hack to indicate that getUniversalId().getId() is no longer valid if (!mEditWidget) // hack to indicate that getUniversalId().getId() is no longer valid
return; return;
int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
mLocked = locked; mLocked = locked;
QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0)); QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
if (currentIndex.isValid()) if (currentIndex.isValid())
{ {
@ -777,7 +780,8 @@ void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index) void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index)
{ {
QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0)); int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
if (currentIndex.isValid() && if (currentIndex.isValid() &&
(index.parent().isValid() ? index.parent().row() : index.row()) == currentIndex.row()) (index.parent().isValid() ? index.parent().row() : index.row()) == currentIndex.row())
@ -810,7 +814,8 @@ void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index)
void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
{ {
QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0)); int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
if (!currentIndex.isValid()) if (!currentIndex.isValid())
{ {
@ -908,7 +913,8 @@ void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QS
void CSVWorld::DialogueSubView::showPreview () void CSVWorld::DialogueSubView::showPreview ()
{ {
QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), 0)); int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
if (currentIndex.isValid() && if (currentIndex.isValid() &&
getTable().getFeatures() & CSMWorld::IdTable::Feature_Preview && getTable().getFeatures() & CSMWorld::IdTable::Feature_Preview &&
@ -920,7 +926,8 @@ void CSVWorld::DialogueSubView::showPreview ()
void CSVWorld::DialogueSubView::viewRecord () void CSVWorld::DialogueSubView::viewRecord ()
{ {
QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), 0)); int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
if (currentIndex.isValid() && if (currentIndex.isValid() &&
currentIndex.row() < getTable().rowCount()) currentIndex.row() < getTable().rowCount())
@ -955,7 +962,8 @@ void CSVWorld::DialogueSubView::switchToRow (int row)
void CSVWorld::DialogueSubView::requestFocus (const std::string& id) void CSVWorld::DialogueSubView::requestFocus (const std::string& id)
{ {
QModelIndex index = getTable().getModelIndex (id, 0); int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
QModelIndex index = getTable().getModelIndex (id, idColumn);
if (index.isValid()) if (index.isValid())
switchToRow (index.row()); switchToRow (index.row());