krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Add missing columns for the ID completion

Browse source
This commit is contained in:
Stanislav Bas 2015-05-30 23:54:16 +03:00
parent e943d17b29
commit 994c6833bc
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/opencs/model/world/idcompletionmanager.cpp
View file

@ -22,16 +22,19 @@ namespace
types[CSMWorld::Columns::ColumnId_CastingSound] = CSMWorld::UniversalId::Type_Sound; types[CSMWorld::Columns::ColumnId_CastingSound] = CSMWorld::UniversalId::Type_Sound;
types[CSMWorld::Columns::ColumnId_Cell] = CSMWorld::UniversalId::Type_Cell; types[CSMWorld::Columns::ColumnId_Cell] = CSMWorld::UniversalId::Type_Cell;
types[CSMWorld::Columns::ColumnId_Class] = CSMWorld::UniversalId::Type_Class; types[CSMWorld::Columns::ColumnId_Class] = CSMWorld::UniversalId::Type_Class;
types[CSMWorld::Columns::ColumnId_CloseSound] = CSMWorld::UniversalId::Type_Sound;
types[CSMWorld::Columns::ColumnId_Creature] = CSMWorld::UniversalId::Type_Referenceable; types[CSMWorld::Columns::ColumnId_Creature] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_DestinationCell] = CSMWorld::UniversalId::Type_Cell; types[CSMWorld::Columns::ColumnId_DestinationCell] = CSMWorld::UniversalId::Type_Cell;
types[CSMWorld::Columns::ColumnId_Enchantment] = CSMWorld::UniversalId::Type_Enchantment; types[CSMWorld::Columns::ColumnId_Enchantment] = CSMWorld::UniversalId::Type_Enchantment;
types[CSMWorld::Columns::ColumnId_Faction] = CSMWorld::UniversalId::Type_Faction; types[CSMWorld::Columns::ColumnId_Faction] = CSMWorld::UniversalId::Type_Faction;
types[CSMWorld::Columns::Columnid_Hair] = CSMWorld::UniversalId::Type_Mesh; types[CSMWorld::Columns::Columnid_Hair] = CSMWorld::UniversalId::Type_BodyPart;
types[CSMWorld::Columns::ColumnId_Head] = CSMWorld::UniversalId::Type_Mesh; types[CSMWorld::Columns::ColumnId_Head] = CSMWorld::UniversalId::Type_BodyPart;
types[CSMWorld::Columns::ColumnId_HitObject] = CSMWorld::UniversalId::Type_Referenceable; types[CSMWorld::Columns::ColumnId_HitObject] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_HitSound] = CSMWorld::UniversalId::Type_Sound; types[CSMWorld::Columns::ColumnId_HitSound] = CSMWorld::UniversalId::Type_Sound;
types[CSMWorld::Columns::ColumnId_Icon] = CSMWorld::UniversalId::Type_Icon; types[CSMWorld::Columns::ColumnId_Icon] = CSMWorld::UniversalId::Type_Icon;
types[CSMWorld::Columns::ColumnId_InventoryItemId] = CSMWorld::UniversalId::Type_Referenceable; types[CSMWorld::Columns::ColumnId_InventoryItemId] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_Key] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_LevelledItemId] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_MajorSkill1] = CSMWorld::UniversalId::Type_Skill; types[CSMWorld::Columns::ColumnId_MajorSkill1] = CSMWorld::UniversalId::Type_Skill;
types[CSMWorld::Columns::ColumnId_MajorSkill2] = CSMWorld::UniversalId::Type_Skill; types[CSMWorld::Columns::ColumnId_MajorSkill2] = CSMWorld::UniversalId::Type_Skill;
types[CSMWorld::Columns::ColumnId_MajorSkill3] = CSMWorld::UniversalId::Type_Skill; types[CSMWorld::Columns::ColumnId_MajorSkill3] = CSMWorld::UniversalId::Type_Skill;
@ -43,9 +46,13 @@ namespace
types[CSMWorld::Columns::ColumnId_MinorSkill4] = CSMWorld::UniversalId::Type_Skill; types[CSMWorld::Columns::ColumnId_MinorSkill4] = CSMWorld::UniversalId::Type_Skill;
types[CSMWorld::Columns::ColumnId_MinorSkill5] = CSMWorld::UniversalId::Type_Skill; types[CSMWorld::Columns::ColumnId_MinorSkill5] = CSMWorld::UniversalId::Type_Skill;
types[CSMWorld::Columns::ColumnId_Model] = CSMWorld::UniversalId::Type_Mesh; types[CSMWorld::Columns::ColumnId_Model] = CSMWorld::UniversalId::Type_Mesh;
types[CSMWorld::Columns::ColumnId_OpenSound] = CSMWorld::UniversalId::Type_Sound;
types[CSMWorld::Columns::ColumnId_OriginalCreature] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_Owner] = CSMWorld::UniversalId::Type_Referenceable; types[CSMWorld::Columns::ColumnId_Owner] = CSMWorld::UniversalId::Type_Referenceable;
types[CSMWorld::Columns::ColumnId_OwnerGlobal] = CSMWorld::UniversalId::Type_Global; types[CSMWorld::Columns::ColumnId_OwnerGlobal] = CSMWorld::UniversalId::Type_Global;
types[CSMWorld::Columns::ColumnId_Particle] = CSMWorld::UniversalId::Type_Texture; types[CSMWorld::Columns::ColumnId_Particle] = CSMWorld::UniversalId::Type_Texture;
types[CSMWorld::Columns::ColumnId_PartRefMale] = CSMWorld::UniversalId::Type_BodyPart;
types[CSMWorld::Columns::ColumnId_PartRefFemale] = CSMWorld::UniversalId::Type_BodyPart;
types[CSMWorld::Columns::ColumnId_PcFaction] = CSMWorld::UniversalId::Type_Faction; types[CSMWorld::Columns::ColumnId_PcFaction] = CSMWorld::UniversalId::Type_Faction;
types[CSMWorld::Columns::ColumnId_Race] = CSMWorld::UniversalId::Type_Race; types[CSMWorld::Columns::ColumnId_Race] = CSMWorld::UniversalId::Type_Race;
types[CSMWorld::Columns::ColumnId_ReferenceableId] = CSMWorld::UniversalId::Type_Referenceable; types[CSMWorld::Columns::ColumnId_ReferenceableId] = CSMWorld::UniversalId::Type_Referenceable;

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

@ -64,7 +64,9 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
// Columns with QLineEdit editor // Columns with QLineEdit editor
static const CSMWorld::ColumnBase::Display sIdCompletionColumns[] = static const CSMWorld::ColumnBase::Display sIdCompletionColumns[] =
{ {
CSMWorld::ColumnBase::Display_Cell,
CSMWorld::ColumnBase::Display_Class, CSMWorld::ColumnBase::Display_Class,
CSMWorld::ColumnBase::Display_Creature,
CSMWorld::ColumnBase::Display_Faction, CSMWorld::ColumnBase::Display_Faction,
CSMWorld::ColumnBase::Display_String, CSMWorld::ColumnBase::Display_String,
CSMWorld::ColumnBase::Display_GlobalVariable, CSMWorld::ColumnBase::Display_GlobalVariable,
@ -72,15 +74,20 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
CSMWorld::ColumnBase::Display_Mesh, CSMWorld::ColumnBase::Display_Mesh,
CSMWorld::ColumnBase::Display_Miscellaneous, CSMWorld::ColumnBase::Display_Miscellaneous,
CSMWorld::ColumnBase::Display_Music, CSMWorld::ColumnBase::Display_Music,
CSMWorld::ColumnBase::Display_None, CSMWorld::ColumnBase::Display_None, // Inplace editing (Table SubView) creates QLineEdit using Display_None
CSMWorld::ColumnBase::Display_Npc,
CSMWorld::ColumnBase::Display_Race, CSMWorld::ColumnBase::Display_Race,
CSMWorld::ColumnBase::Display_Referenceable,
CSMWorld::ColumnBase::Display_Region, CSMWorld::ColumnBase::Display_Region,
CSMWorld::ColumnBase::Display_Script, CSMWorld::ColumnBase::Display_Script,
CSMWorld::ColumnBase::Display_Skill, CSMWorld::ColumnBase::Display_Skill,
CSMWorld::ColumnBase::Display_Sound, CSMWorld::ColumnBase::Display_Sound,
CSMWorld::ColumnBase::Display_SoundRes, CSMWorld::ColumnBase::Display_SoundRes,
CSMWorld::ColumnBase::Display_Static,
CSMWorld::ColumnBase::Display_String,
CSMWorld::ColumnBase::Display_Texture, CSMWorld::ColumnBase::Display_Texture,
CSMWorld::ColumnBase::Display_Video CSMWorld::ColumnBase::Display_Video,
CSMWorld::ColumnBase::Display_Weapon
}; };
for (std::size_t i = 0; i < sizeof(sIdCompletionColumns) / sizeof(CSMWorld::ColumnBase::Display); ++i) for (std::size_t i = 0; i < sizeof(sIdCompletionColumns) / sizeof(CSMWorld::ColumnBase::Display); ++i)